diff --git a/src/ResultSet/ResultSet.test-d.ts b/src/ResultSet/ResultSet.test-d.ts
index 4555a787c..385be6e71 100644
--- a/src/ResultSet/ResultSet.test-d.ts
+++ b/src/ResultSet/ResultSet.test-d.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
 
 import { expectTypeOf, test } from 'vitest'
-import type * as Schema from '../../tests/builder/_/schema.js'
+import type * as Schema from '../../tests/ts/_/schema.js'
 import type { SelectionSet } from '../SelectionSet/__.js'
 import type { ResultSet } from './__.js'
 
diff --git a/src/SelectionSet/SelectionSet.test-d.ts b/src/SelectionSet/SelectionSet.test-d.ts
index 356055734..5b373b501 100644
--- a/src/SelectionSet/SelectionSet.test-d.ts
+++ b/src/SelectionSet/SelectionSet.test-d.ts
@@ -1,5 +1,5 @@
 import { assertType, expectTypeOf, test } from 'vitest'
-import type * as Schema from '../../tests/builder/_/schema.js'
+import type * as Schema from '../../tests/ts/_/schema.js'
 import type { SelectionSet } from './__.js'
 
 type Q = SelectionSet.Query<Schema.$.Index>
diff --git a/src/SelectionSet/toGraphQLDocumentString.test.ts b/src/SelectionSet/toGraphQLDocumentString.test.ts
index aa06996e2..e14feb358 100644
--- a/src/SelectionSet/toGraphQLDocumentString.test.ts
+++ b/src/SelectionSet/toGraphQLDocumentString.test.ts
@@ -1,6 +1,6 @@
 import { parse, print } from 'graphql'
 import { describe, expect, test } from 'vitest'
-import type * as Schema from '../../tests/builder/_/schema.js'
+import type * as Schema from '../../tests/ts/_/schema.js'
 import type { SelectionSet } from './__.js'
 import { toGraphQLDocumentString } from './toGraphQLDocumentString.js'
 
diff --git a/src/client.test.ts b/src/client.test.ts
index 234eb883b..a34920bbb 100644
--- a/src/client.test.ts
+++ b/src/client.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from 'vitest'
-import type { $ } from '../tests/builder/_/schema.js'
-import { setupMockServer } from '../tests/legacy/__helpers.js'
+import { setupMockServer } from '../tests/raw/__helpers.js'
+import type { $ } from '../tests/ts/_/schema.js'
 import { create } from './client.js'
 
 const ctx = setupMockServer()
diff --git a/src/entrypoints/main.ts b/src/entrypoints/main.ts
index 665a77a2c..ce5b7846e 100644
--- a/src/entrypoints/main.ts
+++ b/src/entrypoints/main.ts
@@ -1,18 +1,18 @@
-import { ClientError } from '../legacy/classes/ClientError.js'
+import { ClientError } from '../raw/classes/ClientError.js'
 import {
   type BatchRequestDocument,
   type BatchRequestsExtendedOptions,
   type BatchRequestsOptions,
-} from '../legacy/functions/batchRequests.js'
-import { RequestExtendedOptions } from '../legacy/functions/request.js'
-import { request } from '../legacy/functions/request.js'
-import type { GraphQLResponse, RequestMiddleware, ResponseMiddleware } from '../legacy/helpers/types.js'
-import { RawRequestOptions, RequestDocument, RequestOptions, Variables } from '../legacy/helpers/types.js'
-export { GraphQLClient } from '../legacy/classes/GraphQLClient.js'
-export { batchRequests } from '../legacy/functions/batchRequests.js'
-export { gql } from '../legacy/functions/gql.js'
-export { rawRequest } from '../legacy/functions/rawRequest.js'
-export { analyzeDocument } from '../legacy/helpers/analyzeDocument.js'
+} from '../raw/functions/batchRequests.js'
+import { RequestExtendedOptions } from '../raw/functions/request.js'
+import { request } from '../raw/functions/request.js'
+import type { GraphQLResponse, RequestMiddleware, ResponseMiddleware } from '../raw/helpers/types.js'
+import { RawRequestOptions, RequestDocument, RequestOptions, Variables } from '../raw/helpers/types.js'
+export { GraphQLClient } from '../raw/classes/GraphQLClient.js'
+export { batchRequests } from '../raw/functions/batchRequests.js'
+export { gql } from '../raw/functions/gql.js'
+export { rawRequest } from '../raw/functions/rawRequest.js'
+export { analyzeDocument } from '../raw/helpers/analyzeDocument.js'
 export {
   BatchRequestDocument,
   BatchRequestsExtendedOptions,
diff --git a/tests/raw/httpMethod.test.ts b/tests/raw/httpMethod.test.ts
index 832298624..d1a75b918 100644
--- a/tests/raw/httpMethod.test.ts
+++ b/tests/raw/httpMethod.test.ts
@@ -1,7 +1,7 @@
 import { expect, test, vitest } from 'vitest'
 import { gql, GraphQLClient } from '../../src/entrypoints/main.js'
-import type { RequestConfig } from '../../src/legacy/helpers/types.js'
 import { CONTENT_TYPE_HEADER, statusCodes } from '../../src/lib/http.js'
+import type { RequestConfig } from '../../src/raw/helpers/types.js'
 
 test(`mutation forces a POST method even if input wants GET for query`, async () => {
   const fetch = vitest.fn().mockImplementation((_: string, requestConfig: RequestConfig) => {
diff --git a/tests/raw/json-serializer.test.ts b/tests/raw/json-serializer.test.ts
index 8d18a8122..841de00d5 100644
--- a/tests/raw/json-serializer.test.ts
+++ b/tests/raw/json-serializer.test.ts
@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, test, vitest } from 'vitest'
 import { GraphQLClient } from '../../src/entrypoints/main.js'
-import type { Fetch, Variables } from '../../src/legacy/helpers/types.js'
 import { CONTENT_TYPE_HEADER, statusCodes } from '../../src/lib/http.js'
+import type { Fetch, Variables } from '../../src/raw/helpers/types.js'
 import { setupMockServer } from './__helpers.js'
 
 const ctx = setupMockServer()
diff --git a/tests/ts/generate.test.ts b/tests/ts/generate.test.ts
index 22356c672..440dd0750 100644
--- a/tests/ts/generate.test.ts
+++ b/tests/ts/generate.test.ts
@@ -5,10 +5,10 @@ import { generateFile } from '../../src/generator/generator.js'
 test(`generates types from GraphQL SDL file`, async () => {
   await generateFile({
     schemaModulePath: `../../../src/Schema/__.js`,
-    schemaPath: `./tests/builder/_/schema.graphql`,
-    typeScriptPath: `./tests/builder/_/schema.ts`,
+    schemaPath: `./tests/ts/_/schema.graphql`,
+    typeScriptPath: `./tests/ts/_/schema.ts`,
   })
   expect(
-    await readFile(`./tests/builder/_/schema.ts`, `utf8`),
+    await readFile(`./tests/ts/_/schema.ts`, `utf8`),
   ).toMatchSnapshot()
 })