From 0f3b364e467092f5f996df3999dc9a739fa9264a Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Fri, 1 Sep 2023 14:45:41 -0400
Subject: [PATCH] chore: hoists tests out of payload package

---
 .../payload/jest.config.js => jest.config.js  |   6 +--
 package.json                                  |   6 +--
 packages/payload/nodemon.json                 |  10 ++--
 .../localization-rtl/collections/users.ts     |   7 ---
 packages/payload/tsconfig.json                |   6 +--
 ...ail.config.ts => playwright.bail.config.ts |   0
 ...aywright.config.ts => playwright.config.ts |   0
 .../_community/collections/Media/index.ts     |   2 +-
 .../_community/collections/Posts/index.ts     |   2 +-
 .../test => test}/_community/config.ts        |   0
 .../test => test}/_community/e2e.spec.ts      |   0
 .../_community/globals/Menu/index.ts          |   2 +-
 .../test => test}/_community/int.spec.ts      |   2 +-
 .../test => test}/_community/payload-types.ts |   0
 .../test => test}/_community/schema.graphql   |   0
 .../test => test}/_community/tsconfig.json    |   0
 .../test => test}/access-control/config.ts    |   2 +-
 .../test => test}/access-control/e2e.spec.ts  |   4 +-
 .../test => test}/access-control/int.spec.ts  |   6 +--
 .../access-control/payload-types.ts           |   0
 .../test => test}/access-control/shared.ts    |   0
 .../components/AfterDashboard/index.scss      |   0
 .../admin/components/AfterDashboard/index.tsx |   0
 .../admin/components/AfterNavLinks/index.tsx  |   4 +-
 .../admin/components/BeforeLogin/index.tsx    |   0
 .../admin/components/CustomProvider/index.tsx |   0
 .../admin/components/DemoUIField/Cell.tsx     |   0
 .../admin/components/DemoUIField/Field.tsx    |   0
 .../admin/components/Logout/index.tsx         |   4 +-
 .../elements/Button/Button/index.scss         |   2 +-
 .../richText/elements/Button/Button/index.tsx |  20 +++----
 .../elements/Button/Element/index.scss        |   2 +-
 .../elements/Button/Element/index.tsx         |   0
 .../richText/elements/Button/index.ts         |   2 +-
 .../richText/elements/Button/plugin.ts        |   0
 .../leaves/PurpleBackground/Button/index.tsx  |   2 +-
 .../leaves/PurpleBackground/Leaf/index.tsx    |   0
 .../richText/leaves/PurpleBackground/index.ts |   0
 .../components/views/CustomDefault/index.tsx  |  14 ++---
 .../components/views/CustomMinimal/index.scss |   0
 .../components/views/CustomMinimal/index.tsx  |   6 +--
 .../payload/test => test}/admin/config.ts     |   2 +-
 .../payload/test => test}/admin/e2e.spec.ts   |  12 ++---
 .../test => test}/admin/payload-types.ts      |   0
 .../test => test}/admin/placeholder.png       | Bin
 .../payload/test => test}/admin/shared.ts     |   0
 .../payload/test => test}/admin/styles.scss   |   0
 .../test => test}/array-update/config.ts      |   0
 .../test => test}/array-update/int.spec.ts    |   2 +-
 .../array-update/payload-types.ts             |   0
 .../payload/test => test}/auth/AuthDebug.tsx  |   6 +--
 .../payload/test => test}/auth/config.ts      |   2 +-
 .../auth/custom-strategy/config.ts            |   2 +-
 .../auth/custom-strategy/int.spec.ts          |   2 +-
 .../payload/test => test}/auth/e2e.spec.ts    |   0
 .../payload/test => test}/auth/int.spec.ts    |   4 +-
 .../test => test}/auth/payload-types.ts       |   0
 .../auth/removed-token/config.ts              |   0
 .../auth/removed-token/int.spec.ts            |   2 +-
 .../test => test}/auth/ui/AuthDebug.tsx       |   6 +--
 .../test => test}/buildConfigWithDefaults.ts  |  26 ++++-----
 .../collections-graphql/config.ts             |   2 +-
 .../collections-graphql/int.spec.ts           |   6 +--
 .../collections-graphql/payload-types.ts      |   0
 .../collections-graphql/schema.graphql        |   0
 .../test => test}/collections-rest/config.ts  |   2 +-
 .../collections-rest/int.spec.ts              |  20 +++----
 .../collections-rest/payload-types.ts         |   0
 .../payload/test => test}/componentsSetup.js  |   0
 .../payload/test => test}/config/config.ts    |   2 +-
 .../payload/test => test}/config/int.spec.ts  |   2 +-
 .../payload/test => test}/credentials.ts      |   0
 .../test => test}/dataloader/config.ts        |   0
 .../test => test}/dataloader/int.spec.ts      |   2 +-
 .../test => test}/dataloader/payload-types.ts |   0
 {packages/payload/test => test}/dev.ts        |   2 +-
 .../payload/test => test}/endpoints/config.ts |   4 +-
 .../test => test}/endpoints/int.spec.ts       |   0
 .../test => test}/endpoints/payload-types.ts  |   0
 .../collections/ErrorFields/index.ts          |   4 +-
 .../collections/Upload/.gitignore             |   0
 .../collections/Upload/index.ts               |   2 +-
 .../field-error-states/config.ts              |   0
 .../field-error-states/e2e.spec.ts            |   0
 .../field-error-states/payload-types.ts       |   0
 .../field-error-states/schema.graphql         |   0
 .../field-error-states/tsconfig.json          |   0
 .../test => test}/field-perf/config.ts        |   0
 .../PrePopulateFieldUI/index.tsx              |   2 +-
 .../fields-relationship/collectionSlugs.ts    |   0
 .../fields-relationship/config.ts             |  32 +++++------
 .../fields-relationship/e2e.spec.ts           |   6 +--
 .../fields-relationship/payload-types.ts      |   0
 .../collections/Array/LabelComponent.tsx      |   2 +-
 .../components/AddCustomBlocks/index.scss     |   0
 .../components/AddCustomBlocks/index.tsx      |   4 +-
 .../fields/collections/Array/index.ts         |   2 +-
 .../fields/collections/Blocks/index.ts        |   4 +-
 .../fields/collections/Code/index.tsx         |   2 +-
 .../Collapsible/LabelComponent.tsx            |   2 +-
 .../fields/collections/Collapsible/index.ts   |   2 +-
 .../collections/ConditionalLogic/index.ts     |   2 +-
 .../fields/collections/Date/index.ts          |   2 +-
 .../fields/collections/Group/index.ts         |   2 +-
 .../fields/collections/Indexed/index.ts       |   2 +-
 .../fields/collections/JSON/index.tsx         |   2 +-
 .../fields/collections/Number/index.ts        |   2 +-
 .../fields/collections/Point/index.ts         |   2 +-
 .../fields/collections/Radio/index.ts         |   2 +-
 .../fields/collections/Relationship/index.ts  |   2 +-
 .../fields/collections/RichText/index.ts      |   2 +-
 .../fields/collections/RichText/loremIpsum.ts |   0
 .../fields/collections/Row/index.ts           |   2 +-
 .../fields/collections/Select/index.ts        |   2 +-
 .../fields/collections/Tabs/UIField.tsx       |   0
 .../fields/collections/Tabs/index.ts          |   2 +-
 .../fields/collections/Text/index.ts          |   2 +-
 .../fields/collections/Upload/.gitignore      |   0
 .../fields}/collections/Upload/index.ts       |   2 +-
 .../fields/collections/Upload/payload.jpg     | Bin
 .../fields/collections/Upload2/.gitignore     |   0
 .../fields/collections/Upload2/index.ts       |   2 +-
 .../fields/collections/Upload2/payload.jpg    | Bin
 .../fields/collections/Uploads3/.gitignore    |   0
 .../fields/collections/Uploads3/index.ts      |   2 +-
 .../fields/collections/Uploads3/payload.jpg   | Bin
 .../payload/test => test}/fields/config.ts    |   2 +-
 .../payload/test => test}/fields/e2e.spec.ts  |   6 +--
 .../payload/test => test}/fields/int.spec.ts  |  10 ++--
 .../test => test}/fields/mocks/emptyModule.js |   0
 .../test => test}/fields/payload-types.ts     |   0
 .../test => test}/fields/uploads/payload.png  | Bin
 .../test => test}/generateGraphQLSchema.ts    |   2 +-
 .../payload/test => test}/generateTypes.ts    |   2 +-
 .../payload/test => test}/globals/config.ts   |   0
 .../payload/test => test}/globals/int.spec.ts |   2 +-
 .../test => test}/globals/payload-types.ts    |   0
 .../graphql-schema-gen/config.ts              |   0
 .../graphql-schema-gen/payload-types.ts       |   0
 .../graphql-schema-gen/schema.graphql         |   0
 .../graphql-schema-gen/tsconfig.json          |   0
 {packages/payload/test => test}/helpers.ts    |   2 +-
 .../test => test}/helpers/adminUrlUtil.ts     |   0
 .../test => test}/helpers/configHelpers.ts    |   6 +--
 .../test => test}/helpers/removeFiles.ts      |   0
 .../payload/test => test}/helpers/rest.ts     |   6 +--
 .../hooks/collections/AfterOperation/index.ts |   8 +--
 .../hooks/collections/ChainingHooks/index.ts  |   2 +-
 .../hooks/collections/ContextHooks/index.ts   |   6 +--
 .../hooks/collections/Hook/index.ts           |   2 +-
 .../collections/NestedAfterReadHooks/index.ts |   2 +-
 .../hooks/collections/Relations/index.ts      |   2 +-
 .../hooks/collections/Transform/index.ts      |   2 +-
 .../hooks/collections/Users/index.ts          |   6 +--
 .../payload/test => test}/hooks/config.ts     |   0
 .../payload/test => test}/hooks/int.spec.ts   |   4 +-
 .../test => test}/hooks/mocks/emptyModule.js  |   0
 .../test => test}/hooks/payload-types.ts      |   0
 {packages/payload/test => test}/jest.setup.ts |   0
 .../test => test}/localization-rtl/ar.js      |   0
 .../localization-rtl/collections/posts.ts     |   2 +-
 test/localization-rtl/collections/users.ts    |   7 +++
 .../test => test}/localization-rtl/config.ts  |   2 +-
 .../localization-rtl/deepMerge.ts             |   0
 .../localization-rtl/localization.ts          |   0
 .../localization/collections/Array/index.ts   |   2 +-
 .../test => test}/localization/config.ts      |   0
 .../test => test}/localization/e2e.spec.ts    |   2 +-
 .../test => test}/localization/int.spec.ts    |   8 +--
 .../localization/payload-types.ts             |   0
 .../test => test}/localization/shared.ts      |   0
 .../test => test}/migrations-cli/config.ts    |   0
 .../migrations-cli/payload-types.ts           |   0
 .../test => test}/nested-fields/config.ts     |   0
 .../payload/test => test}/plugins/.gitignore  |   0
 .../payload/test => test}/plugins/config.ts   |   0
 .../test => test}/plugins/e2e.todo-spec.ts    |   0
 .../payload/test => test}/plugins/int.spec.ts |   2 +-
 .../payload/test => test}/postgres/config.ts  |   2 +-
 .../GlobalViewWithRefresh.tsx                 |   6 +--
 .../refresh-permissions/config.ts             |   0
 .../refresh-permissions/e2e.spec.ts           |   0
 .../test => test}/relationships/config.ts     |   2 +-
 .../test => test}/relationships/int.spec.ts   |   4 +-
 .../relationships/payload-types.ts            |   0
 {packages/payload/test => test}/runE2E.ts     |   0
 .../payload/test => test}/uploads/.gitignore  |   0
 .../payload/test => test}/uploads/audio.mp3   | Bin
 .../uploads/collections/Upload1/index.ts      |   2 +-
 .../uploads/collections/Upload2/index.ts      |   2 +-
 .../collections/admin-thumbnail/index.ts      |   2 +-
 .../payload/test => test}/uploads/config.ts   |   2 +-
 .../payload/test => test}/uploads/e2e.spec.ts |   4 +-
 .../payload/test => test}/uploads/image.jpg   | Bin
 .../payload/test => test}/uploads/image.png   | Bin
 .../payload/test => test}/uploads/image.svg   |   0
 .../payload/test => test}/uploads/int.spec.ts |   4 +-
 .../uploads/mocks/mockFSModule.js             |   0
 .../test => test}/uploads/payload-types.ts    |   0
 .../payload/test => test}/uploads/small.png   | Bin
 .../test => test}/uploads/temp-renamed.png    | Bin
 .../payload/test => test}/uploads/temp.png    | Bin
 .../versions/collections/Autosave.ts          |   2 +-
 .../versions/collections/Drafts.ts            |   2 +-
 .../versions/collections/Versions.ts          |   2 +-
 .../payload/test => test}/versions/config.ts  |   0
 .../test => test}/versions/e2e.spec.ts        |   2 +-
 .../CustomSaveButton/index.module.scss        |   0
 .../elements/CustomSaveButton/index.tsx       |   2 +-
 .../versions/globals/Autosave.ts              |   2 +-
 .../test => test}/versions/globals/Draft.ts   |   2 +-
 .../test => test}/versions/int.spec.ts        |   2 +-
 .../test => test}/versions/payload-types.ts   |   0
 .../payload/test => test}/versions/shared.ts  |   0
 tsconfig.json                                 |  51 +++++++++---------
 215 files changed, 254 insertions(+), 257 deletions(-)
 rename packages/payload/jest.config.js => jest.config.js (56%)
 delete mode 100644 packages/payload/test/localization-rtl/collections/users.ts
 rename packages/payload/playwright.bail.config.ts => playwright.bail.config.ts (100%)
 rename packages/payload/playwright.config.ts => playwright.config.ts (100%)
 rename {packages/payload/test => test}/_community/collections/Media/index.ts (67%)
 rename {packages/payload/test => test}/_community/collections/Posts/index.ts (80%)
 rename {packages/payload/test => test}/_community/config.ts (100%)
 rename {packages/payload/test => test}/_community/e2e.spec.ts (100%)
 rename {packages/payload/test => test}/_community/globals/Menu/index.ts (65%)
 rename {packages/payload/test => test}/_community/int.spec.ts (97%)
 rename {packages/payload/test => test}/_community/payload-types.ts (100%)
 rename {packages/payload/test => test}/_community/schema.graphql (100%)
 rename {packages/payload/test => test}/_community/tsconfig.json (100%)
 rename {packages/payload/test => test}/access-control/config.ts (99%)
 rename {packages/payload/test => test}/access-control/e2e.spec.ts (98%)
 rename {packages/payload/test => test}/access-control/int.spec.ts (98%)
 rename {packages/payload/test => test}/access-control/payload-types.ts (100%)
 rename {packages/payload/test => test}/access-control/shared.ts (100%)
 rename {packages/payload/test => test}/admin/components/AfterDashboard/index.scss (100%)
 rename {packages/payload/test => test}/admin/components/AfterDashboard/index.tsx (100%)
 rename {packages/payload/test => test}/admin/components/AfterNavLinks/index.tsx (85%)
 rename {packages/payload/test => test}/admin/components/BeforeLogin/index.tsx (100%)
 rename {packages/payload/test => test}/admin/components/CustomProvider/index.tsx (100%)
 rename {packages/payload/test => test}/admin/components/DemoUIField/Cell.tsx (100%)
 rename {packages/payload/test => test}/admin/components/DemoUIField/Field.tsx (100%)
 rename {packages/payload/test => test}/admin/components/Logout/index.tsx (60%)
 rename {packages/payload/test => test}/admin/components/richText/elements/Button/Button/index.scss (85%)
 rename {packages/payload/test => test}/admin/components/richText/elements/Button/Button/index.tsx (71%)
 rename {packages/payload/test => test}/admin/components/richText/elements/Button/Element/index.scss (78%)
 rename {packages/payload/test => test}/admin/components/richText/elements/Button/Element/index.tsx (100%)
 rename {packages/payload/test => test}/admin/components/richText/elements/Button/index.ts (67%)
 rename {packages/payload/test => test}/admin/components/richText/elements/Button/plugin.ts (100%)
 rename {packages/payload/test => test}/admin/components/richText/leaves/PurpleBackground/Button/index.tsx (53%)
 rename {packages/payload/test => test}/admin/components/richText/leaves/PurpleBackground/Leaf/index.tsx (100%)
 rename {packages/payload/test => test}/admin/components/richText/leaves/PurpleBackground/index.ts (100%)
 rename {packages/payload/test => test}/admin/components/views/CustomDefault/index.tsx (72%)
 rename {packages/payload/test => test}/admin/components/views/CustomMinimal/index.scss (100%)
 rename {packages/payload/test => test}/admin/components/views/CustomMinimal/index.tsx (77%)
 rename {packages/payload/test => test}/admin/config.ts (98%)
 rename {packages/payload/test => test}/admin/e2e.spec.ts (99%)
 rename {packages/payload/test => test}/admin/payload-types.ts (100%)
 rename {packages/payload/test => test}/admin/placeholder.png (100%)
 rename {packages/payload/test => test}/admin/shared.ts (100%)
 rename {packages/payload/test => test}/admin/styles.scss (100%)
 rename {packages/payload/test => test}/array-update/config.ts (100%)
 rename {packages/payload/test => test}/array-update/int.spec.ts (98%)
 rename {packages/payload/test => test}/array-update/payload-types.ts (100%)
 rename {packages/payload/test => test}/auth/AuthDebug.tsx (72%)
 rename {packages/payload/test => test}/auth/config.ts (98%)
 rename {packages/payload/test => test}/auth/custom-strategy/config.ts (96%)
 rename {packages/payload/test => test}/auth/custom-strategy/int.spec.ts (95%)
 rename {packages/payload/test => test}/auth/e2e.spec.ts (100%)
 rename {packages/payload/test => test}/auth/int.spec.ts (99%)
 rename {packages/payload/test => test}/auth/payload-types.ts (100%)
 rename {packages/payload/test => test}/auth/removed-token/config.ts (100%)
 rename {packages/payload/test => test}/auth/removed-token/int.spec.ts (97%)
 rename {packages/payload/test => test}/auth/ui/AuthDebug.tsx (71%)
 rename {packages/payload/test => test}/buildConfigWithDefaults.ts (69%)
 rename {packages/payload/test => test}/collections-graphql/config.ts (99%)
 rename {packages/payload/test => test}/collections-graphql/int.spec.ts (99%)
 rename {packages/payload/test => test}/collections-graphql/payload-types.ts (100%)
 rename {packages/payload/test => test}/collections-graphql/schema.graphql (100%)
 rename {packages/payload/test => test}/collections-rest/config.ts (98%)
 rename {packages/payload/test => test}/collections-rest/int.spec.ts (98%)
 rename {packages/payload/test => test}/collections-rest/payload-types.ts (100%)
 rename {packages/payload/test => test}/componentsSetup.js (100%)
 rename {packages/payload/test => test}/config/config.ts (95%)
 rename {packages/payload/test => test}/config/int.spec.ts (97%)
 rename {packages/payload/test => test}/credentials.ts (100%)
 rename {packages/payload/test => test}/dataloader/config.ts (100%)
 rename {packages/payload/test => test}/dataloader/int.spec.ts (98%)
 rename {packages/payload/test => test}/dataloader/payload-types.ts (100%)
 rename {packages/payload/test => test}/dev.ts (97%)
 rename {packages/payload/test => test}/endpoints/config.ts (96%)
 rename {packages/payload/test => test}/endpoints/int.spec.ts (100%)
 rename {packages/payload/test => test}/endpoints/payload-types.ts (100%)
 rename {packages/payload/test => test}/field-error-states/collections/ErrorFields/index.ts (96%)
 rename {packages/payload/test => test}/field-error-states/collections/Upload/.gitignore (100%)
 rename {packages/payload/test/fields => test/field-error-states}/collections/Upload/index.ts (84%)
 rename {packages/payload/test => test}/field-error-states/config.ts (100%)
 rename {packages/payload/test => test}/field-error-states/e2e.spec.ts (100%)
 rename {packages/payload/test => test}/field-error-states/payload-types.ts (100%)
 rename {packages/payload/test => test}/field-error-states/schema.graphql (100%)
 rename {packages/payload/test => test}/field-error-states/tsconfig.json (100%)
 rename {packages/payload/test => test}/field-perf/config.ts (100%)
 rename {packages/payload/test => test}/fields-relationship/PrePopulateFieldUI/index.tsx (94%)
 rename {packages/payload/test => test}/fields-relationship/collectionSlugs.ts (100%)
 rename {packages/payload/test => test}/fields-relationship/config.ts (94%)
 rename {packages/payload/test => test}/fields-relationship/e2e.spec.ts (98%)
 rename {packages/payload/test => test}/fields-relationship/payload-types.ts (100%)
 rename {packages/payload/test => test}/fields/collections/Array/LabelComponent.tsx (64%)
 rename {packages/payload/test => test}/fields/collections/Array/components/AddCustomBlocks/index.scss (100%)
 rename {packages/payload/test => test}/fields/collections/Array/components/AddCustomBlocks/index.tsx (89%)
 rename {packages/payload/test => test}/fields/collections/Array/index.ts (97%)
 rename {packages/payload/test => test}/fields/collections/Blocks/index.ts (96%)
 rename {packages/payload/test => test}/fields/collections/Code/index.tsx (95%)
 rename {packages/payload/test => test}/fields/collections/Collapsible/LabelComponent.tsx (68%)
 rename {packages/payload/test => test}/fields/collections/Collapsible/index.ts (97%)
 rename {packages/payload/test => test}/fields/collections/ConditionalLogic/index.ts (95%)
 rename {packages/payload/test => test}/fields/collections/Date/index.ts (93%)
 rename {packages/payload/test => test}/fields/collections/Group/index.ts (97%)
 rename {packages/payload/test => test}/fields/collections/Indexed/index.ts (97%)
 rename {packages/payload/test => test}/fields/collections/JSON/index.tsx (81%)
 rename {packages/payload/test => test}/fields/collections/Number/index.ts (93%)
 rename {packages/payload/test => test}/fields/collections/Point/index.ts (87%)
 rename {packages/payload/test => test}/fields/collections/Radio/index.ts (85%)
 rename {packages/payload/test => test}/fields/collections/Relationship/index.ts (93%)
 rename {packages/payload/test => test}/fields/collections/RichText/index.ts (99%)
 rename {packages/payload/test => test}/fields/collections/RichText/loremIpsum.ts (100%)
 rename {packages/payload/test => test}/fields/collections/Row/index.ts (83%)
 rename {packages/payload/test => test}/fields/collections/Select/index.ts (96%)
 rename {packages/payload/test => test}/fields/collections/Tabs/UIField.tsx (100%)
 rename {packages/payload/test => test}/fields/collections/Tabs/index.ts (98%)
 rename {packages/payload/test => test}/fields/collections/Text/index.ts (94%)
 rename {packages/payload/test => test}/fields/collections/Upload/.gitignore (100%)
 rename {packages/payload/test/field-error-states => test/fields}/collections/Upload/index.ts (84%)
 rename {packages/payload/test => test}/fields/collections/Upload/payload.jpg (100%)
 rename {packages/payload/test => test}/fields/collections/Upload2/.gitignore (100%)
 rename {packages/payload/test => test}/fields/collections/Upload2/index.ts (82%)
 rename {packages/payload/test => test}/fields/collections/Upload2/payload.jpg (100%)
 rename {packages/payload/test => test}/fields/collections/Uploads3/.gitignore (100%)
 rename {packages/payload/test => test}/fields/collections/Uploads3/index.ts (84%)
 rename {packages/payload/test => test}/fields/collections/Uploads3/payload.jpg (100%)
 rename {packages/payload/test => test}/fields/config.ts (98%)
 rename {packages/payload/test => test}/fields/e2e.spec.ts (99%)
 rename {packages/payload/test => test}/fields/int.spec.ts (98%)
 rename {packages/payload/test => test}/fields/mocks/emptyModule.js (100%)
 rename {packages/payload/test => test}/fields/payload-types.ts (100%)
 rename {packages/payload/test => test}/fields/uploads/payload.png (100%)
 rename {packages/payload/test => test}/generateGraphQLSchema.ts (90%)
 rename {packages/payload/test => test}/generateTypes.ts (92%)
 rename {packages/payload/test => test}/globals/config.ts (100%)
 rename {packages/payload/test => test}/globals/int.spec.ts (99%)
 rename {packages/payload/test => test}/globals/payload-types.ts (100%)
 rename {packages/payload/test => test}/graphql-schema-gen/config.ts (100%)
 rename {packages/payload/test => test}/graphql-schema-gen/payload-types.ts (100%)
 rename {packages/payload/test => test}/graphql-schema-gen/schema.graphql (100%)
 rename {packages/payload/test => test}/graphql-schema-gen/tsconfig.json (100%)
 rename {packages/payload/test => test}/helpers.ts (96%)
 rename {packages/payload/test => test}/helpers/adminUrlUtil.ts (100%)
 rename {packages/payload/test => test}/helpers/configHelpers.ts (88%)
 rename {packages/payload/test => test}/helpers/removeFiles.ts (100%)
 rename {packages/payload/test => test}/helpers/rest.ts (97%)
 rename {packages/payload/test => test}/hooks/collections/AfterOperation/index.ts (92%)
 rename {packages/payload/test => test}/hooks/collections/ChainingHooks/index.ts (78%)
 rename {packages/payload/test => test}/hooks/collections/ContextHooks/index.ts (89%)
 rename {packages/payload/test => test}/hooks/collections/Hook/index.ts (97%)
 rename {packages/payload/test => test}/hooks/collections/NestedAfterReadHooks/index.ts (94%)
 rename {packages/payload/test => test}/hooks/collections/Relations/index.ts (69%)
 rename {packages/payload/test => test}/hooks/collections/Transform/index.ts (95%)
 rename {packages/payload/test => test}/hooks/collections/Users/index.ts (82%)
 rename {packages/payload/test => test}/hooks/config.ts (100%)
 rename {packages/payload/test => test}/hooks/int.spec.ts (98%)
 rename {packages/payload/test => test}/hooks/mocks/emptyModule.js (100%)
 rename {packages/payload/test => test}/hooks/payload-types.ts (100%)
 rename {packages/payload/test => test}/jest.setup.ts (100%)
 rename {packages/payload/test => test}/localization-rtl/ar.js (100%)
 rename {packages/payload/test => test}/localization-rtl/collections/posts.ts (89%)
 create mode 100644 test/localization-rtl/collections/users.ts
 rename {packages/payload/test => test}/localization-rtl/config.ts (93%)
 rename {packages/payload/test => test}/localization-rtl/deepMerge.ts (100%)
 rename {packages/payload/test => test}/localization-rtl/localization.ts (100%)
 rename {packages/payload/test => test}/localization/collections/Array/index.ts (78%)
 rename {packages/payload/test => test}/localization/config.ts (100%)
 rename {packages/payload/test => test}/localization/e2e.spec.ts (99%)
 rename {packages/payload/test => test}/localization/int.spec.ts (98%)
 rename {packages/payload/test => test}/localization/payload-types.ts (100%)
 rename {packages/payload/test => test}/localization/shared.ts (100%)
 rename {packages/payload/test => test}/migrations-cli/config.ts (100%)
 rename {packages/payload/test => test}/migrations-cli/payload-types.ts (100%)
 rename {packages/payload/test => test}/nested-fields/config.ts (100%)
 rename {packages/payload/test => test}/plugins/.gitignore (100%)
 rename {packages/payload/test => test}/plugins/config.ts (100%)
 rename {packages/payload/test => test}/plugins/e2e.todo-spec.ts (100%)
 rename {packages/payload/test => test}/plugins/int.spec.ts (93%)
 rename {packages/payload/test => test}/postgres/config.ts (98%)
 rename {packages/payload/test => test}/refresh-permissions/GlobalViewWithRefresh.tsx (60%)
 rename {packages/payload/test => test}/refresh-permissions/config.ts (100%)
 rename {packages/payload/test => test}/refresh-permissions/e2e.spec.ts (100%)
 rename {packages/payload/test => test}/relationships/config.ts (98%)
 rename {packages/payload/test => test}/relationships/int.spec.ts (99%)
 rename {packages/payload/test => test}/relationships/payload-types.ts (100%)
 rename {packages/payload/test => test}/runE2E.ts (100%)
 rename {packages/payload/test => test}/uploads/.gitignore (100%)
 rename {packages/payload/test => test}/uploads/audio.mp3 (100%)
 rename {packages/payload/test => test}/uploads/collections/Upload1/index.ts (83%)
 rename {packages/payload/test => test}/uploads/collections/Upload2/index.ts (79%)
 rename {packages/payload/test => test}/uploads/collections/admin-thumbnail/index.ts (89%)
 rename {packages/payload/test => test}/uploads/config.ts (99%)
 rename {packages/payload/test => test}/uploads/e2e.spec.ts (98%)
 rename {packages/payload/test => test}/uploads/image.jpg (100%)
 rename {packages/payload/test => test}/uploads/image.png (100%)
 rename {packages/payload/test => test}/uploads/image.svg (100%)
 rename {packages/payload/test => test}/uploads/int.spec.ts (99%)
 rename {packages/payload/test => test}/uploads/mocks/mockFSModule.js (100%)
 rename {packages/payload/test => test}/uploads/payload-types.ts (100%)
 rename {packages/payload/test => test}/uploads/small.png (100%)
 rename {packages/payload/test => test}/uploads/temp-renamed.png (100%)
 rename {packages/payload/test => test}/uploads/temp.png (100%)
 rename {packages/payload/test => test}/versions/collections/Autosave.ts (92%)
 rename {packages/payload/test => test}/versions/collections/Drafts.ts (94%)
 rename {packages/payload/test => test}/versions/collections/Versions.ts (91%)
 rename {packages/payload/test => test}/versions/config.ts (100%)
 rename {packages/payload/test => test}/versions/e2e.spec.ts (98%)
 rename {packages/payload/test => test}/versions/elements/CustomSaveButton/index.module.scss (100%)
 rename {packages/payload/test => test}/versions/elements/CustomSaveButton/index.tsx (77%)
 rename {packages/payload/test => test}/versions/globals/Autosave.ts (89%)
 rename {packages/payload/test => test}/versions/globals/Draft.ts (89%)
 rename {packages/payload/test => test}/versions/int.spec.ts (99%)
 rename {packages/payload/test => test}/versions/payload-types.ts (100%)
 rename {packages/payload/test => test}/versions/shared.ts (100%)

diff --git a/packages/payload/jest.config.js b/jest.config.js
similarity index 56%
rename from packages/payload/jest.config.js
rename to jest.config.js
index 9791b1e6b..29ff91fc6 100644
--- a/packages/payload/jest.config.js
+++ b/jest.config.js
@@ -1,12 +1,12 @@
 module.exports = {
   globalSetup: './test/jest.setup.ts',
   moduleNameMapper: {
-    '\\.(css|scss)$': '<rootDir>/src/bundlers/mocks/emptyModule.js',
+    '\\.(css|scss)$': '<rootDir>/packages/payload/src/bundlers/mocks/emptyModule.js',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-      '<rootDir>/src/bundlers/mocks/fileMock.js',
+      '<rootDir>/packages/payload/src/bundlers/mocks/fileMock.js',
   },
   testEnvironment: 'node',
-  testMatch: ['**/src/**/*.spec.ts', '**/test/**/*int.spec.ts'],
+  testMatch: ['**/packages/payload/src/**/*.spec.ts', '**/test/**/*int.spec.ts'],
   testTimeout: 90000,
   transform: {
     '^.+\\.(t|j)sx?$': ['@swc/jest'],
diff --git a/package.json b/package.json
index f1f093670..338714f13 100644
--- a/package.json
+++ b/package.json
@@ -99,10 +99,10 @@
     "release:patch": "release-it patch",
     "test": "pnpm --filter payload run test",
     "test:components": "pnpm --filter payload run test:components",
-    "test:e2e": "pnpm --filter payload run test:e2e",
+    "test:e2e": "ts-node -T ./test/runE2E.ts",
     "test:e2e:debug": "pnpm --filter payload run test:e2e:debug",
     "test:e2e:headed": "pnpm --filter payload run test:e2e:headed",
-    "test:int": "pnpm --filter payload run test:int",
+    "test:int": "cross-env DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
     "translateNewKeys": "pnpm --filter payload run translateNewKeys"
   },
   "sideEffects": false,
@@ -111,4 +111,4 @@
   "workspaces:": [
     "packages/*"
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/payload/nodemon.json b/packages/payload/nodemon.json
index e2e2f2802..416dcda15 100644
--- a/packages/payload/nodemon.json
+++ b/packages/payload/nodemon.json
@@ -1,5 +1,5 @@
 {
-  "exec": "ts-node ./test/dev.ts",
+  "exec": "ts-node ../../test/dev.ts",
   "ext": "ts,js,json",
   "ignore": [
     ".git",
@@ -9,5 +9,9 @@
     "src/**/*.spec.ts",
     "test/**/payload-types.ts"
   ],
-  "watch": ["src/**/*.ts", "test/", "packages/**/*.ts"]
-}
+  "watch": [
+    "src/**/*.ts",
+    "../../test/",
+    "packages/**/*.ts"
+  ]
+}
\ No newline at end of file
diff --git a/packages/payload/test/localization-rtl/collections/users.ts b/packages/payload/test/localization-rtl/collections/users.ts
deleted file mode 100644
index f1b59a565..000000000
--- a/packages/payload/test/localization-rtl/collections/users.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { CollectionConfig } from '../../../src/collections/config/types'
-
-export const Users: CollectionConfig = {
-  slug: 'users',
-  auth: true,
-  fields: [],
-}
diff --git a/packages/payload/tsconfig.json b/packages/payload/tsconfig.json
index c29f78fb0..96a6fcc99 100644
--- a/packages/payload/tsconfig.json
+++ b/packages/payload/tsconfig.json
@@ -21,7 +21,7 @@
       "payload/types": ["./src/types/index.ts"]
     },
     "resolveJsonModule": true,
-    "rootDir": "." /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    "rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
     "skipLibCheck": true /* Skip type checking of declaration files. */,
     "sourceMap": true,
     "strict": false /* Enable all strict type-checking options. */,
@@ -30,7 +30,6 @@
   },
   "exclude": ["dist", "build", "temp", "node_modules"],
   /* Like tsconfig.build.json, but includes test directory and doesnt emit anything */
-  "extends": "../../tsconfig.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",
@@ -38,8 +37,7 @@
     "src/**/*.json",
     "test/**/*.ts",
     "test/**/*.tsx",
-    "test/**/*.d.ts",
-    "test/**/*.json"
+    "test/**/*.d.ts"
   ],
   "ts-node": {
     "esm": true,
diff --git a/packages/payload/playwright.bail.config.ts b/playwright.bail.config.ts
similarity index 100%
rename from packages/payload/playwright.bail.config.ts
rename to playwright.bail.config.ts
diff --git a/packages/payload/playwright.config.ts b/playwright.config.ts
similarity index 100%
rename from packages/payload/playwright.config.ts
rename to playwright.config.ts
diff --git a/packages/payload/test/_community/collections/Media/index.ts b/test/_community/collections/Media/index.ts
similarity index 67%
rename from packages/payload/test/_community/collections/Media/index.ts
rename to test/_community/collections/Media/index.ts
index d290cb01d..16dd434e7 100644
--- a/packages/payload/test/_community/collections/Media/index.ts
+++ b/test/_community/collections/Media/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const mediaSlug = 'media'
 
diff --git a/packages/payload/test/_community/collections/Posts/index.ts b/test/_community/collections/Posts/index.ts
similarity index 80%
rename from packages/payload/test/_community/collections/Posts/index.ts
rename to test/_community/collections/Posts/index.ts
index 2c445bef7..9046dad77 100644
--- a/packages/payload/test/_community/collections/Posts/index.ts
+++ b/test/_community/collections/Posts/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { mediaSlug } from '../Media'
 
diff --git a/packages/payload/test/_community/config.ts b/test/_community/config.ts
similarity index 100%
rename from packages/payload/test/_community/config.ts
rename to test/_community/config.ts
diff --git a/packages/payload/test/_community/e2e.spec.ts b/test/_community/e2e.spec.ts
similarity index 100%
rename from packages/payload/test/_community/e2e.spec.ts
rename to test/_community/e2e.spec.ts
diff --git a/packages/payload/test/_community/globals/Menu/index.ts b/test/_community/globals/Menu/index.ts
similarity index 65%
rename from packages/payload/test/_community/globals/Menu/index.ts
rename to test/_community/globals/Menu/index.ts
index dd76ac360..86e5ee6c2 100644
--- a/packages/payload/test/_community/globals/Menu/index.ts
+++ b/test/_community/globals/Menu/index.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../../src/globals/config/types'
+import type { GlobalConfig } from '../../../../packages/payload/src/globals/config/types'
 
 export const menuSlug = 'menu'
 
diff --git a/packages/payload/test/_community/int.spec.ts b/test/_community/int.spec.ts
similarity index 97%
rename from packages/payload/test/_community/int.spec.ts
rename to test/_community/int.spec.ts
index 51f0f4c78..99af8beac 100644
--- a/packages/payload/test/_community/int.spec.ts
+++ b/test/_community/int.spec.ts
@@ -1,4 +1,4 @@
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { devUser } from '../credentials'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { postsSlug } from './collections/Posts'
diff --git a/packages/payload/test/_community/payload-types.ts b/test/_community/payload-types.ts
similarity index 100%
rename from packages/payload/test/_community/payload-types.ts
rename to test/_community/payload-types.ts
diff --git a/packages/payload/test/_community/schema.graphql b/test/_community/schema.graphql
similarity index 100%
rename from packages/payload/test/_community/schema.graphql
rename to test/_community/schema.graphql
diff --git a/packages/payload/test/_community/tsconfig.json b/test/_community/tsconfig.json
similarity index 100%
rename from packages/payload/test/_community/tsconfig.json
rename to test/_community/tsconfig.json
diff --git a/packages/payload/test/access-control/config.ts b/test/access-control/config.ts
similarity index 99%
rename from packages/payload/test/access-control/config.ts
rename to test/access-control/config.ts
index 65f96334f..b26221ac0 100644
--- a/packages/payload/test/access-control/config.ts
+++ b/test/access-control/config.ts
@@ -1,4 +1,4 @@
-import type { FieldAccess } from '../../src/fields/config/types'
+import type { FieldAccess } from '../../packages/payload/src/fields/config/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
diff --git a/packages/payload/test/access-control/e2e.spec.ts b/test/access-control/e2e.spec.ts
similarity index 98%
rename from packages/payload/test/access-control/e2e.spec.ts
rename to test/access-control/e2e.spec.ts
index aef38ddd6..329d073bf 100644
--- a/packages/payload/test/access-control/e2e.spec.ts
+++ b/test/access-control/e2e.spec.ts
@@ -4,8 +4,8 @@ import { expect, test } from '@playwright/test'
 
 import type { ReadOnlyCollection, RestrictedVersion } from './payload-types'
 
-import payload from '../../src'
-import wait from '../../src/utilities/wait'
+import payload from '../../packages/payload/src'
+import wait from '../../packages/payload/src/utilities/wait'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadE2E } from '../helpers/configHelpers'
 import {
diff --git a/packages/payload/test/access-control/int.spec.ts b/test/access-control/int.spec.ts
similarity index 98%
rename from packages/payload/test/access-control/int.spec.ts
rename to test/access-control/int.spec.ts
index 919225a81..f2e0231fe 100644
--- a/packages/payload/test/access-control/int.spec.ts
+++ b/test/access-control/int.spec.ts
@@ -1,8 +1,8 @@
-import type { PayloadRequest } from '../../src/types'
+import type { PayloadRequest } from '../../packages/payload/src/types'
 import type { Post, RelyOnRequestHeader, Restricted } from './payload-types'
 
-import payload from '../../src'
-import { Forbidden } from '../../src/errors'
+import payload from '../../packages/payload/src'
+import { Forbidden } from '../../packages/payload/src/errors'
 import { initPayloadTest } from '../helpers/configHelpers'
 import {
   hiddenAccessSlug,
diff --git a/packages/payload/test/access-control/payload-types.ts b/test/access-control/payload-types.ts
similarity index 100%
rename from packages/payload/test/access-control/payload-types.ts
rename to test/access-control/payload-types.ts
diff --git a/packages/payload/test/access-control/shared.ts b/test/access-control/shared.ts
similarity index 100%
rename from packages/payload/test/access-control/shared.ts
rename to test/access-control/shared.ts
diff --git a/packages/payload/test/admin/components/AfterDashboard/index.scss b/test/admin/components/AfterDashboard/index.scss
similarity index 100%
rename from packages/payload/test/admin/components/AfterDashboard/index.scss
rename to test/admin/components/AfterDashboard/index.scss
diff --git a/packages/payload/test/admin/components/AfterDashboard/index.tsx b/test/admin/components/AfterDashboard/index.tsx
similarity index 100%
rename from packages/payload/test/admin/components/AfterDashboard/index.tsx
rename to test/admin/components/AfterDashboard/index.tsx
diff --git a/packages/payload/test/admin/components/AfterNavLinks/index.tsx b/test/admin/components/AfterNavLinks/index.tsx
similarity index 85%
rename from packages/payload/test/admin/components/AfterNavLinks/index.tsx
rename to test/admin/components/AfterNavLinks/index.tsx
index cdcb05efb..bc4c6f145 100644
--- a/packages/payload/test/admin/components/AfterNavLinks/index.tsx
+++ b/test/admin/components/AfterNavLinks/index.tsx
@@ -2,8 +2,8 @@ import React from 'react'
 import { NavLink } from 'react-router-dom'
 
 // As this is the demo project, we import our dependencies from the `src` directory.
-import Chevron from '../../../../src/admin/components/icons/Chevron'
-import { useConfig } from '../../../../src/admin/components/utilities/Config'
+import Chevron from '../../../../packages/payload/src/admin/components/icons/Chevron'
+import { useConfig } from '../../../../packages/payload/src/admin/components/utilities/Config'
 
 // In your projects, you can import as follows:
 // import { Chevron } from 'payload/components';
diff --git a/packages/payload/test/admin/components/BeforeLogin/index.tsx b/test/admin/components/BeforeLogin/index.tsx
similarity index 100%
rename from packages/payload/test/admin/components/BeforeLogin/index.tsx
rename to test/admin/components/BeforeLogin/index.tsx
diff --git a/packages/payload/test/admin/components/CustomProvider/index.tsx b/test/admin/components/CustomProvider/index.tsx
similarity index 100%
rename from packages/payload/test/admin/components/CustomProvider/index.tsx
rename to test/admin/components/CustomProvider/index.tsx
diff --git a/packages/payload/test/admin/components/DemoUIField/Cell.tsx b/test/admin/components/DemoUIField/Cell.tsx
similarity index 100%
rename from packages/payload/test/admin/components/DemoUIField/Cell.tsx
rename to test/admin/components/DemoUIField/Cell.tsx
diff --git a/packages/payload/test/admin/components/DemoUIField/Field.tsx b/test/admin/components/DemoUIField/Field.tsx
similarity index 100%
rename from packages/payload/test/admin/components/DemoUIField/Field.tsx
rename to test/admin/components/DemoUIField/Field.tsx
diff --git a/packages/payload/test/admin/components/Logout/index.tsx b/test/admin/components/Logout/index.tsx
similarity index 60%
rename from packages/payload/test/admin/components/Logout/index.tsx
rename to test/admin/components/Logout/index.tsx
index b375f44df..9e2e116e7 100644
--- a/packages/payload/test/admin/components/Logout/index.tsx
+++ b/test/admin/components/Logout/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 
-import LogOut from '../../../../src/admin/components/icons/LogOut'
-import { useConfig } from '../../../../src/admin/components/utilities/Config'
+import LogOut from '../../../../packages/payload/src/admin/components/icons/LogOut'
+import { useConfig } from '../../../../packages/payload/src/admin/components/utilities/Config'
 
 const Logout: React.FC = () => {
   const config = useConfig()
diff --git a/packages/payload/test/admin/components/richText/elements/Button/Button/index.scss b/test/admin/components/richText/elements/Button/Button/index.scss
similarity index 85%
rename from packages/payload/test/admin/components/richText/elements/Button/Button/index.scss
rename to test/admin/components/richText/elements/Button/Button/index.scss
index 0805537a7..3529db77d 100644
--- a/packages/payload/test/admin/components/richText/elements/Button/Button/index.scss
+++ b/test/admin/components/richText/elements/Button/Button/index.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../../src/admin/scss/styles.scss';
+@import '../../../../../../../packages/payload/src/admin/scss/styles.scss';
 
 .button-rich-text-button {
   .btn {
diff --git a/packages/payload/test/admin/components/richText/elements/Button/Button/index.tsx b/test/admin/components/richText/elements/Button/Button/index.tsx
similarity index 71%
rename from packages/payload/test/admin/components/richText/elements/Button/Button/index.tsx
rename to test/admin/components/richText/elements/Button/Button/index.tsx
index cb2364ec3..4f2cc6385 100644
--- a/packages/payload/test/admin/components/richText/elements/Button/Button/index.tsx
+++ b/test/admin/components/richText/elements/Button/Button/index.tsx
@@ -3,16 +3,16 @@ import React, { Fragment, useCallback } from 'react'
 import { Transforms } from 'slate'
 import { ReactEditor, useSlate } from 'slate-react'
 
-import Button from '../../../../../../../src/admin/components/elements/Button'
-import Form from '../../../../../../../src/admin/components/forms/Form'
-import reduceFieldsToValues from '../../../../../../../src/admin/components/forms/Form/reduceFieldsToValues'
-import Submit from '../../../../../../../src/admin/components/forms/Submit'
-import Checkbox from '../../../../../../../src/admin/components/forms/field-types/Checkbox'
-import ElementButton from '../../../../../../../src/admin/components/forms/field-types/RichText/elements/Button'
-import Select from '../../../../../../../src/admin/components/forms/field-types/Select'
-import Text from '../../../../../../../src/admin/components/forms/field-types/Text'
-import X from '../../../../../../../src/admin/components/icons/X'
-import MinimalTemplate from '../../../../../../../src/admin/components/templates/Minimal'
+import Button from '../../../../../../../packages/payload/src/admin/components/elements/Button'
+import Form from '../../../../../../../packages/payload/src/admin/components/forms/Form'
+import reduceFieldsToValues from '../../../../../../../packages/payload/src/admin/components/forms/Form/reduceFieldsToValues'
+import Submit from '../../../../../../../packages/payload/src/admin/components/forms/Submit'
+import Checkbox from '../../../../../../../packages/payload/src/admin/components/forms/field-types/Checkbox'
+import ElementButton from '../../../../../../../packages/payload/src/admin/components/forms/field-types/RichText/elements/Button'
+import Select from '../../../../../../../packages/payload/src/admin/components/forms/field-types/Select'
+import Text from '../../../../../../../packages/payload/src/admin/components/forms/field-types/Text'
+import X from '../../../../../../../packages/payload/src/admin/components/icons/X'
+import MinimalTemplate from '../../../../../../../packages/payload/src/admin/components/templates/Minimal'
 import './index.scss'
 
 const baseClass = 'button-rich-text-button'
diff --git a/packages/payload/test/admin/components/richText/elements/Button/Element/index.scss b/test/admin/components/richText/elements/Button/Element/index.scss
similarity index 78%
rename from packages/payload/test/admin/components/richText/elements/Button/Element/index.scss
rename to test/admin/components/richText/elements/Button/Element/index.scss
index 736f121c7..467ee8064 100644
--- a/packages/payload/test/admin/components/richText/elements/Button/Element/index.scss
+++ b/test/admin/components/richText/elements/Button/Element/index.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../../src/admin/scss/styles.scss';
+@import '../../../../../../../packages/payload/src/admin/scss/styles.scss';
 
 .rich-text-button {
   margin: $baseline 0;
diff --git a/packages/payload/test/admin/components/richText/elements/Button/Element/index.tsx b/test/admin/components/richText/elements/Button/Element/index.tsx
similarity index 100%
rename from packages/payload/test/admin/components/richText/elements/Button/Element/index.tsx
rename to test/admin/components/richText/elements/Button/Element/index.tsx
diff --git a/packages/payload/test/admin/components/richText/elements/Button/index.ts b/test/admin/components/richText/elements/Button/index.ts
similarity index 67%
rename from packages/payload/test/admin/components/richText/elements/Button/index.ts
rename to test/admin/components/richText/elements/Button/index.ts
index 207597104..315642169 100644
--- a/packages/payload/test/admin/components/richText/elements/Button/index.ts
+++ b/test/admin/components/richText/elements/Button/index.ts
@@ -1,4 +1,4 @@
-import type { RichTextCustomElement } from '../../../../../../src/fields/config/types'
+import type { RichTextCustomElement } from '../../../../../../packages/payload/src/fields/config/types'
 
 import Button from './Button'
 import Element from './Element'
diff --git a/packages/payload/test/admin/components/richText/elements/Button/plugin.ts b/test/admin/components/richText/elements/Button/plugin.ts
similarity index 100%
rename from packages/payload/test/admin/components/richText/elements/Button/plugin.ts
rename to test/admin/components/richText/elements/Button/plugin.ts
diff --git a/packages/payload/test/admin/components/richText/leaves/PurpleBackground/Button/index.tsx b/test/admin/components/richText/leaves/PurpleBackground/Button/index.tsx
similarity index 53%
rename from packages/payload/test/admin/components/richText/leaves/PurpleBackground/Button/index.tsx
rename to test/admin/components/richText/leaves/PurpleBackground/Button/index.tsx
index 2b17e9acb..3913e283c 100644
--- a/packages/payload/test/admin/components/richText/leaves/PurpleBackground/Button/index.tsx
+++ b/test/admin/components/richText/leaves/PurpleBackground/Button/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import LeafButton from '../../../../../../../src/admin/components/forms/field-types/RichText/leaves/Button'
+import LeafButton from '../../../../../../../packages/payload/src/admin/components/forms/field-types/RichText/leaves/Button'
 
 const Button = () => <LeafButton format="purple-background">Purple Background</LeafButton>
 
diff --git a/packages/payload/test/admin/components/richText/leaves/PurpleBackground/Leaf/index.tsx b/test/admin/components/richText/leaves/PurpleBackground/Leaf/index.tsx
similarity index 100%
rename from packages/payload/test/admin/components/richText/leaves/PurpleBackground/Leaf/index.tsx
rename to test/admin/components/richText/leaves/PurpleBackground/Leaf/index.tsx
diff --git a/packages/payload/test/admin/components/richText/leaves/PurpleBackground/index.ts b/test/admin/components/richText/leaves/PurpleBackground/index.ts
similarity index 100%
rename from packages/payload/test/admin/components/richText/leaves/PurpleBackground/index.ts
rename to test/admin/components/richText/leaves/PurpleBackground/index.ts
diff --git a/packages/payload/test/admin/components/views/CustomDefault/index.tsx b/test/admin/components/views/CustomDefault/index.tsx
similarity index 72%
rename from packages/payload/test/admin/components/views/CustomDefault/index.tsx
rename to test/admin/components/views/CustomDefault/index.tsx
index 2985d58e7..8dc94df5a 100644
--- a/packages/payload/test/admin/components/views/CustomDefault/index.tsx
+++ b/test/admin/components/views/CustomDefault/index.tsx
@@ -1,15 +1,15 @@
 import React, { useEffect } from 'react'
 import { Redirect } from 'react-router-dom'
 
-import type { AdminView } from '../../../../../src/config/types'
+import type { AdminView } from '../../../../../packages/payload/src/config/types'
 
-import Button from '../../../../../src/admin/components/elements/Button'
-import Eyebrow from '../../../../../src/admin/components/elements/Eyebrow'
-import { useStepNav } from '../../../../../src/admin/components/elements/StepNav'
+import Button from '../../../../../packages/payload/src/admin/components/elements/Button'
+import Eyebrow from '../../../../../packages/payload/src/admin/components/elements/Eyebrow'
+import { useStepNav } from '../../../../../packages/payload/src/admin/components/elements/StepNav'
 // As this is the demo project, we import our dependencies from the `src` directory.
-import DefaultTemplate from '../../../../../src/admin/components/templates/Default'
-import { useConfig } from '../../../../../src/admin/components/utilities/Config'
-import Meta from '../../../../../src/admin/components/utilities/Meta'
+import DefaultTemplate from '../../../../../packages/payload/src/admin/components/templates/Default'
+import { useConfig } from '../../../../../packages/payload/src/admin/components/utilities/Config'
+import Meta from '../../../../../packages/payload/src/admin/components/utilities/Meta'
 
 // In your projects, you can import as follows:
 // import { DefaultTemplate } from 'payload/components/templates';
diff --git a/packages/payload/test/admin/components/views/CustomMinimal/index.scss b/test/admin/components/views/CustomMinimal/index.scss
similarity index 100%
rename from packages/payload/test/admin/components/views/CustomMinimal/index.scss
rename to test/admin/components/views/CustomMinimal/index.scss
diff --git a/packages/payload/test/admin/components/views/CustomMinimal/index.tsx b/test/admin/components/views/CustomMinimal/index.tsx
similarity index 77%
rename from packages/payload/test/admin/components/views/CustomMinimal/index.tsx
rename to test/admin/components/views/CustomMinimal/index.tsx
index 665d0a58a..6a186c601 100644
--- a/packages/payload/test/admin/components/views/CustomMinimal/index.tsx
+++ b/test/admin/components/views/CustomMinimal/index.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 
-import Button from '../../../../../src/admin/components/elements/Button'
+import Button from '../../../../../packages/payload/src/admin/components/elements/Button'
 // As this is the demo project, we import our dependencies from the `src` directory.
-import MinimalTemplate from '../../../../../src/admin/components/templates/Minimal'
-import { useConfig } from '../../../../../src/admin/components/utilities/Config'
+import MinimalTemplate from '../../../../../packages/payload/src/admin/components/templates/Minimal'
+import { useConfig } from '../../../../../packages/payload/src/admin/components/utilities/Config'
 
 // In your projects, you can import as follows:
 // import { MinimalTemplate } from 'payload/components/templates';
diff --git a/packages/payload/test/admin/config.ts b/test/admin/config.ts
similarity index 98%
rename from packages/payload/test/admin/config.ts
rename to test/admin/config.ts
index 1d8f8f111..29447d231 100644
--- a/packages/payload/test/admin/config.ts
+++ b/test/admin/config.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { mapAsync } from '../../src/utilities/mapAsync'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
 import AfterDashboard from './components/AfterDashboard'
diff --git a/packages/payload/test/admin/e2e.spec.ts b/test/admin/e2e.spec.ts
similarity index 99%
rename from packages/payload/test/admin/e2e.spec.ts
rename to test/admin/e2e.spec.ts
index 710ea47b6..b1ddadcee 100644
--- a/packages/payload/test/admin/e2e.spec.ts
+++ b/test/admin/e2e.spec.ts
@@ -5,9 +5,9 @@ import qs from 'qs'
 
 import type { Post } from './config'
 
-import payload from '../../src'
-import { mapAsync } from '../../src/utilities/mapAsync'
-import wait from '../../src/utilities/wait'
+import payload from '../../packages/payload/src'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
+import wait from '../../packages/payload/src/utilities/wait'
 import { saveDocAndAssert, saveDocHotkeyAndAssert } from '../helpers'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadE2E } from '../helpers/configHelpers'
@@ -427,8 +427,7 @@ describe('admin', () => {
       test('should accept where query from complex, valid URL where parameter using the near operator', async () => {
         // We have one point collection with the point [5,-5] and one with [7,-7]. This where query should kick out the [5,-5] point
         await page.goto(
-          `${
-            new AdminUrlUtil(serverURL, 'geo').list
+          `${new AdminUrlUtil(serverURL, 'geo').list
           }?limit=10&page=1&where[or][0][and][0][point][near]=6,-7,200000`,
         )
 
@@ -439,8 +438,7 @@ describe('admin', () => {
       test('should accept transformed where query from complex, invalid URL where parameter using the near operator', async () => {
         // We have one point collection with the point [5,-5] and one with [7,-7]. This where query should kick out the [5,-5] point
         await page.goto(
-          `${
-            new AdminUrlUtil(serverURL, 'geo').list
+          `${new AdminUrlUtil(serverURL, 'geo').list
           }?limit=10&page=1&where[point][near]=6,-7,200000`,
         )
 
diff --git a/packages/payload/test/admin/payload-types.ts b/test/admin/payload-types.ts
similarity index 100%
rename from packages/payload/test/admin/payload-types.ts
rename to test/admin/payload-types.ts
diff --git a/packages/payload/test/admin/placeholder.png b/test/admin/placeholder.png
similarity index 100%
rename from packages/payload/test/admin/placeholder.png
rename to test/admin/placeholder.png
diff --git a/packages/payload/test/admin/shared.ts b/test/admin/shared.ts
similarity index 100%
rename from packages/payload/test/admin/shared.ts
rename to test/admin/shared.ts
diff --git a/packages/payload/test/admin/styles.scss b/test/admin/styles.scss
similarity index 100%
rename from packages/payload/test/admin/styles.scss
rename to test/admin/styles.scss
diff --git a/packages/payload/test/array-update/config.ts b/test/array-update/config.ts
similarity index 100%
rename from packages/payload/test/array-update/config.ts
rename to test/array-update/config.ts
diff --git a/packages/payload/test/array-update/int.spec.ts b/test/array-update/int.spec.ts
similarity index 98%
rename from packages/payload/test/array-update/int.spec.ts
rename to test/array-update/int.spec.ts
index e694a5549..6fae937dd 100644
--- a/packages/payload/test/array-update/int.spec.ts
+++ b/test/array-update/int.spec.ts
@@ -1,4 +1,4 @@
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'
 import configPromise from './config'
 
diff --git a/packages/payload/test/array-update/payload-types.ts b/test/array-update/payload-types.ts
similarity index 100%
rename from packages/payload/test/array-update/payload-types.ts
rename to test/array-update/payload-types.ts
diff --git a/packages/payload/test/auth/AuthDebug.tsx b/test/auth/AuthDebug.tsx
similarity index 72%
rename from packages/payload/test/auth/AuthDebug.tsx
rename to test/auth/AuthDebug.tsx
index 0ac1bd133..40db4a28f 100644
--- a/packages/payload/test/auth/AuthDebug.tsx
+++ b/test/auth/AuthDebug.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react'
 
-import type { User } from '../../src/auth'
-import type { UIField } from '../../src/fields/config/types'
+import type { User } from '../../packages/payload/src/auth'
+import type { UIField } from '../../packages/payload/src/fields/config/types'
 
-import { useAuth } from '../../src/admin/components/utilities/Auth'
+import { useAuth } from '../../packages/payload/src/admin/components/utilities/Auth'
 
 export const AuthDebug: React.FC<UIField> = () => {
   const [state, setState] = useState<User | null | undefined>()
diff --git a/packages/payload/test/auth/config.ts b/test/auth/config.ts
similarity index 98%
rename from packages/payload/test/auth/config.ts
rename to test/auth/config.ts
index d9f273100..c2ceb166f 100644
--- a/packages/payload/test/auth/config.ts
+++ b/test/auth/config.ts
@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid'
 
-import { mapAsync } from '../../src/utilities/mapAsync'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
 import { AuthDebug } from './AuthDebug'
diff --git a/packages/payload/test/auth/custom-strategy/config.ts b/test/auth/custom-strategy/config.ts
similarity index 96%
rename from packages/payload/test/auth/custom-strategy/config.ts
rename to test/auth/custom-strategy/config.ts
index b7974511f..01741a3a4 100644
--- a/packages/payload/test/auth/custom-strategy/config.ts
+++ b/test/auth/custom-strategy/config.ts
@@ -2,7 +2,7 @@ import type { Request } from 'express'
 
 import { Strategy } from 'passport-strategy'
 
-import type { Payload } from '../../../src/payload'
+import type { Payload } from '../../../packages/payload/src/payload'
 
 import { buildConfigWithDefaults } from '../../buildConfigWithDefaults'
 
diff --git a/packages/payload/test/auth/custom-strategy/int.spec.ts b/test/auth/custom-strategy/int.spec.ts
similarity index 95%
rename from packages/payload/test/auth/custom-strategy/int.spec.ts
rename to test/auth/custom-strategy/int.spec.ts
index 3b8e2b578..b3f33196c 100644
--- a/packages/payload/test/auth/custom-strategy/int.spec.ts
+++ b/test/auth/custom-strategy/int.spec.ts
@@ -1,4 +1,4 @@
-import payload from '../../../src'
+import payload from '../../../packages/payload/src'
 import { initPayloadTest } from '../../helpers/configHelpers'
 import { slug } from './config'
 
diff --git a/packages/payload/test/auth/e2e.spec.ts b/test/auth/e2e.spec.ts
similarity index 100%
rename from packages/payload/test/auth/e2e.spec.ts
rename to test/auth/e2e.spec.ts
diff --git a/packages/payload/test/auth/int.spec.ts b/test/auth/int.spec.ts
similarity index 99%
rename from packages/payload/test/auth/int.spec.ts
rename to test/auth/int.spec.ts
index 6219268ab..22597be61 100644
--- a/packages/payload/test/auth/int.spec.ts
+++ b/test/auth/int.spec.ts
@@ -2,9 +2,9 @@ import { GraphQLClient } from 'graphql-request'
 import jwtDecode from 'jwt-decode'
 import mongoose from 'mongoose'
 
-import type { User } from '../../src/auth'
+import type { User } from '../../packages/payload/src/auth'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import configPromise from '../collections-graphql/config'
 import { devUser } from '../credentials'
 import { initPayloadTest } from '../helpers/configHelpers'
diff --git a/packages/payload/test/auth/payload-types.ts b/test/auth/payload-types.ts
similarity index 100%
rename from packages/payload/test/auth/payload-types.ts
rename to test/auth/payload-types.ts
diff --git a/packages/payload/test/auth/removed-token/config.ts b/test/auth/removed-token/config.ts
similarity index 100%
rename from packages/payload/test/auth/removed-token/config.ts
rename to test/auth/removed-token/config.ts
diff --git a/packages/payload/test/auth/removed-token/int.spec.ts b/test/auth/removed-token/int.spec.ts
similarity index 97%
rename from packages/payload/test/auth/removed-token/int.spec.ts
rename to test/auth/removed-token/int.spec.ts
index 3e494a569..fb27f7167 100644
--- a/packages/payload/test/auth/removed-token/int.spec.ts
+++ b/test/auth/removed-token/int.spec.ts
@@ -1,6 +1,6 @@
 import mongoose from 'mongoose'
 
-import payload from '../../../src'
+import payload from '../../../packages/payload/src'
 import { devUser } from '../../credentials'
 import { initPayloadTest } from '../../helpers/configHelpers'
 import { RESTClient } from '../../helpers/rest'
diff --git a/packages/payload/test/auth/ui/AuthDebug.tsx b/test/auth/ui/AuthDebug.tsx
similarity index 71%
rename from packages/payload/test/auth/ui/AuthDebug.tsx
rename to test/auth/ui/AuthDebug.tsx
index 304f61d49..b0d401587 100644
--- a/packages/payload/test/auth/ui/AuthDebug.tsx
+++ b/test/auth/ui/AuthDebug.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react'
 
-import type { User } from '../../../src/auth'
-import type { UIField } from '../../../src/fields/config/types'
+import type { User } from '../../../packages/payload/src/auth'
+import type { UIField } from '../../../packages/payload/src/fields/config/types'
 
-import { useAuth } from '../../../src/admin/components/utilities/Auth'
+import { useAuth } from '../../../packages/payload/src/admin/components/utilities/Auth'
 
 export const AuthDebug: React.FC<UIField> = () => {
   const [state, setState] = useState<User | null | undefined>()
diff --git a/packages/payload/test/buildConfigWithDefaults.ts b/test/buildConfigWithDefaults.ts
similarity index 69%
rename from packages/payload/test/buildConfigWithDefaults.ts
rename to test/buildConfigWithDefaults.ts
index bbf8be769..6beebd0bc 100644
--- a/packages/payload/test/buildConfigWithDefaults.ts
+++ b/test/buildConfigWithDefaults.ts
@@ -1,10 +1,10 @@
 import path from 'path'
 
-import type { Config, SanitizedConfig } from '../src/config/types'
+import type { Config, SanitizedConfig } from '../packages/payload/src/config/types'
 
-import { mongooseAdapter } from '../../db-mongodb/src/index'
-import { postgresAdapter } from '../../db-postgres/src/index'
-import { buildConfig as buildPayloadConfig } from '../src/config/build'
+import { mongooseAdapter } from '../packages/db-mongodb/src/index'
+import { postgresAdapter } from '../packages/db-postgres/src/index'
+import { buildConfig as buildPayloadConfig } from '../packages/payload/src/config/build'
 
 const databaseAdapters = {
   mongoose: mongooseAdapter({
@@ -35,9 +35,9 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
       process.env.PAYLOAD_PUBLIC_DISABLE_AUTO_LOGIN === 'true'
         ? false
         : {
-            email: 'dev@payloadcms.com',
-            password: 'test',
-          },
+          email: 'dev@payloadcms.com',
+          password: 'test',
+        },
     ...(config.admin || {}),
     webpack: (webpackConfig) => {
       const existingConfig =
@@ -52,21 +52,21 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
           ...existingConfig.resolve,
           alias: {
             ...existingConfig.resolve?.alias,
-            [path.resolve(__dirname, '../../db-postgres/src/index')]: path.resolve(
+            [path.resolve(__dirname, '../packages/db-postgres/src/index')]: path.resolve(
               __dirname,
-              '../../db-postgres/src/mock',
+              '../packages/db-postgres/src/mock',
             ),
-            [path.resolve(__dirname, '../../db-mongodb/src/index')]: path.resolve(
+            [path.resolve(__dirname, '../packages/db-mongodb/src/index')]: path.resolve(
               __dirname,
-              '../../db-mongodb/src/mock',
+              '../packages/db-mongodb/src/mock',
             ),
             '@payloadcms/db-mongodb': path.resolve(
               __dirname,
-              '../../../packages/db-mongodb/src/mock',
+              '../packages/db-mongodb/src/mock',
             ),
             '@payloadcms/db-postgres': path.resolve(
               __dirname,
-              '../../../packages/db-postgres/src/mock',
+              '../packages/db-postgres/src/mock',
             ),
           },
         },
diff --git a/packages/payload/test/collections-graphql/config.ts b/test/collections-graphql/config.ts
similarity index 99%
rename from packages/payload/test/collections-graphql/config.ts
rename to test/collections-graphql/config.ts
index 9a4fd38bc..0412f529c 100644
--- a/packages/payload/test/collections-graphql/config.ts
+++ b/test/collections-graphql/config.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../src/collections/config/types'
+import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
diff --git a/packages/payload/test/collections-graphql/int.spec.ts b/test/collections-graphql/int.spec.ts
similarity index 99%
rename from packages/payload/test/collections-graphql/int.spec.ts
rename to test/collections-graphql/int.spec.ts
index adb9fb977..e1d105edc 100644
--- a/packages/payload/test/collections-graphql/int.spec.ts
+++ b/test/collections-graphql/int.spec.ts
@@ -2,8 +2,8 @@ import { GraphQLClient } from 'graphql-request'
 
 import type { Post } from './payload-types'
 
-import payload from '../../src'
-import { mapAsync } from '../../src/utilities/mapAsync'
+import payload from '../../packages/payload/src'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { initPayloadTest } from '../helpers/configHelpers'
 import configPromise, { pointSlug, slug } from './config'
 
@@ -477,7 +477,7 @@ describe('collections-graphql', () => {
           docs.forEach(({ point: coordinates }) => {
             // The next document point should always be greater than the one before
             expect(previous).toBeLessThanOrEqual(coordinates[0])
-            ;[previous] = coordinates
+              ;[previous] = coordinates
           })
         })
       })
diff --git a/packages/payload/test/collections-graphql/payload-types.ts b/test/collections-graphql/payload-types.ts
similarity index 100%
rename from packages/payload/test/collections-graphql/payload-types.ts
rename to test/collections-graphql/payload-types.ts
diff --git a/packages/payload/test/collections-graphql/schema.graphql b/test/collections-graphql/schema.graphql
similarity index 100%
rename from packages/payload/test/collections-graphql/schema.graphql
rename to test/collections-graphql/schema.graphql
diff --git a/packages/payload/test/collections-rest/config.ts b/test/collections-rest/config.ts
similarity index 98%
rename from packages/payload/test/collections-rest/config.ts
rename to test/collections-rest/config.ts
index b1ce0e220..00c28a8e5 100644
--- a/packages/payload/test/collections-rest/config.ts
+++ b/test/collections-rest/config.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../src/collections/config/types'
+import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
diff --git a/packages/payload/test/collections-rest/int.spec.ts b/test/collections-rest/int.spec.ts
similarity index 98%
rename from packages/payload/test/collections-rest/int.spec.ts
rename to test/collections-rest/int.spec.ts
index 90d500582..40ac9b149 100644
--- a/packages/payload/test/collections-rest/int.spec.ts
+++ b/test/collections-rest/int.spec.ts
@@ -4,8 +4,8 @@ import mongoose from 'mongoose'
 import type { Relation } from './config'
 import type { ErrorOnHook, Post } from './payload-types'
 
-import payload from '../../src'
-import { mapAsync } from '../../src/utilities/mapAsync'
+import payload from '../../packages/payload/src'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
 import config, {
@@ -430,18 +430,18 @@ describe('collections-rest', () => {
       const nameToQuery2 = 'name2'
 
       beforeEach(async () => {
-        ;({ doc: relation } = await client.create<Relation>({
+        ; ({ doc: relation } = await client.create<Relation>({
           slug: relationSlug,
           data: {
             name: nameToQuery,
           },
         }))
-        ;({ doc: relation2 } = await client.create<Relation>({
-          slug: relationSlug,
-          data: {
-            name: nameToQuery2,
-          },
-        }))
+          ; ({ doc: relation2 } = await client.create<Relation>({
+            slug: relationSlug,
+            data: {
+              name: nameToQuery2,
+            },
+          }))
 
         post = await createPost({
           relationField: relation.id,
@@ -909,7 +909,7 @@ describe('collections-rest', () => {
           docs.forEach(({ point: coordinates }) => {
             // the next document point should always be greater than the one before
             expect(previous).toBeLessThanOrEqual(coordinates[0])
-            ;[previous] = coordinates
+              ;[previous] = coordinates
           })
         })
       })
diff --git a/packages/payload/test/collections-rest/payload-types.ts b/test/collections-rest/payload-types.ts
similarity index 100%
rename from packages/payload/test/collections-rest/payload-types.ts
rename to test/collections-rest/payload-types.ts
diff --git a/packages/payload/test/componentsSetup.js b/test/componentsSetup.js
similarity index 100%
rename from packages/payload/test/componentsSetup.js
rename to test/componentsSetup.js
diff --git a/packages/payload/test/config/config.ts b/test/config/config.ts
similarity index 95%
rename from packages/payload/test/config/config.ts
rename to test/config/config.ts
index adca7a523..75302e6fb 100644
--- a/packages/payload/test/config/config.ts
+++ b/test/config/config.ts
@@ -1,4 +1,4 @@
-import type { Config } from '../../src/config/types'
+import type { Config } from '../../packages/payload/src/config/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { openAccess } from '../helpers/configHelpers'
diff --git a/packages/payload/test/config/int.spec.ts b/test/config/int.spec.ts
similarity index 97%
rename from packages/payload/test/config/int.spec.ts
rename to test/config/int.spec.ts
index 7863bde6b..649553f65 100644
--- a/packages/payload/test/config/int.spec.ts
+++ b/test/config/int.spec.ts
@@ -1,4 +1,4 @@
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'
 
 require('isomorphic-fetch')
diff --git a/packages/payload/test/credentials.ts b/test/credentials.ts
similarity index 100%
rename from packages/payload/test/credentials.ts
rename to test/credentials.ts
diff --git a/packages/payload/test/dataloader/config.ts b/test/dataloader/config.ts
similarity index 100%
rename from packages/payload/test/dataloader/config.ts
rename to test/dataloader/config.ts
diff --git a/packages/payload/test/dataloader/int.spec.ts b/test/dataloader/int.spec.ts
similarity index 98%
rename from packages/payload/test/dataloader/int.spec.ts
rename to test/dataloader/int.spec.ts
index a5ad85297..523a7cfcb 100644
--- a/packages/payload/test/dataloader/int.spec.ts
+++ b/test/dataloader/int.spec.ts
@@ -1,6 +1,6 @@
 import { GraphQLClient } from 'graphql-request'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { devUser } from '../credentials'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { postDoc } from './config'
diff --git a/packages/payload/test/dataloader/payload-types.ts b/test/dataloader/payload-types.ts
similarity index 100%
rename from packages/payload/test/dataloader/payload-types.ts
rename to test/dataloader/payload-types.ts
diff --git a/packages/payload/test/dev.ts b/test/dev.ts
similarity index 97%
rename from packages/payload/test/dev.ts
rename to test/dev.ts
index 17c2a2dec..824814cca 100644
--- a/packages/payload/test/dev.ts
+++ b/test/dev.ts
@@ -4,7 +4,7 @@ import fs from 'fs'
 import path from 'path'
 import { v4 as uuid } from 'uuid'
 
-import payload from '../src'
+import payload from '../packages/payload/src'
 
 dotenv.config()
 
diff --git a/packages/payload/test/endpoints/config.ts b/test/endpoints/config.ts
similarity index 96%
rename from packages/payload/test/endpoints/config.ts
rename to test/endpoints/config.ts
index def9727e3..7aa2ad633 100644
--- a/packages/payload/test/endpoints/config.ts
+++ b/test/endpoints/config.ts
@@ -2,8 +2,8 @@ import type { Response } from 'express'
 
 import express from 'express'
 
-import type { Config } from '../../src/config/types'
-import type { PayloadRequest } from '../../src/express/types'
+import type { Config } from '../../packages/payload/src/config/types'
+import type { PayloadRequest } from '../../packages/payload/src/express/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
diff --git a/packages/payload/test/endpoints/int.spec.ts b/test/endpoints/int.spec.ts
similarity index 100%
rename from packages/payload/test/endpoints/int.spec.ts
rename to test/endpoints/int.spec.ts
diff --git a/packages/payload/test/endpoints/payload-types.ts b/test/endpoints/payload-types.ts
similarity index 100%
rename from packages/payload/test/endpoints/payload-types.ts
rename to test/endpoints/payload-types.ts
diff --git a/packages/payload/test/field-error-states/collections/ErrorFields/index.ts b/test/field-error-states/collections/ErrorFields/index.ts
similarity index 96%
rename from packages/payload/test/field-error-states/collections/ErrorFields/index.ts
rename to test/field-error-states/collections/ErrorFields/index.ts
index b857ace83..0b83b6503 100644
--- a/packages/payload/test/field-error-states/collections/ErrorFields/index.ts
+++ b/test/field-error-states/collections/ErrorFields/index.ts
@@ -1,5 +1,5 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
-import type { Field } from '../../../../src/fields/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
+import type { Field } from '../../../../packages/payload/src/fields/config/types'
 
 export const errorFieldsSlug = 'error-fields'
 
diff --git a/packages/payload/test/field-error-states/collections/Upload/.gitignore b/test/field-error-states/collections/Upload/.gitignore
similarity index 100%
rename from packages/payload/test/field-error-states/collections/Upload/.gitignore
rename to test/field-error-states/collections/Upload/.gitignore
diff --git a/packages/payload/test/fields/collections/Upload/index.ts b/test/field-error-states/collections/Upload/index.ts
similarity index 84%
rename from packages/payload/test/fields/collections/Upload/index.ts
rename to test/field-error-states/collections/Upload/index.ts
index a3a24494a..da72adcf6 100644
--- a/packages/payload/test/fields/collections/Upload/index.ts
+++ b/test/field-error-states/collections/Upload/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const Uploads: CollectionConfig = {
   slug: 'uploads',
diff --git a/packages/payload/test/field-error-states/config.ts b/test/field-error-states/config.ts
similarity index 100%
rename from packages/payload/test/field-error-states/config.ts
rename to test/field-error-states/config.ts
diff --git a/packages/payload/test/field-error-states/e2e.spec.ts b/test/field-error-states/e2e.spec.ts
similarity index 100%
rename from packages/payload/test/field-error-states/e2e.spec.ts
rename to test/field-error-states/e2e.spec.ts
diff --git a/packages/payload/test/field-error-states/payload-types.ts b/test/field-error-states/payload-types.ts
similarity index 100%
rename from packages/payload/test/field-error-states/payload-types.ts
rename to test/field-error-states/payload-types.ts
diff --git a/packages/payload/test/field-error-states/schema.graphql b/test/field-error-states/schema.graphql
similarity index 100%
rename from packages/payload/test/field-error-states/schema.graphql
rename to test/field-error-states/schema.graphql
diff --git a/packages/payload/test/field-error-states/tsconfig.json b/test/field-error-states/tsconfig.json
similarity index 100%
rename from packages/payload/test/field-error-states/tsconfig.json
rename to test/field-error-states/tsconfig.json
diff --git a/packages/payload/test/field-perf/config.ts b/test/field-perf/config.ts
similarity index 100%
rename from packages/payload/test/field-perf/config.ts
rename to test/field-perf/config.ts
diff --git a/packages/payload/test/fields-relationship/PrePopulateFieldUI/index.tsx b/test/fields-relationship/PrePopulateFieldUI/index.tsx
similarity index 94%
rename from packages/payload/test/fields-relationship/PrePopulateFieldUI/index.tsx
rename to test/fields-relationship/PrePopulateFieldUI/index.tsx
index 3aea9d312..3aec55eaa 100644
--- a/packages/payload/test/fields-relationship/PrePopulateFieldUI/index.tsx
+++ b/test/fields-relationship/PrePopulateFieldUI/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import useField from '../../../src/admin/components/forms/useField'
+import useField from '../../../packages/payload/src/admin/components/forms/useField'
 import { collection1Slug } from '../collectionSlugs'
 
 export const PrePopulateFieldUI: React.FC<{
diff --git a/packages/payload/test/fields-relationship/collectionSlugs.ts b/test/fields-relationship/collectionSlugs.ts
similarity index 100%
rename from packages/payload/test/fields-relationship/collectionSlugs.ts
rename to test/fields-relationship/collectionSlugs.ts
diff --git a/packages/payload/test/fields-relationship/config.ts b/test/fields-relationship/config.ts
similarity index 94%
rename from packages/payload/test/fields-relationship/config.ts
rename to test/fields-relationship/config.ts
index de54eab60..e6c9160e3 100644
--- a/packages/payload/test/fields-relationship/config.ts
+++ b/test/fields-relationship/config.ts
@@ -1,7 +1,7 @@
-import type { CollectionConfig } from '../../src/collections/config/types'
-import type { FilterOptionsProps } from '../../src/fields/config/types'
+import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
+import type { FilterOptionsProps } from '../../packages/payload/src/fields/config/types'
 
-import { mapAsync } from '../../src/utilities/mapAsync'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
 import { PrePopulateFieldUI } from './PrePopulateFieldUI'
@@ -381,19 +381,19 @@ export default buildConfigWithDefaults({
         },
       })
     })
-    ;[...Array(15)].forEach((_, i) => {
-      payload.create({
-        collection: collection1Slug,
-        data: {
-          name: `relationship-test ${i}`,
-        },
+      ;[...Array(15)].forEach((_, i) => {
+        payload.create({
+          collection: collection1Slug,
+          data: {
+            name: `relationship-test ${i}`,
+          },
+        })
+        payload.create({
+          collection: collection2Slug,
+          data: {
+            name: `relationship-test ${i}`,
+          },
+        })
       })
-      payload.create({
-        collection: collection2Slug,
-        data: {
-          name: `relationship-test ${i}`,
-        },
-      })
-    })
   },
 })
diff --git a/packages/payload/test/fields-relationship/e2e.spec.ts b/test/fields-relationship/e2e.spec.ts
similarity index 98%
rename from packages/payload/test/fields-relationship/e2e.spec.ts
rename to test/fields-relationship/e2e.spec.ts
index 2362b99fd..277b113ff 100644
--- a/packages/payload/test/fields-relationship/e2e.spec.ts
+++ b/test/fields-relationship/e2e.spec.ts
@@ -10,9 +10,9 @@ import type {
   RelationWithTitle,
 } from './config'
 
-import payload from '../../src'
-import { mapAsync } from '../../src/utilities/mapAsync'
-import wait from '../../src/utilities/wait'
+import payload from '../../packages/payload/src'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
+import wait from '../../packages/payload/src/utilities/wait'
 import { saveDocAndAssert } from '../helpers'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadE2E } from '../helpers/configHelpers'
diff --git a/packages/payload/test/fields-relationship/payload-types.ts b/test/fields-relationship/payload-types.ts
similarity index 100%
rename from packages/payload/test/fields-relationship/payload-types.ts
rename to test/fields-relationship/payload-types.ts
diff --git a/packages/payload/test/fields/collections/Array/LabelComponent.tsx b/test/fields/collections/Array/LabelComponent.tsx
similarity index 64%
rename from packages/payload/test/fields/collections/Array/LabelComponent.tsx
rename to test/fields/collections/Array/LabelComponent.tsx
index f59b914ec..74d3bf130 100644
--- a/packages/payload/test/fields/collections/Array/LabelComponent.tsx
+++ b/test/fields/collections/Array/LabelComponent.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import type { RowLabelComponent } from '../../../../src/admin/components/forms/RowLabel/types'
+import type { RowLabelComponent } from '../../../../packages/payload/src/admin/components/forms/RowLabel/types'
 
 export const ArrayRowLabel: RowLabelComponent = ({ data }) => {
   return (
diff --git a/packages/payload/test/fields/collections/Array/components/AddCustomBlocks/index.scss b/test/fields/collections/Array/components/AddCustomBlocks/index.scss
similarity index 100%
rename from packages/payload/test/fields/collections/Array/components/AddCustomBlocks/index.scss
rename to test/fields/collections/Array/components/AddCustomBlocks/index.scss
diff --git a/packages/payload/test/fields/collections/Array/components/AddCustomBlocks/index.tsx b/test/fields/collections/Array/components/AddCustomBlocks/index.tsx
similarity index 89%
rename from packages/payload/test/fields/collections/Array/components/AddCustomBlocks/index.tsx
rename to test/fields/collections/Array/components/AddCustomBlocks/index.tsx
index 7522253ad..f69bf0e4d 100644
--- a/packages/payload/test/fields/collections/Array/components/AddCustomBlocks/index.tsx
+++ b/test/fields/collections/Array/components/AddCustomBlocks/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 
-import { useForm } from '../../../../../../src/admin/components/forms/Form/context'
-import useField from '../../../../../../src/admin/components/forms/useField'
+import { useForm } from '../../../../../../packages/payload/src/admin/components/forms/Form/context'
+import useField from '../../../../../../packages/payload/src/admin/components/forms/useField'
 import './index.scss'
 
 const baseClass = 'custom-blocks-field-management'
diff --git a/packages/payload/test/fields/collections/Array/index.ts b/test/fields/collections/Array/index.ts
similarity index 97%
rename from packages/payload/test/fields/collections/Array/index.ts
rename to test/fields/collections/Array/index.ts
index 25ce79483..89c4b08b2 100644
--- a/packages/payload/test/fields/collections/Array/index.ts
+++ b/test/fields/collections/Array/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { ArrayRowLabel } from './LabelComponent'
 import { AddCustomBlocks } from './components/AddCustomBlocks'
diff --git a/packages/payload/test/fields/collections/Blocks/index.ts b/test/fields/collections/Blocks/index.ts
similarity index 96%
rename from packages/payload/test/fields/collections/Blocks/index.ts
rename to test/fields/collections/Blocks/index.ts
index 3bcdf3199..449930259 100644
--- a/packages/payload/test/fields/collections/Blocks/index.ts
+++ b/test/fields/collections/Blocks/index.ts
@@ -1,5 +1,5 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
-import type { Field } from '../../../../src/fields/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
+import type { Field } from '../../../../packages/payload/src/fields/config/types'
 
 export const blocksFieldSeedData = [
   {
diff --git a/packages/payload/test/fields/collections/Code/index.tsx b/test/fields/collections/Code/index.tsx
similarity index 95%
rename from packages/payload/test/fields/collections/Code/index.tsx
rename to test/fields/collections/Code/index.tsx
index 6cebea34b..9e069fe90 100644
--- a/packages/payload/test/fields/collections/Code/index.tsx
+++ b/test/fields/collections/Code/index.tsx
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 import type { CodeField } from '../../payload-types'
 
 const Code: CollectionConfig = {
diff --git a/packages/payload/test/fields/collections/Collapsible/LabelComponent.tsx b/test/fields/collections/Collapsible/LabelComponent.tsx
similarity index 68%
rename from packages/payload/test/fields/collections/Collapsible/LabelComponent.tsx
rename to test/fields/collections/Collapsible/LabelComponent.tsx
index f53883977..00486c701 100644
--- a/packages/payload/test/fields/collections/Collapsible/LabelComponent.tsx
+++ b/test/fields/collections/Collapsible/LabelComponent.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import type { RowLabelComponent } from '../../../../src/admin/components/forms/RowLabel/types'
+import type { RowLabelComponent } from '../../../../packages/payload/src/admin/components/forms/RowLabel/types'
 
 export const CollapsibleLabelComponent: RowLabelComponent = ({ data }) => {
   return (
diff --git a/packages/payload/test/fields/collections/Collapsible/index.ts b/test/fields/collections/Collapsible/index.ts
similarity index 97%
rename from packages/payload/test/fields/collections/Collapsible/index.ts
rename to test/fields/collections/Collapsible/index.ts
index ecf4e8801..9d9c425fc 100644
--- a/packages/payload/test/fields/collections/Collapsible/index.ts
+++ b/test/fields/collections/Collapsible/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { CollapsibleLabelComponent } from './LabelComponent'
 
diff --git a/packages/payload/test/fields/collections/ConditionalLogic/index.ts b/test/fields/collections/ConditionalLogic/index.ts
similarity index 95%
rename from packages/payload/test/fields/collections/ConditionalLogic/index.ts
rename to test/fields/collections/ConditionalLogic/index.ts
index aaa60b324..3497b1bad 100644
--- a/packages/payload/test/fields/collections/ConditionalLogic/index.ts
+++ b/test/fields/collections/ConditionalLogic/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const ConditionalLogic: CollectionConfig = {
   slug: 'conditional-logic',
diff --git a/packages/payload/test/fields/collections/Date/index.ts b/test/fields/collections/Date/index.ts
similarity index 93%
rename from packages/payload/test/fields/collections/Date/index.ts
rename to test/fields/collections/Date/index.ts
index fa93607bb..078f6068a 100644
--- a/packages/payload/test/fields/collections/Date/index.ts
+++ b/test/fields/collections/Date/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const defaultText = 'default-text'
 
diff --git a/packages/payload/test/fields/collections/Group/index.ts b/test/fields/collections/Group/index.ts
similarity index 97%
rename from packages/payload/test/fields/collections/Group/index.ts
rename to test/fields/collections/Group/index.ts
index 57aaf9209..a14e78240 100644
--- a/packages/payload/test/fields/collections/Group/index.ts
+++ b/test/fields/collections/Group/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const groupDefaultValue = 'set from parent'
 export const groupDefaultChild = 'child takes priority'
diff --git a/packages/payload/test/fields/collections/Indexed/index.ts b/test/fields/collections/Indexed/index.ts
similarity index 97%
rename from packages/payload/test/fields/collections/Indexed/index.ts
rename to test/fields/collections/Indexed/index.ts
index 91482b692..55879be0e 100644
--- a/packages/payload/test/fields/collections/Indexed/index.ts
+++ b/test/fields/collections/Indexed/index.ts
@@ -1,4 +1,4 @@
-import type { BeforeDuplicate, CollectionConfig } from '../../../../src/collections/config/types'
+import type { BeforeDuplicate, CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 import type { IndexedField } from '../../payload-types'
 
 const beforeDuplicate: BeforeDuplicate<IndexedField> = ({ data }) => {
diff --git a/packages/payload/test/fields/collections/JSON/index.tsx b/test/fields/collections/JSON/index.tsx
similarity index 81%
rename from packages/payload/test/fields/collections/JSON/index.tsx
rename to test/fields/collections/JSON/index.tsx
index a85055532..88a7511a2 100644
--- a/packages/payload/test/fields/collections/JSON/index.tsx
+++ b/test/fields/collections/JSON/index.tsx
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 type JSONField = {
   createdAt: string
diff --git a/packages/payload/test/fields/collections/Number/index.ts b/test/fields/collections/Number/index.ts
similarity index 93%
rename from packages/payload/test/fields/collections/Number/index.ts
rename to test/fields/collections/Number/index.ts
index 5ea194b28..6ceb5b413 100644
--- a/packages/payload/test/fields/collections/Number/index.ts
+++ b/test/fields/collections/Number/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const defaultNumber = 5
 
diff --git a/packages/payload/test/fields/collections/Point/index.ts b/test/fields/collections/Point/index.ts
similarity index 87%
rename from packages/payload/test/fields/collections/Point/index.ts
rename to test/fields/collections/Point/index.ts
index c2235f838..9c274edac 100644
--- a/packages/payload/test/fields/collections/Point/index.ts
+++ b/test/fields/collections/Point/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const pointFieldsSlug = 'point-fields'
 
diff --git a/packages/payload/test/fields/collections/Radio/index.ts b/test/fields/collections/Radio/index.ts
similarity index 85%
rename from packages/payload/test/fields/collections/Radio/index.ts
rename to test/fields/collections/Radio/index.ts
index f31088ac5..199a847fd 100644
--- a/packages/payload/test/fields/collections/Radio/index.ts
+++ b/test/fields/collections/Radio/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const RadioFields: CollectionConfig = {
   slug: 'radio-fields',
diff --git a/packages/payload/test/fields/collections/Relationship/index.ts b/test/fields/collections/Relationship/index.ts
similarity index 93%
rename from packages/payload/test/fields/collections/Relationship/index.ts
rename to test/fields/collections/Relationship/index.ts
index 936364307..a9587176d 100644
--- a/packages/payload/test/fields/collections/Relationship/index.ts
+++ b/test/fields/collections/Relationship/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const relationshipFieldsSlug = 'relationship-fields'
 
diff --git a/packages/payload/test/fields/collections/RichText/index.ts b/test/fields/collections/RichText/index.ts
similarity index 99%
rename from packages/payload/test/fields/collections/RichText/index.ts
rename to test/fields/collections/RichText/index.ts
index df28ac9dc..995d54d96 100644
--- a/packages/payload/test/fields/collections/RichText/index.ts
+++ b/test/fields/collections/RichText/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { loremIpsum } from './loremIpsum'
 
diff --git a/packages/payload/test/fields/collections/RichText/loremIpsum.ts b/test/fields/collections/RichText/loremIpsum.ts
similarity index 100%
rename from packages/payload/test/fields/collections/RichText/loremIpsum.ts
rename to test/fields/collections/RichText/loremIpsum.ts
diff --git a/packages/payload/test/fields/collections/Row/index.ts b/test/fields/collections/Row/index.ts
similarity index 83%
rename from packages/payload/test/fields/collections/Row/index.ts
rename to test/fields/collections/Row/index.ts
index 01c7499bd..4d3fe9ad0 100644
--- a/packages/payload/test/fields/collections/Row/index.ts
+++ b/test/fields/collections/Row/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const rowFieldsSlug = 'row-fields'
 
diff --git a/packages/payload/test/fields/collections/Select/index.ts b/test/fields/collections/Select/index.ts
similarity index 96%
rename from packages/payload/test/fields/collections/Select/index.ts
rename to test/fields/collections/Select/index.ts
index c6ab78dbd..7900f8e9e 100644
--- a/packages/payload/test/fields/collections/Select/index.ts
+++ b/test/fields/collections/Select/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const SelectFields: CollectionConfig = {
   slug: 'select-fields',
diff --git a/packages/payload/test/fields/collections/Tabs/UIField.tsx b/test/fields/collections/Tabs/UIField.tsx
similarity index 100%
rename from packages/payload/test/fields/collections/Tabs/UIField.tsx
rename to test/fields/collections/Tabs/UIField.tsx
diff --git a/packages/payload/test/fields/collections/Tabs/index.ts b/test/fields/collections/Tabs/index.ts
similarity index 98%
rename from packages/payload/test/fields/collections/Tabs/index.ts
rename to test/fields/collections/Tabs/index.ts
index 6c0b02c98..653bb6b1c 100644
--- a/packages/payload/test/fields/collections/Tabs/index.ts
+++ b/test/fields/collections/Tabs/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { blocksField, blocksFieldSeedData } from '../Blocks'
 import { UIField } from './UIField'
diff --git a/packages/payload/test/fields/collections/Text/index.ts b/test/fields/collections/Text/index.ts
similarity index 94%
rename from packages/payload/test/fields/collections/Text/index.ts
rename to test/fields/collections/Text/index.ts
index fbc74c5e7..33007c69f 100644
--- a/packages/payload/test/fields/collections/Text/index.ts
+++ b/test/fields/collections/Text/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const defaultText = 'default-text'
 export const textFieldsSlug = 'text-fields'
diff --git a/packages/payload/test/fields/collections/Upload/.gitignore b/test/fields/collections/Upload/.gitignore
similarity index 100%
rename from packages/payload/test/fields/collections/Upload/.gitignore
rename to test/fields/collections/Upload/.gitignore
diff --git a/packages/payload/test/field-error-states/collections/Upload/index.ts b/test/fields/collections/Upload/index.ts
similarity index 84%
rename from packages/payload/test/field-error-states/collections/Upload/index.ts
rename to test/fields/collections/Upload/index.ts
index a3a24494a..da72adcf6 100644
--- a/packages/payload/test/field-error-states/collections/Upload/index.ts
+++ b/test/fields/collections/Upload/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const Uploads: CollectionConfig = {
   slug: 'uploads',
diff --git a/packages/payload/test/fields/collections/Upload/payload.jpg b/test/fields/collections/Upload/payload.jpg
similarity index 100%
rename from packages/payload/test/fields/collections/Upload/payload.jpg
rename to test/fields/collections/Upload/payload.jpg
diff --git a/packages/payload/test/fields/collections/Upload2/.gitignore b/test/fields/collections/Upload2/.gitignore
similarity index 100%
rename from packages/payload/test/fields/collections/Upload2/.gitignore
rename to test/fields/collections/Upload2/.gitignore
diff --git a/packages/payload/test/fields/collections/Upload2/index.ts b/test/fields/collections/Upload2/index.ts
similarity index 82%
rename from packages/payload/test/fields/collections/Upload2/index.ts
rename to test/fields/collections/Upload2/index.ts
index 01b1ff6d9..3f73829cd 100644
--- a/packages/payload/test/fields/collections/Upload2/index.ts
+++ b/test/fields/collections/Upload2/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const Uploads2: CollectionConfig = {
   slug: 'uploads2',
diff --git a/packages/payload/test/fields/collections/Upload2/payload.jpg b/test/fields/collections/Upload2/payload.jpg
similarity index 100%
rename from packages/payload/test/fields/collections/Upload2/payload.jpg
rename to test/fields/collections/Upload2/payload.jpg
diff --git a/packages/payload/test/fields/collections/Uploads3/.gitignore b/test/fields/collections/Uploads3/.gitignore
similarity index 100%
rename from packages/payload/test/fields/collections/Uploads3/.gitignore
rename to test/fields/collections/Uploads3/.gitignore
diff --git a/packages/payload/test/fields/collections/Uploads3/index.ts b/test/fields/collections/Uploads3/index.ts
similarity index 84%
rename from packages/payload/test/fields/collections/Uploads3/index.ts
rename to test/fields/collections/Uploads3/index.ts
index fd2c553cb..75d7a4bb9 100644
--- a/packages/payload/test/fields/collections/Uploads3/index.ts
+++ b/test/fields/collections/Uploads3/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const Uploads3: CollectionConfig = {
   slug: 'uploads3',
diff --git a/packages/payload/test/fields/collections/Uploads3/payload.jpg b/test/fields/collections/Uploads3/payload.jpg
similarity index 100%
rename from packages/payload/test/fields/collections/Uploads3/payload.jpg
rename to test/fields/collections/Uploads3/payload.jpg
diff --git a/packages/payload/test/fields/config.ts b/test/fields/config.ts
similarity index 98%
rename from packages/payload/test/fields/config.ts
rename to test/fields/config.ts
index 047bedcb4..6959bb897 100644
--- a/packages/payload/test/fields/config.ts
+++ b/test/fields/config.ts
@@ -2,7 +2,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import getFileByPath from '../../src/uploads/getFileByPath'
+import getFileByPath from '../../packages/payload/src/uploads/getFileByPath'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
 import ArrayFields, { arrayDoc } from './collections/Array'
diff --git a/packages/payload/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
similarity index 99%
rename from packages/payload/test/fields/e2e.spec.ts
rename to test/fields/e2e.spec.ts
index 65bc4d4b6..fa8104157 100644
--- a/packages/payload/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -3,9 +3,9 @@ import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import path from 'path'
 
-import payload from '../../src'
-import { mapAsync } from '../../src/utilities/mapAsync'
-import wait from '../../src/utilities/wait'
+import payload from '../../packages/payload/src'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
+import wait from '../../packages/payload/src/utilities/wait'
 import { saveDocAndAssert, saveDocHotkeyAndAssert } from '../helpers'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadE2E } from '../helpers/configHelpers'
diff --git a/packages/payload/test/fields/int.spec.ts b/test/fields/int.spec.ts
similarity index 98%
rename from packages/payload/test/fields/int.spec.ts
rename to test/fields/int.spec.ts
index 94e17ca44..22f60fd35 100644
--- a/packages/payload/test/fields/int.spec.ts
+++ b/test/fields/int.spec.ts
@@ -3,10 +3,10 @@ import type { IndexDirection, IndexOptions } from 'mongoose'
 
 import { GraphQLClient } from 'graphql-request'
 
-import type { PaginatedDocs } from '../../src/database/types'
+import type { PaginatedDocs } from '../../packages/payload/src/database/types'
 import type { RichTextField } from './payload-types'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
 import configPromise from '../uploads/config'
@@ -38,7 +38,7 @@ let token
 
 describe('Fields', () => {
   beforeAll(async () => {
-    ;({ serverURL } = await initPayloadTest({ __dirname, init: { local: false } }))
+    ; ({ serverURL } = await initPayloadTest({ __dirname, init: { local: false } }))
     config = await configPromise
 
     client = new RESTClient(config, { serverURL, defaultSlug: 'point-fields' })
@@ -393,7 +393,7 @@ describe('Fields', () => {
         collection: 'point-fields',
         pagination: false,
       })
-      ;[doc] = findDoc.docs
+        ;[doc] = findDoc.docs
     })
 
     it('should read', async () => {
@@ -402,7 +402,7 @@ describe('Fields', () => {
         pagination: false,
       })
 
-      ;[doc] = find.docs
+        ;[doc] = find.docs
 
       expect(doc.point).toEqual(pointDoc.point)
       expect(doc.localized).toEqual(pointDoc.localized)
diff --git a/packages/payload/test/fields/mocks/emptyModule.js b/test/fields/mocks/emptyModule.js
similarity index 100%
rename from packages/payload/test/fields/mocks/emptyModule.js
rename to test/fields/mocks/emptyModule.js
diff --git a/packages/payload/test/fields/payload-types.ts b/test/fields/payload-types.ts
similarity index 100%
rename from packages/payload/test/fields/payload-types.ts
rename to test/fields/payload-types.ts
diff --git a/packages/payload/test/fields/uploads/payload.png b/test/fields/uploads/payload.png
similarity index 100%
rename from packages/payload/test/fields/uploads/payload.png
rename to test/fields/uploads/payload.png
diff --git a/packages/payload/test/generateGraphQLSchema.ts b/test/generateGraphQLSchema.ts
similarity index 90%
rename from packages/payload/test/generateGraphQLSchema.ts
rename to test/generateGraphQLSchema.ts
index 69dbcc3a6..455b692df 100644
--- a/packages/payload/test/generateGraphQLSchema.ts
+++ b/test/generateGraphQLSchema.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { generateGraphQLSchema } from '../src/bin/generateGraphQLSchema'
+import { generateGraphQLSchema } from '../packages/payload/src/bin/generateGraphQLSchema'
 
 const [testConfigDir] = process.argv.slice(2)
 
diff --git a/packages/payload/test/generateTypes.ts b/test/generateTypes.ts
similarity index 92%
rename from packages/payload/test/generateTypes.ts
rename to test/generateTypes.ts
index b179251af..df1f5f44a 100644
--- a/packages/payload/test/generateTypes.ts
+++ b/test/generateTypes.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 
-import { generateTypes } from '../src/bin/generateTypes'
+import { generateTypes } from '../packages/payload/src/bin/generateTypes'
 
 const [testConfigDir] = process.argv.slice(2)
 
diff --git a/packages/payload/test/globals/config.ts b/test/globals/config.ts
similarity index 100%
rename from packages/payload/test/globals/config.ts
rename to test/globals/config.ts
diff --git a/packages/payload/test/globals/int.spec.ts b/test/globals/int.spec.ts
similarity index 99%
rename from packages/payload/test/globals/int.spec.ts
rename to test/globals/int.spec.ts
index 28c6af74a..34f27767a 100644
--- a/packages/payload/test/globals/int.spec.ts
+++ b/test/globals/int.spec.ts
@@ -1,6 +1,6 @@
 import { GraphQLClient } from 'graphql-request'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
 import configPromise, {
diff --git a/packages/payload/test/globals/payload-types.ts b/test/globals/payload-types.ts
similarity index 100%
rename from packages/payload/test/globals/payload-types.ts
rename to test/globals/payload-types.ts
diff --git a/packages/payload/test/graphql-schema-gen/config.ts b/test/graphql-schema-gen/config.ts
similarity index 100%
rename from packages/payload/test/graphql-schema-gen/config.ts
rename to test/graphql-schema-gen/config.ts
diff --git a/packages/payload/test/graphql-schema-gen/payload-types.ts b/test/graphql-schema-gen/payload-types.ts
similarity index 100%
rename from packages/payload/test/graphql-schema-gen/payload-types.ts
rename to test/graphql-schema-gen/payload-types.ts
diff --git a/packages/payload/test/graphql-schema-gen/schema.graphql b/test/graphql-schema-gen/schema.graphql
similarity index 100%
rename from packages/payload/test/graphql-schema-gen/schema.graphql
rename to test/graphql-schema-gen/schema.graphql
diff --git a/packages/payload/test/graphql-schema-gen/tsconfig.json b/test/graphql-schema-gen/tsconfig.json
similarity index 100%
rename from packages/payload/test/graphql-schema-gen/tsconfig.json
rename to test/graphql-schema-gen/tsconfig.json
diff --git a/packages/payload/test/helpers.ts b/test/helpers.ts
similarity index 96%
rename from packages/payload/test/helpers.ts
rename to test/helpers.ts
index c272acb05..740ae5f87 100644
--- a/packages/payload/test/helpers.ts
+++ b/test/helpers.ts
@@ -2,7 +2,7 @@ import type { Page } from '@playwright/test'
 
 import { expect } from '@playwright/test'
 
-import wait from '../src/utilities/wait'
+import wait from '../packages/payload/src/utilities/wait'
 import { devUser } from './credentials'
 
 type FirstRegisterArgs = {
diff --git a/packages/payload/test/helpers/adminUrlUtil.ts b/test/helpers/adminUrlUtil.ts
similarity index 100%
rename from packages/payload/test/helpers/adminUrlUtil.ts
rename to test/helpers/adminUrlUtil.ts
diff --git a/packages/payload/test/helpers/configHelpers.ts b/test/helpers/configHelpers.ts
similarity index 88%
rename from packages/payload/test/helpers/configHelpers.ts
rename to test/helpers/configHelpers.ts
index 815d133c7..cf01f0f12 100644
--- a/packages/payload/test/helpers/configHelpers.ts
+++ b/test/helpers/configHelpers.ts
@@ -5,10 +5,10 @@ import path from 'path'
 import shelljs from 'shelljs'
 import { v4 as uuid } from 'uuid'
 
-import type { CollectionConfig } from '../../src/collections/config/types'
-import type { InitOptions } from '../../src/config/types'
+import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
+import type { InitOptions } from '../../packages/payload/src/config/types'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 
 type Options = {
   __dirname: string
diff --git a/packages/payload/test/helpers/removeFiles.ts b/test/helpers/removeFiles.ts
similarity index 100%
rename from packages/payload/test/helpers/removeFiles.ts
rename to test/helpers/removeFiles.ts
diff --git a/packages/payload/test/helpers/rest.ts b/test/helpers/rest.ts
similarity index 97%
rename from packages/payload/test/helpers/rest.ts
rename to test/helpers/rest.ts
index 67fb11962..ec7fa69fd 100644
--- a/packages/payload/test/helpers/rest.ts
+++ b/test/helpers/rest.ts
@@ -2,9 +2,9 @@
 import fetch from 'node-fetch'
 import qs from 'qs'
 
-import type { Config } from '../../src/config/types'
-import type { PaginatedDocs } from '../../src/database/types'
-import type { Where } from '../../src/types'
+import type { Config } from '../../packages/payload/src/config/types'
+import type { PaginatedDocs } from '../../packages/payload/src/database/types'
+import type { Where } from '../../packages/payload/src/types'
 
 import { devUser } from '../credentials'
 
diff --git a/packages/payload/test/hooks/collections/AfterOperation/index.ts b/test/hooks/collections/AfterOperation/index.ts
similarity index 92%
rename from packages/payload/test/hooks/collections/AfterOperation/index.ts
rename to test/hooks/collections/AfterOperation/index.ts
index 4ced14eb9..281cefd0d 100644
--- a/packages/payload/test/hooks/collections/AfterOperation/index.ts
+++ b/test/hooks/collections/AfterOperation/index.ts
@@ -1,4 +1,4 @@
-import type { AfterOperationHook, CollectionConfig } from '../../../../src/collections/config/types'
+import type { AfterOperationHook, CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { AfterOperation } from '../../payload-types'
 
@@ -32,9 +32,9 @@ const AfterOperation: CollectionConfig = {
             docs: result.docs?.map((doc, index) =>
               index === 0
                 ? {
-                    ...doc,
-                    title: 'Title read',
-                  }
+                  ...doc,
+                  title: 'Title read',
+                }
                 : doc,
             ),
           }
diff --git a/packages/payload/test/hooks/collections/ChainingHooks/index.ts b/test/hooks/collections/ChainingHooks/index.ts
similarity index 78%
rename from packages/payload/test/hooks/collections/ChainingHooks/index.ts
rename to test/hooks/collections/ChainingHooks/index.ts
index 74e9ae076..0be21f3d6 100644
--- a/packages/payload/test/hooks/collections/ChainingHooks/index.ts
+++ b/test/hooks/collections/ChainingHooks/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const chainingHooksSlug = 'chaining-hooks'
 
diff --git a/packages/payload/test/hooks/collections/ContextHooks/index.ts b/test/hooks/collections/ContextHooks/index.ts
similarity index 89%
rename from packages/payload/test/hooks/collections/ContextHooks/index.ts
rename to test/hooks/collections/ContextHooks/index.ts
index 2b574a9f7..0906ec72f 100644
--- a/packages/payload/test/hooks/collections/ContextHooks/index.ts
+++ b/test/hooks/collections/ContextHooks/index.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../src/collections/config/types'
-import type { PayloadRequest } from '../../../../src/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
+import type { PayloadRequest } from '../../../../packages/payload/src/types'
 
-import payload from '../../../../src'
+import payload from '../../../../packages/payload/src'
 
 export const contextHooksSlug = 'context-hooks'
 const ContextHooks: CollectionConfig = {
diff --git a/packages/payload/test/hooks/collections/Hook/index.ts b/test/hooks/collections/Hook/index.ts
similarity index 97%
rename from packages/payload/test/hooks/collections/Hook/index.ts
rename to test/hooks/collections/Hook/index.ts
index 2df833f48..e1d0b4f0a 100644
--- a/packages/payload/test/hooks/collections/Hook/index.ts
+++ b/test/hooks/collections/Hook/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const hooksSlug = 'hooks'
 const Hooks: CollectionConfig = {
diff --git a/packages/payload/test/hooks/collections/NestedAfterReadHooks/index.ts b/test/hooks/collections/NestedAfterReadHooks/index.ts
similarity index 94%
rename from packages/payload/test/hooks/collections/NestedAfterReadHooks/index.ts
rename to test/hooks/collections/NestedAfterReadHooks/index.ts
index 22eb684e8..4c1ded84e 100644
--- a/packages/payload/test/hooks/collections/NestedAfterReadHooks/index.ts
+++ b/test/hooks/collections/NestedAfterReadHooks/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 import { relationsSlug } from '../Relations'
 
diff --git a/packages/payload/test/hooks/collections/Relations/index.ts b/test/hooks/collections/Relations/index.ts
similarity index 69%
rename from packages/payload/test/hooks/collections/Relations/index.ts
rename to test/hooks/collections/Relations/index.ts
index 24a1ea450..9b301e394 100644
--- a/packages/payload/test/hooks/collections/Relations/index.ts
+++ b/test/hooks/collections/Relations/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const relationsSlug = 'relations'
 
diff --git a/packages/payload/test/hooks/collections/Transform/index.ts b/test/hooks/collections/Transform/index.ts
similarity index 95%
rename from packages/payload/test/hooks/collections/Transform/index.ts
rename to test/hooks/collections/Transform/index.ts
index c62ebc935..103d085a1 100644
--- a/packages/payload/test/hooks/collections/Transform/index.ts
+++ b/test/hooks/collections/Transform/index.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 const validateFieldTransformAction = (hook: string, value) => {
   if (value !== undefined && value !== null && !Array.isArray(value)) {
diff --git a/packages/payload/test/hooks/collections/Users/index.ts b/test/hooks/collections/Users/index.ts
similarity index 82%
rename from packages/payload/test/hooks/collections/Users/index.ts
rename to test/hooks/collections/Users/index.ts
index 091bab584..cd649cf69 100644
--- a/packages/payload/test/hooks/collections/Users/index.ts
+++ b/test/hooks/collections/Users/index.ts
@@ -1,7 +1,7 @@
-import type { BeforeLoginHook, CollectionConfig } from '../../../../src/collections/config/types'
-import type { Payload } from '../../../../src/payload'
+import type { BeforeLoginHook, CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
+import type { Payload } from '../../../../packages/payload/src/payload'
 
-import { AuthenticationError } from '../../../../src/errors'
+import { AuthenticationError } from '../../../../packages/payload/src/errors'
 import { devUser, regularUser } from '../../../credentials'
 
 const beforeLoginHook: BeforeLoginHook = ({ user, req }) => {
diff --git a/packages/payload/test/hooks/config.ts b/test/hooks/config.ts
similarity index 100%
rename from packages/payload/test/hooks/config.ts
rename to test/hooks/config.ts
diff --git a/packages/payload/test/hooks/int.spec.ts b/test/hooks/int.spec.ts
similarity index 98%
rename from packages/payload/test/hooks/int.spec.ts
rename to test/hooks/int.spec.ts
index adab1c13c..2a7207a04 100644
--- a/packages/payload/test/hooks/int.spec.ts
+++ b/test/hooks/int.spec.ts
@@ -1,5 +1,5 @@
-import payload from '../../src'
-import { AuthenticationError } from '../../src/errors'
+import payload from '../../packages/payload/src'
+import { AuthenticationError } from '../../packages/payload/src/errors'
 import { devUser, regularUser } from '../credentials'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
diff --git a/packages/payload/test/hooks/mocks/emptyModule.js b/test/hooks/mocks/emptyModule.js
similarity index 100%
rename from packages/payload/test/hooks/mocks/emptyModule.js
rename to test/hooks/mocks/emptyModule.js
diff --git a/packages/payload/test/hooks/payload-types.ts b/test/hooks/payload-types.ts
similarity index 100%
rename from packages/payload/test/hooks/payload-types.ts
rename to test/hooks/payload-types.ts
diff --git a/packages/payload/test/jest.setup.ts b/test/jest.setup.ts
similarity index 100%
rename from packages/payload/test/jest.setup.ts
rename to test/jest.setup.ts
diff --git a/packages/payload/test/localization-rtl/ar.js b/test/localization-rtl/ar.js
similarity index 100%
rename from packages/payload/test/localization-rtl/ar.js
rename to test/localization-rtl/ar.js
diff --git a/packages/payload/test/localization-rtl/collections/posts.ts b/test/localization-rtl/collections/posts.ts
similarity index 89%
rename from packages/payload/test/localization-rtl/collections/posts.ts
rename to test/localization-rtl/collections/posts.ts
index 79282912f..c7182847d 100644
--- a/packages/payload/test/localization-rtl/collections/posts.ts
+++ b/test/localization-rtl/collections/posts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types'
 
 export const Posts: CollectionConfig = {
   slug: 'posts',
diff --git a/test/localization-rtl/collections/users.ts b/test/localization-rtl/collections/users.ts
new file mode 100644
index 000000000..ba99583cb
--- /dev/null
+++ b/test/localization-rtl/collections/users.ts
@@ -0,0 +1,7 @@
+import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types'
+
+export const Users: CollectionConfig = {
+  slug: 'users',
+  auth: true,
+  fields: [],
+}
diff --git a/packages/payload/test/localization-rtl/config.ts b/test/localization-rtl/config.ts
similarity index 93%
rename from packages/payload/test/localization-rtl/config.ts
rename to test/localization-rtl/config.ts
index 9cc53d18f..2e686425a 100644
--- a/packages/payload/test/localization-rtl/config.ts
+++ b/test/localization-rtl/config.ts
@@ -1,4 +1,4 @@
-import en from '../../src/translations/en.json'
+import en from '../../packages/payload/src/translations/en.json'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
 import { ar } from './ar'
diff --git a/packages/payload/test/localization-rtl/deepMerge.ts b/test/localization-rtl/deepMerge.ts
similarity index 100%
rename from packages/payload/test/localization-rtl/deepMerge.ts
rename to test/localization-rtl/deepMerge.ts
diff --git a/packages/payload/test/localization-rtl/localization.ts b/test/localization-rtl/localization.ts
similarity index 100%
rename from packages/payload/test/localization-rtl/localization.ts
rename to test/localization-rtl/localization.ts
diff --git a/packages/payload/test/localization/collections/Array/index.ts b/test/localization/collections/Array/index.ts
similarity index 78%
rename from packages/payload/test/localization/collections/Array/index.ts
rename to test/localization/collections/Array/index.ts
index 2ae0466de..05f4f2ffb 100644
--- a/packages/payload/test/localization/collections/Array/index.ts
+++ b/test/localization/collections/Array/index.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const arrayCollectionSlug = 'array-fields'
 
diff --git a/packages/payload/test/localization/config.ts b/test/localization/config.ts
similarity index 100%
rename from packages/payload/test/localization/config.ts
rename to test/localization/config.ts
diff --git a/packages/payload/test/localization/e2e.spec.ts b/test/localization/e2e.spec.ts
similarity index 99%
rename from packages/payload/test/localization/e2e.spec.ts
rename to test/localization/e2e.spec.ts
index d06a859db..ed7ea87b3 100644
--- a/packages/payload/test/localization/e2e.spec.ts
+++ b/test/localization/e2e.spec.ts
@@ -4,7 +4,7 @@ import { expect, test } from '@playwright/test'
 
 import type { LocalizedPost } from './payload-types'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { saveDocAndAssert } from '../helpers'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadTest } from '../helpers/configHelpers'
diff --git a/packages/payload/test/localization/int.spec.ts b/test/localization/int.spec.ts
similarity index 98%
rename from packages/payload/test/localization/int.spec.ts
rename to test/localization/int.spec.ts
index 2a97504d4..1d5e9b592 100644
--- a/packages/payload/test/localization/int.spec.ts
+++ b/test/localization/int.spec.ts
@@ -1,10 +1,10 @@
 import { GraphQLClient } from 'graphql-request'
 
-import type { Config } from '../../src/config/types'
-import type { Where } from '../../src/types'
+import type { Config } from '../../packages/payload/src/config/types'
+import type { Where } from '../../packages/payload/src/types'
 import type { LocalizedPost, WithLocalizedRelationship } from './payload-types'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { arrayCollectionSlug } from './collections/Array'
 import configPromise, {
@@ -34,7 +34,7 @@ describe('Localization', () => {
   let postWithLocalizedData: LocalizedPost
 
   beforeAll(async () => {
-    ;({ serverURL } = await initPayloadTest({ __dirname, init: { local: false } }))
+    ; ({ serverURL } = await initPayloadTest({ __dirname, init: { local: false } }))
     config = await configPromise
 
     post1 = await payload.create({
diff --git a/packages/payload/test/localization/payload-types.ts b/test/localization/payload-types.ts
similarity index 100%
rename from packages/payload/test/localization/payload-types.ts
rename to test/localization/payload-types.ts
diff --git a/packages/payload/test/localization/shared.ts b/test/localization/shared.ts
similarity index 100%
rename from packages/payload/test/localization/shared.ts
rename to test/localization/shared.ts
diff --git a/packages/payload/test/migrations-cli/config.ts b/test/migrations-cli/config.ts
similarity index 100%
rename from packages/payload/test/migrations-cli/config.ts
rename to test/migrations-cli/config.ts
diff --git a/packages/payload/test/migrations-cli/payload-types.ts b/test/migrations-cli/payload-types.ts
similarity index 100%
rename from packages/payload/test/migrations-cli/payload-types.ts
rename to test/migrations-cli/payload-types.ts
diff --git a/packages/payload/test/nested-fields/config.ts b/test/nested-fields/config.ts
similarity index 100%
rename from packages/payload/test/nested-fields/config.ts
rename to test/nested-fields/config.ts
diff --git a/packages/payload/test/plugins/.gitignore b/test/plugins/.gitignore
similarity index 100%
rename from packages/payload/test/plugins/.gitignore
rename to test/plugins/.gitignore
diff --git a/packages/payload/test/plugins/config.ts b/test/plugins/config.ts
similarity index 100%
rename from packages/payload/test/plugins/config.ts
rename to test/plugins/config.ts
diff --git a/packages/payload/test/plugins/e2e.todo-spec.ts b/test/plugins/e2e.todo-spec.ts
similarity index 100%
rename from packages/payload/test/plugins/e2e.todo-spec.ts
rename to test/plugins/e2e.todo-spec.ts
diff --git a/packages/payload/test/plugins/int.spec.ts b/test/plugins/int.spec.ts
similarity index 93%
rename from packages/payload/test/plugins/int.spec.ts
rename to test/plugins/int.spec.ts
index 1cd1a4b8c..28454aa75 100644
--- a/packages/payload/test/plugins/int.spec.ts
+++ b/test/plugins/int.spec.ts
@@ -1,4 +1,4 @@
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
 import configPromise, { pagesSlug } from './config'
diff --git a/packages/payload/test/postgres/config.ts b/test/postgres/config.ts
similarity index 98%
rename from packages/payload/test/postgres/config.ts
rename to test/postgres/config.ts
index 1d7304f3d..74a741a17 100644
--- a/packages/payload/test/postgres/config.ts
+++ b/test/postgres/config.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../src/collections/config/types'
+import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 
diff --git a/packages/payload/test/refresh-permissions/GlobalViewWithRefresh.tsx b/test/refresh-permissions/GlobalViewWithRefresh.tsx
similarity index 60%
rename from packages/payload/test/refresh-permissions/GlobalViewWithRefresh.tsx
rename to test/refresh-permissions/GlobalViewWithRefresh.tsx
index f1aba8705..b0460aa00 100644
--- a/packages/payload/test/refresh-permissions/GlobalViewWithRefresh.tsx
+++ b/test/refresh-permissions/GlobalViewWithRefresh.tsx
@@ -1,9 +1,9 @@
 import React, { useCallback } from 'react'
 
-import type { Props } from '../../src/admin/components/views/Global/types'
+import type { Props } from '../../packages/payload/src/admin/components/views/Global/types'
 
-import { useAuth } from '../../src/admin/components/utilities/Auth'
-import DefaultGlobalView from '../../src/admin/components/views/Global/Default'
+import { useAuth } from '../../packages/payload/src/admin/components/utilities/Auth'
+import DefaultGlobalView from '../../packages/payload/src/admin/components/views/Global/Default'
 
 const GlobalView: React.FC<Props> = (props) => {
   const { onSave } = props
diff --git a/packages/payload/test/refresh-permissions/config.ts b/test/refresh-permissions/config.ts
similarity index 100%
rename from packages/payload/test/refresh-permissions/config.ts
rename to test/refresh-permissions/config.ts
diff --git a/packages/payload/test/refresh-permissions/e2e.spec.ts b/test/refresh-permissions/e2e.spec.ts
similarity index 100%
rename from packages/payload/test/refresh-permissions/e2e.spec.ts
rename to test/refresh-permissions/e2e.spec.ts
diff --git a/packages/payload/test/relationships/config.ts b/test/relationships/config.ts
similarity index 98%
rename from packages/payload/test/relationships/config.ts
rename to test/relationships/config.ts
index 22b1299f4..bcc7e4319 100644
--- a/packages/payload/test/relationships/config.ts
+++ b/test/relationships/config.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../src/collections/config/types'
+import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
 
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
diff --git a/packages/payload/test/relationships/int.spec.ts b/test/relationships/int.spec.ts
similarity index 99%
rename from packages/payload/test/relationships/int.spec.ts
rename to test/relationships/int.spec.ts
index 8d5770f38..be8c24a54 100644
--- a/packages/payload/test/relationships/int.spec.ts
+++ b/test/relationships/int.spec.ts
@@ -10,8 +10,8 @@ import type {
   Relation,
 } from './payload-types'
 
-import payload from '../../src'
-import { mapAsync } from '../../src/utilities/mapAsync'
+import payload from '../../packages/payload/src'
+import { mapAsync } from '../../packages/payload/src/utilities/mapAsync'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
 import config, {
diff --git a/packages/payload/test/relationships/payload-types.ts b/test/relationships/payload-types.ts
similarity index 100%
rename from packages/payload/test/relationships/payload-types.ts
rename to test/relationships/payload-types.ts
diff --git a/packages/payload/test/runE2E.ts b/test/runE2E.ts
similarity index 100%
rename from packages/payload/test/runE2E.ts
rename to test/runE2E.ts
diff --git a/packages/payload/test/uploads/.gitignore b/test/uploads/.gitignore
similarity index 100%
rename from packages/payload/test/uploads/.gitignore
rename to test/uploads/.gitignore
diff --git a/packages/payload/test/uploads/audio.mp3 b/test/uploads/audio.mp3
similarity index 100%
rename from packages/payload/test/uploads/audio.mp3
rename to test/uploads/audio.mp3
diff --git a/packages/payload/test/uploads/collections/Upload1/index.ts b/test/uploads/collections/Upload1/index.ts
similarity index 83%
rename from packages/payload/test/uploads/collections/Upload1/index.ts
rename to test/uploads/collections/Upload1/index.ts
index ab90b3c5c..660ab78f4 100644
--- a/packages/payload/test/uploads/collections/Upload1/index.ts
+++ b/test/uploads/collections/Upload1/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const Uploads1: CollectionConfig = {
   slug: 'uploads-1',
diff --git a/packages/payload/test/uploads/collections/Upload2/index.ts b/test/uploads/collections/Upload2/index.ts
similarity index 79%
rename from packages/payload/test/uploads/collections/Upload2/index.ts
rename to test/uploads/collections/Upload2/index.ts
index 6446a2698..7fb4aa08c 100644
--- a/packages/payload/test/uploads/collections/Upload2/index.ts
+++ b/test/uploads/collections/Upload2/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 export const Uploads2: CollectionConfig = {
   slug: 'uploads-2',
diff --git a/packages/payload/test/uploads/collections/admin-thumbnail/index.ts b/test/uploads/collections/admin-thumbnail/index.ts
similarity index 89%
rename from packages/payload/test/uploads/collections/admin-thumbnail/index.ts
rename to test/uploads/collections/admin-thumbnail/index.ts
index 5d855894e..c56da17cc 100644
--- a/packages/payload/test/uploads/collections/admin-thumbnail/index.ts
+++ b/test/uploads/collections/admin-thumbnail/index.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import type { CollectionConfig } from '../../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../../packages/payload/src/collections/config/types'
 
 type TypeWithFile = {
   filename: string
diff --git a/packages/payload/test/uploads/config.ts b/test/uploads/config.ts
similarity index 99%
rename from packages/payload/test/uploads/config.ts
rename to test/uploads/config.ts
index a2ecb40fc..76632f13d 100644
--- a/packages/payload/test/uploads/config.ts
+++ b/test/uploads/config.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import getFileByPath from '../../src/uploads/getFileByPath'
+import getFileByPath from '../../packages/payload/src/uploads/getFileByPath'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults'
 import { devUser } from '../credentials'
 import removeFiles from '../helpers/removeFiles'
diff --git a/packages/payload/test/uploads/e2e.spec.ts b/test/uploads/e2e.spec.ts
similarity index 98%
rename from packages/payload/test/uploads/e2e.spec.ts
rename to test/uploads/e2e.spec.ts
index e6608362d..08043a64b 100644
--- a/packages/payload/test/uploads/e2e.spec.ts
+++ b/test/uploads/e2e.spec.ts
@@ -5,8 +5,8 @@ import path from 'path'
 
 import type { Media } from './payload-types'
 
-import payload from '../../src'
-import wait from '../../src/utilities/wait'
+import payload from '../../packages/payload/src'
+import wait from '../../packages/payload/src/utilities/wait'
 import { saveDocAndAssert } from '../helpers'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadE2E } from '../helpers/configHelpers'
diff --git a/packages/payload/test/uploads/image.jpg b/test/uploads/image.jpg
similarity index 100%
rename from packages/payload/test/uploads/image.jpg
rename to test/uploads/image.jpg
diff --git a/packages/payload/test/uploads/image.png b/test/uploads/image.png
similarity index 100%
rename from packages/payload/test/uploads/image.png
rename to test/uploads/image.png
diff --git a/packages/payload/test/uploads/image.svg b/test/uploads/image.svg
similarity index 100%
rename from packages/payload/test/uploads/image.svg
rename to test/uploads/image.svg
diff --git a/packages/payload/test/uploads/int.spec.ts b/test/uploads/int.spec.ts
similarity index 99%
rename from packages/payload/test/uploads/int.spec.ts
rename to test/uploads/int.spec.ts
index 3e7f496ce..dec7d9826 100644
--- a/packages/payload/test/uploads/int.spec.ts
+++ b/test/uploads/int.spec.ts
@@ -3,8 +3,8 @@ import fs from 'fs'
 import path from 'path'
 import { promisify } from 'util'
 
-import payload from '../../src'
-import getFileByPath from '../../src/uploads/getFileByPath'
+import payload from '../../packages/payload/src'
+import getFileByPath from '../../packages/payload/src/uploads/getFileByPath'
 import { initPayloadTest } from '../helpers/configHelpers'
 import { RESTClient } from '../helpers/rest'
 import configPromise, { enlargeSlug, mediaSlug, reduceSlug, relationSlug } from './config'
diff --git a/packages/payload/test/uploads/mocks/mockFSModule.js b/test/uploads/mocks/mockFSModule.js
similarity index 100%
rename from packages/payload/test/uploads/mocks/mockFSModule.js
rename to test/uploads/mocks/mockFSModule.js
diff --git a/packages/payload/test/uploads/payload-types.ts b/test/uploads/payload-types.ts
similarity index 100%
rename from packages/payload/test/uploads/payload-types.ts
rename to test/uploads/payload-types.ts
diff --git a/packages/payload/test/uploads/small.png b/test/uploads/small.png
similarity index 100%
rename from packages/payload/test/uploads/small.png
rename to test/uploads/small.png
diff --git a/packages/payload/test/uploads/temp-renamed.png b/test/uploads/temp-renamed.png
similarity index 100%
rename from packages/payload/test/uploads/temp-renamed.png
rename to test/uploads/temp-renamed.png
diff --git a/packages/payload/test/uploads/temp.png b/test/uploads/temp.png
similarity index 100%
rename from packages/payload/test/uploads/temp.png
rename to test/uploads/temp.png
diff --git a/packages/payload/test/versions/collections/Autosave.ts b/test/versions/collections/Autosave.ts
similarity index 92%
rename from packages/payload/test/versions/collections/Autosave.ts
rename to test/versions/collections/Autosave.ts
index 2c52da7db..56b454e92 100644
--- a/packages/payload/test/versions/collections/Autosave.ts
+++ b/test/versions/collections/Autosave.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types'
 
 import { autosaveSlug } from '../shared'
 
diff --git a/packages/payload/test/versions/collections/Drafts.ts b/test/versions/collections/Drafts.ts
similarity index 94%
rename from packages/payload/test/versions/collections/Drafts.ts
rename to test/versions/collections/Drafts.ts
index 0116f8aee..79ef270b2 100644
--- a/packages/payload/test/versions/collections/Drafts.ts
+++ b/test/versions/collections/Drafts.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types'
 
 import { CustomPublishButton } from '../elements/CustomSaveButton'
 import { draftSlug } from '../shared'
diff --git a/packages/payload/test/versions/collections/Versions.ts b/test/versions/collections/Versions.ts
similarity index 91%
rename from packages/payload/test/versions/collections/Versions.ts
rename to test/versions/collections/Versions.ts
index 662782785..5ad35b559 100644
--- a/packages/payload/test/versions/collections/Versions.ts
+++ b/test/versions/collections/Versions.ts
@@ -1,4 +1,4 @@
-import type { CollectionConfig } from '../../../src/collections/config/types'
+import type { CollectionConfig } from '../../../packages/payload/src/collections/config/types'
 
 import { versionSlug } from '../shared'
 
diff --git a/packages/payload/test/versions/config.ts b/test/versions/config.ts
similarity index 100%
rename from packages/payload/test/versions/config.ts
rename to test/versions/config.ts
diff --git a/packages/payload/test/versions/e2e.spec.ts b/test/versions/e2e.spec.ts
similarity index 98%
rename from packages/payload/test/versions/e2e.spec.ts
rename to test/versions/e2e.spec.ts
index a364aae55..eec0606f2 100644
--- a/packages/payload/test/versions/e2e.spec.ts
+++ b/test/versions/e2e.spec.ts
@@ -27,7 +27,7 @@ import type { Page } from '@playwright/test'
 
 import { expect, test } from '@playwright/test'
 
-import wait from '../../src/utilities/wait'
+import wait from '../../packages/payload/src/utilities/wait'
 import { AdminUrlUtil } from '../helpers/adminUrlUtil'
 import { initPayloadE2E } from '../helpers/configHelpers'
 import { autosaveSlug, draftSlug } from './shared'
diff --git a/packages/payload/test/versions/elements/CustomSaveButton/index.module.scss b/test/versions/elements/CustomSaveButton/index.module.scss
similarity index 100%
rename from packages/payload/test/versions/elements/CustomSaveButton/index.module.scss
rename to test/versions/elements/CustomSaveButton/index.module.scss
diff --git a/packages/payload/test/versions/elements/CustomSaveButton/index.tsx b/test/versions/elements/CustomSaveButton/index.tsx
similarity index 77%
rename from packages/payload/test/versions/elements/CustomSaveButton/index.tsx
rename to test/versions/elements/CustomSaveButton/index.tsx
index c8118f962..6f8453ae1 100644
--- a/packages/payload/test/versions/elements/CustomSaveButton/index.tsx
+++ b/test/versions/elements/CustomSaveButton/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import type { CustomPublishButtonProps } from '../../../../src/admin/components/elements/types'
+import type { CustomPublishButtonProps } from '../../../../packages/payload/src/admin/components/elements/types'
 
 // In your projects, you can import as follows:
 // import { CustomPublishButtonProps } from 'payload/types';
diff --git a/packages/payload/test/versions/globals/Autosave.ts b/test/versions/globals/Autosave.ts
similarity index 89%
rename from packages/payload/test/versions/globals/Autosave.ts
rename to test/versions/globals/Autosave.ts
index 89af9740d..460791c38 100644
--- a/packages/payload/test/versions/globals/Autosave.ts
+++ b/test/versions/globals/Autosave.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../src/globals/config/types'
+import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types'
 
 import { autoSaveGlobalSlug } from '../shared'
 
diff --git a/packages/payload/test/versions/globals/Draft.ts b/test/versions/globals/Draft.ts
similarity index 89%
rename from packages/payload/test/versions/globals/Draft.ts
rename to test/versions/globals/Draft.ts
index 512c349e8..0fe64b135 100644
--- a/packages/payload/test/versions/globals/Draft.ts
+++ b/test/versions/globals/Draft.ts
@@ -1,4 +1,4 @@
-import type { GlobalConfig } from '../../../src/globals/config/types'
+import type { GlobalConfig } from '../../../packages/payload/src/globals/config/types'
 
 import { draftGlobalSlug } from '../shared'
 
diff --git a/packages/payload/test/versions/int.spec.ts b/test/versions/int.spec.ts
similarity index 99%
rename from packages/payload/test/versions/int.spec.ts
rename to test/versions/int.spec.ts
index cd7ac1722..7c2d1b05d 100644
--- a/packages/payload/test/versions/int.spec.ts
+++ b/test/versions/int.spec.ts
@@ -1,6 +1,6 @@
 import { GraphQLClient, request } from 'graphql-request'
 
-import payload from '../../src'
+import payload from '../../packages/payload/src'
 import { devUser } from '../credentials'
 import { initPayloadTest } from '../helpers/configHelpers'
 import AutosavePosts from './collections/Autosave'
diff --git a/packages/payload/test/versions/payload-types.ts b/test/versions/payload-types.ts
similarity index 100%
rename from packages/payload/test/versions/payload-types.ts
rename to test/versions/payload-types.ts
diff --git a/packages/payload/test/versions/shared.ts b/test/versions/shared.ts
similarity index 100%
rename from packages/payload/test/versions/shared.ts
rename to test/versions/shared.ts
diff --git a/tsconfig.json b/tsconfig.json
index 3eafe8ee5..ea91b53ef 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,42 +7,39 @@
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
     "jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
+    "lib": ["dom", "dom.iterable", "esnext"],
     "module": "Node16",
     "moduleResolution": "Node16" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
     /* Do not emit comments to output. */
-    "noEmit": false /* Do not emit outputs. */,
+    "noEmit": true /* Do not emit outputs. */,
     /* Concatenate and emit output to single file. */
     "outDir": "./dist" /* Redirect output structure to the directory. */,
+    "paths": {
+      "payload/auth": ["./src/auth/types.ts"],
+      "payload/config": ["./src/config/types.ts"],
+      "payload/generated-types": ["./src/generated-types.ts"],
+      "payload/types": ["./src/types/index.ts"]
+    },
     "resolveJsonModule": true,
-    "rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+    "rootDir": "." /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
     "skipLibCheck": true /* Skip type checking of declaration files. */,
     "sourceMap": true,
     "strict": false /* Enable all strict type-checking options. */,
-    "target": "ES2019",
-    "types": ["node"]
+    "target": "ESNext",
+    "types": ["jest", "node", "@types/jest"]
   },
-  "exclude": [
-    "dist",
-    "build",
-    "tests",
-    "test",
-    "node_modules",
-    ".eslintrc.js",
-    "**/*.spec.js",
-    "**/*.spec.jsx",
-    "**/*.spec.ts",
-    "**/*.spec.tsx"
+  "exclude": ["dist", "build", "temp", "node_modules"],
+  /* Like tsconfig.build.json, but includes test directory and doesnt emit anything */
+  "include": [
+    "packages/**/*.ts",
+    "packages/**/*.tsx",
+    "packages/**/*.d.ts",
+    "packages/**/*.json",
+    "test/**/*.ts",
+    "test/**/*.tsx",
+    "test/**/*.d.ts"
   ],
-  "include": ["**/*", "src/"],
-  "references": [
-    {
-      "path": "./packages/payload"
-    },
-    {
-      "path": "./packages/db-mongodb"
-    },
-    {
-      "path": "./packages/db-postgres"
-    }
-  ]
+  "ts-node": {
+    "swc": true
+  }
 }