diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6cbad1acf..a7b4bc72d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       # gel
 
       - name: Copy readme
-        run: cp README.md packages/driver/README.md
+        run: cp README.md packages/gel/README.md
 
       - name: Build gel
         run: yarn workspace gel run build
@@ -37,7 +37,7 @@ jobs:
         name: Dry-run publish 'gel' to npm
         uses: JS-DevTools/npm-publish@4b07b26a2f6e0a51846e1870223e545bae91c552
         with:
-          package: packages/driver/package.json
+          package: packages/gel/package.json
           token: ${{ secrets.NPM_TOKEN }}
           dry-run: true
 
@@ -46,13 +46,13 @@ jobs:
         run: |
           echo "Version in package.json has not changed. Creating canary release."
           yarn workspace gel version --no-git-tag-version --minor
-          CURRENT_VERSION=$(node -p "require('./packages/driver/package.json').version")
+          CURRENT_VERSION=$(node -p "require('./packages/gel/package.json').version")
           yarn workspace gel version --no-git-tag-version --new-version "${CURRENT_VERSION}-canary.$(date +'%Y%m%dT%H%M%S')"
 
       - name: Publish 'gel'
         uses: JS-DevTools/npm-publish@4b07b26a2f6e0a51846e1870223e545bae91c552
         with:
-          package: packages/driver/package.json
+          package: packages/gel/package.json
           token: ${{ secrets.NPM_TOKEN }}
           access: public
           tag: ${{ steps.check_publish_driver.outputs.type == '' && 'canary' || 'latest' }}
diff --git a/.gitmodules b/.gitmodules
index 83b83456c..220637f5f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "packages/driver/test/shared-client-testcases"]
-	path = packages/driver/test/shared-client-testcases
+[submodule "packages/gel/test/shared-client-testcases"]
+	path = packages/gel/test/shared-client-testcases
 	url = git@github.com:edgedb/shared-client-testcases.git
diff --git a/.prettierignore b/.prettierignore
index e21156fac..6849ab68c 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1 @@
-packages/driver/test/shared-client-testcases/
+packages/gel/test/shared-client-testcases/
diff --git a/eslint.config.mjs b/eslint.config.mjs
index fc2be02b9..1c42dd7c8 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,9 +1,9 @@
 import eslint from "@eslint/js";
 import tseslint from "typescript-eslint";
 
-const DRIVER_PATH = "packages/driver/src/**/*.?(m)ts";
+const DRIVER_PATH = "packages/gel/src/**/*.?(m)ts";
 const GENERATE_PATH = "packages/generate/src/**/*.?(m)ts";
-const FEATURE_LIBRARIES_PATH = "packages/!(driver|generate)/src/**/*.?(m)ts";
+const FEATURE_LIBRARIES_PATH = "packages/!(gel|generate)/src/**/*.?(m)ts";
 const INTEGRATION_TESTS_PATH = "integration-tests/*/*.test.?(m)ts";
 
 const ALL_PATHS = [
diff --git a/integration-tests/legacy/testRunner.ts b/integration-tests/legacy/testRunner.ts
index 85971465c..f026599bc 100644
--- a/integration-tests/legacy/testRunner.ts
+++ b/integration-tests/legacy/testRunner.ts
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../../packages/driver/test/testUtil";
+} from "../../packages/gel/test/testUtil";
 
 (async function main() {
   console.log("\nStarting Gel test cluster...");
diff --git a/integration-tests/lts/testRunner.ts b/integration-tests/lts/testRunner.ts
index b9fa9dbaa..44a1e5933 100644
--- a/integration-tests/lts/testRunner.ts
+++ b/integration-tests/lts/testRunner.ts
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../../packages/driver/test/testUtil";
+} from "../../packages/gel/test/testUtil";
 
 (async function main() {
   console.log("\nStarting Gel test cluster...");
diff --git a/integration-tests/nightly/testRunner.ts b/integration-tests/nightly/testRunner.ts
index 85971465c..f026599bc 100644
--- a/integration-tests/nightly/testRunner.ts
+++ b/integration-tests/nightly/testRunner.ts
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../../packages/driver/test/testUtil";
+} from "../../packages/gel/test/testUtil";
 
 (async function main() {
   console.log("\nStarting Gel test cluster...");
diff --git a/integration-tests/stable/testRunner.ts b/integration-tests/stable/testRunner.ts
index 85971465c..f026599bc 100644
--- a/integration-tests/stable/testRunner.ts
+++ b/integration-tests/stable/testRunner.ts
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../../packages/driver/test/testUtil";
+} from "../../packages/gel/test/testUtil";
 
 (async function main() {
   console.log("\nStarting Gel test cluster...");
diff --git a/packages/auth-core/test/globalSetup.ts b/packages/auth-core/test/globalSetup.ts
index 1793f189c..923bbee60 100644
--- a/packages/auth-core/test/globalSetup.ts
+++ b/packages/auth-core/test/globalSetup.ts
@@ -5,7 +5,7 @@ import {
   getServerCommand,
   getWSLPath,
   startServer,
-} from "../../driver/test/testUtil";
+} from "../../gel/test/testUtil";
 
 export default async () => {
   // tslint:disable-next-line
diff --git a/packages/auth-core/test/globalTeardown.ts b/packages/auth-core/test/globalTeardown.ts
index 0948e98b6..0de7a3335 100644
--- a/packages/auth-core/test/globalTeardown.ts
+++ b/packages/auth-core/test/globalTeardown.ts
@@ -1,4 +1,4 @@
-import { shutdown } from "../../driver/test/testUtil";
+import { shutdown } from "../../gel/test/testUtil";
 
 export default async () => {
   // tslint:disable-next-line
diff --git a/packages/auth-core/test/testbase.ts b/packages/auth-core/test/testbase.ts
index 9b890bd1e..ecc047b3c 100644
--- a/packages/auth-core/test/testbase.ts
+++ b/packages/auth-core/test/testbase.ts
@@ -1,5 +1,5 @@
 import { Client, ConnectOptions } from "gel";
-import * as testbase from "../../driver/test/testbase";
+import * as testbase from "../../gel/test/testbase";
 
 export const getClient = testbase.getClient as unknown as (
   opts?: ConnectOptions,
diff --git a/packages/driver/test/shared-client-testcases b/packages/driver/test/shared-client-testcases
deleted file mode 160000
index d720f509b..000000000
--- a/packages/driver/test/shared-client-testcases
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d720f509b352f2fe587b5ea6d0c624553b95e04b
diff --git a/packages/driver/genErrors.mjs b/packages/gel/genErrors.mjs
similarity index 100%
rename from packages/driver/genErrors.mjs
rename to packages/gel/genErrors.mjs
diff --git a/packages/driver/genReservedKeywords.js b/packages/gel/genReservedKeywords.js
similarity index 100%
rename from packages/driver/genReservedKeywords.js
rename to packages/gel/genReservedKeywords.js
diff --git a/packages/driver/jest.config.js b/packages/gel/jest.config.js
similarity index 100%
rename from packages/driver/jest.config.js
rename to packages/gel/jest.config.js
diff --git a/packages/driver/jest.connect-config.js b/packages/gel/jest.connect-config.js
similarity index 100%
rename from packages/driver/jest.connect-config.js
rename to packages/gel/jest.connect-config.js
diff --git a/packages/driver/package.json b/packages/gel/package.json
similarity index 95%
rename from packages/driver/package.json
rename to packages/gel/package.json
index 4e51a4b9a..8c51b80e2 100644
--- a/packages/driver/package.json
+++ b/packages/gel/package.json
@@ -9,7 +9,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/geldata/gel-js.git"
+    "url": "https://github.com/geldata/gel-js.git",
+    "directory": "packages/gel"
   },
   "main": "./dist/index.node.js",
   "types": "./dist/index.node.d.ts",
diff --git a/packages/driver/src/baseClient.ts b/packages/gel/src/baseClient.ts
similarity index 100%
rename from packages/driver/src/baseClient.ts
rename to packages/gel/src/baseClient.ts
diff --git a/packages/driver/src/baseConn.ts b/packages/gel/src/baseConn.ts
similarity index 100%
rename from packages/driver/src/baseConn.ts
rename to packages/gel/src/baseConn.ts
diff --git a/packages/driver/src/browserClient.ts b/packages/gel/src/browserClient.ts
similarity index 100%
rename from packages/driver/src/browserClient.ts
rename to packages/gel/src/browserClient.ts
diff --git a/packages/driver/src/browserCrypto.ts b/packages/gel/src/browserCrypto.ts
similarity index 100%
rename from packages/driver/src/browserCrypto.ts
rename to packages/gel/src/browserCrypto.ts
diff --git a/packages/driver/src/cli.mts b/packages/gel/src/cli.mts
similarity index 100%
rename from packages/driver/src/cli.mts
rename to packages/gel/src/cli.mts
diff --git a/packages/driver/src/codecs/array.ts b/packages/gel/src/codecs/array.ts
similarity index 100%
rename from packages/driver/src/codecs/array.ts
rename to packages/gel/src/codecs/array.ts
diff --git a/packages/driver/src/codecs/boolean.ts b/packages/gel/src/codecs/boolean.ts
similarity index 100%
rename from packages/driver/src/codecs/boolean.ts
rename to packages/gel/src/codecs/boolean.ts
diff --git a/packages/driver/src/codecs/bytes.ts b/packages/gel/src/codecs/bytes.ts
similarity index 100%
rename from packages/driver/src/codecs/bytes.ts
rename to packages/gel/src/codecs/bytes.ts
diff --git a/packages/driver/src/codecs/codecs.ts b/packages/gel/src/codecs/codecs.ts
similarity index 100%
rename from packages/driver/src/codecs/codecs.ts
rename to packages/gel/src/codecs/codecs.ts
diff --git a/packages/driver/src/codecs/consts.ts b/packages/gel/src/codecs/consts.ts
similarity index 100%
rename from packages/driver/src/codecs/consts.ts
rename to packages/gel/src/codecs/consts.ts
diff --git a/packages/driver/src/codecs/context.ts b/packages/gel/src/codecs/context.ts
similarity index 100%
rename from packages/driver/src/codecs/context.ts
rename to packages/gel/src/codecs/context.ts
diff --git a/packages/driver/src/codecs/datetime.ts b/packages/gel/src/codecs/datetime.ts
similarity index 100%
rename from packages/driver/src/codecs/datetime.ts
rename to packages/gel/src/codecs/datetime.ts
diff --git a/packages/driver/src/codecs/enum.ts b/packages/gel/src/codecs/enum.ts
similarity index 100%
rename from packages/driver/src/codecs/enum.ts
rename to packages/gel/src/codecs/enum.ts
diff --git a/packages/driver/src/codecs/ifaces.ts b/packages/gel/src/codecs/ifaces.ts
similarity index 100%
rename from packages/driver/src/codecs/ifaces.ts
rename to packages/gel/src/codecs/ifaces.ts
diff --git a/packages/driver/src/codecs/json.ts b/packages/gel/src/codecs/json.ts
similarity index 100%
rename from packages/driver/src/codecs/json.ts
rename to packages/gel/src/codecs/json.ts
diff --git a/packages/driver/src/codecs/memory.ts b/packages/gel/src/codecs/memory.ts
similarity index 100%
rename from packages/driver/src/codecs/memory.ts
rename to packages/gel/src/codecs/memory.ts
diff --git a/packages/driver/src/codecs/namedtuple.ts b/packages/gel/src/codecs/namedtuple.ts
similarity index 100%
rename from packages/driver/src/codecs/namedtuple.ts
rename to packages/gel/src/codecs/namedtuple.ts
diff --git a/packages/driver/src/codecs/numbers.ts b/packages/gel/src/codecs/numbers.ts
similarity index 100%
rename from packages/driver/src/codecs/numbers.ts
rename to packages/gel/src/codecs/numbers.ts
diff --git a/packages/driver/src/codecs/numerics.ts b/packages/gel/src/codecs/numerics.ts
similarity index 100%
rename from packages/driver/src/codecs/numerics.ts
rename to packages/gel/src/codecs/numerics.ts
diff --git a/packages/driver/src/codecs/object.ts b/packages/gel/src/codecs/object.ts
similarity index 100%
rename from packages/driver/src/codecs/object.ts
rename to packages/gel/src/codecs/object.ts
diff --git a/packages/driver/src/codecs/pgvector.ts b/packages/gel/src/codecs/pgvector.ts
similarity index 100%
rename from packages/driver/src/codecs/pgvector.ts
rename to packages/gel/src/codecs/pgvector.ts
diff --git a/packages/driver/src/codecs/postgis.ts b/packages/gel/src/codecs/postgis.ts
similarity index 100%
rename from packages/driver/src/codecs/postgis.ts
rename to packages/gel/src/codecs/postgis.ts
diff --git a/packages/driver/src/codecs/range.ts b/packages/gel/src/codecs/range.ts
similarity index 100%
rename from packages/driver/src/codecs/range.ts
rename to packages/gel/src/codecs/range.ts
diff --git a/packages/driver/src/codecs/record.ts b/packages/gel/src/codecs/record.ts
similarity index 100%
rename from packages/driver/src/codecs/record.ts
rename to packages/gel/src/codecs/record.ts
diff --git a/packages/driver/src/codecs/registry.ts b/packages/gel/src/codecs/registry.ts
similarity index 100%
rename from packages/driver/src/codecs/registry.ts
rename to packages/gel/src/codecs/registry.ts
diff --git a/packages/driver/src/codecs/set.ts b/packages/gel/src/codecs/set.ts
similarity index 100%
rename from packages/driver/src/codecs/set.ts
rename to packages/gel/src/codecs/set.ts
diff --git a/packages/driver/src/codecs/sparseObject.ts b/packages/gel/src/codecs/sparseObject.ts
similarity index 100%
rename from packages/driver/src/codecs/sparseObject.ts
rename to packages/gel/src/codecs/sparseObject.ts
diff --git a/packages/driver/src/codecs/text.ts b/packages/gel/src/codecs/text.ts
similarity index 100%
rename from packages/driver/src/codecs/text.ts
rename to packages/gel/src/codecs/text.ts
diff --git a/packages/driver/src/codecs/tuple.ts b/packages/gel/src/codecs/tuple.ts
similarity index 100%
rename from packages/driver/src/codecs/tuple.ts
rename to packages/gel/src/codecs/tuple.ts
diff --git a/packages/driver/src/codecs/uuid.ts b/packages/gel/src/codecs/uuid.ts
similarity index 100%
rename from packages/driver/src/codecs/uuid.ts
rename to packages/gel/src/codecs/uuid.ts
diff --git a/packages/driver/src/conUtils.server.ts b/packages/gel/src/conUtils.server.ts
similarity index 100%
rename from packages/driver/src/conUtils.server.ts
rename to packages/gel/src/conUtils.server.ts
diff --git a/packages/driver/src/conUtils.ts b/packages/gel/src/conUtils.ts
similarity index 100%
rename from packages/driver/src/conUtils.ts
rename to packages/gel/src/conUtils.ts
diff --git a/packages/driver/src/credentials.ts b/packages/gel/src/credentials.ts
similarity index 100%
rename from packages/driver/src/credentials.ts
rename to packages/gel/src/credentials.ts
diff --git a/packages/driver/src/cryptoUtils.ts b/packages/gel/src/cryptoUtils.ts
similarity index 100%
rename from packages/driver/src/cryptoUtils.ts
rename to packages/gel/src/cryptoUtils.ts
diff --git a/packages/driver/src/datatypes/datetime.ts b/packages/gel/src/datatypes/datetime.ts
similarity index 100%
rename from packages/driver/src/datatypes/datetime.ts
rename to packages/gel/src/datatypes/datetime.ts
diff --git a/packages/driver/src/datatypes/dateutil.ts b/packages/gel/src/datatypes/dateutil.ts
similarity index 100%
rename from packages/driver/src/datatypes/dateutil.ts
rename to packages/gel/src/datatypes/dateutil.ts
diff --git a/packages/driver/src/datatypes/memory.ts b/packages/gel/src/datatypes/memory.ts
similarity index 100%
rename from packages/driver/src/datatypes/memory.ts
rename to packages/gel/src/datatypes/memory.ts
diff --git a/packages/driver/src/datatypes/pgvector.ts b/packages/gel/src/datatypes/pgvector.ts
similarity index 100%
rename from packages/driver/src/datatypes/pgvector.ts
rename to packages/gel/src/datatypes/pgvector.ts
diff --git a/packages/driver/src/datatypes/postgis.ts b/packages/gel/src/datatypes/postgis.ts
similarity index 100%
rename from packages/driver/src/datatypes/postgis.ts
rename to packages/gel/src/datatypes/postgis.ts
diff --git a/packages/driver/src/datatypes/range.ts b/packages/gel/src/datatypes/range.ts
similarity index 100%
rename from packages/driver/src/datatypes/range.ts
rename to packages/gel/src/datatypes/range.ts
diff --git a/packages/driver/src/datatypes/wkt.ts b/packages/gel/src/datatypes/wkt.ts
similarity index 100%
rename from packages/driver/src/datatypes/wkt.ts
rename to packages/gel/src/datatypes/wkt.ts
diff --git a/packages/driver/src/errors/base.ts b/packages/gel/src/errors/base.ts
similarity index 100%
rename from packages/driver/src/errors/base.ts
rename to packages/gel/src/errors/base.ts
diff --git a/packages/driver/src/errors/index.ts b/packages/gel/src/errors/index.ts
similarity index 100%
rename from packages/driver/src/errors/index.ts
rename to packages/gel/src/errors/index.ts
diff --git a/packages/driver/src/errors/map.ts b/packages/gel/src/errors/map.ts
similarity index 100%
rename from packages/driver/src/errors/map.ts
rename to packages/gel/src/errors/map.ts
diff --git a/packages/driver/src/errors/resolve.ts b/packages/gel/src/errors/resolve.ts
similarity index 100%
rename from packages/driver/src/errors/resolve.ts
rename to packages/gel/src/errors/resolve.ts
diff --git a/packages/driver/src/errors/tags.ts b/packages/gel/src/errors/tags.ts
similarity index 100%
rename from packages/driver/src/errors/tags.ts
rename to packages/gel/src/errors/tags.ts
diff --git a/packages/driver/src/fetchConn.ts b/packages/gel/src/fetchConn.ts
similarity index 100%
rename from packages/driver/src/fetchConn.ts
rename to packages/gel/src/fetchConn.ts
diff --git a/packages/driver/src/httpScram.ts b/packages/gel/src/httpScram.ts
similarity index 100%
rename from packages/driver/src/httpScram.ts
rename to packages/gel/src/httpScram.ts
diff --git a/packages/driver/src/ifaces.ts b/packages/gel/src/ifaces.ts
similarity index 100%
rename from packages/driver/src/ifaces.ts
rename to packages/gel/src/ifaces.ts
diff --git a/packages/driver/src/index.browser.ts b/packages/gel/src/index.browser.ts
similarity index 100%
rename from packages/driver/src/index.browser.ts
rename to packages/gel/src/index.browser.ts
diff --git a/packages/driver/src/index.node.ts b/packages/gel/src/index.node.ts
similarity index 100%
rename from packages/driver/src/index.node.ts
rename to packages/gel/src/index.node.ts
diff --git a/packages/driver/src/index.shared.ts b/packages/gel/src/index.shared.ts
similarity index 100%
rename from packages/driver/src/index.shared.ts
rename to packages/gel/src/index.shared.ts
diff --git a/packages/driver/src/nodeClient.ts b/packages/gel/src/nodeClient.ts
similarity index 100%
rename from packages/driver/src/nodeClient.ts
rename to packages/gel/src/nodeClient.ts
diff --git a/packages/driver/src/nodeCrypto.ts b/packages/gel/src/nodeCrypto.ts
similarity index 100%
rename from packages/driver/src/nodeCrypto.ts
rename to packages/gel/src/nodeCrypto.ts
diff --git a/packages/driver/src/options.ts b/packages/gel/src/options.ts
similarity index 100%
rename from packages/driver/src/options.ts
rename to packages/gel/src/options.ts
diff --git a/packages/driver/src/platform.ts b/packages/gel/src/platform.ts
similarity index 100%
rename from packages/driver/src/platform.ts
rename to packages/gel/src/platform.ts
diff --git a/packages/driver/src/primitives/buffer.ts b/packages/gel/src/primitives/buffer.ts
similarity index 100%
rename from packages/driver/src/primitives/buffer.ts
rename to packages/gel/src/primitives/buffer.ts
diff --git a/packages/driver/src/primitives/chars.ts b/packages/gel/src/primitives/chars.ts
similarity index 100%
rename from packages/driver/src/primitives/chars.ts
rename to packages/gel/src/primitives/chars.ts
diff --git a/packages/driver/src/primitives/crcHqx.ts b/packages/gel/src/primitives/crcHqx.ts
similarity index 100%
rename from packages/driver/src/primitives/crcHqx.ts
rename to packages/gel/src/primitives/crcHqx.ts
diff --git a/packages/driver/src/primitives/event.ts b/packages/gel/src/primitives/event.ts
similarity index 100%
rename from packages/driver/src/primitives/event.ts
rename to packages/gel/src/primitives/event.ts
diff --git a/packages/driver/src/primitives/lru.ts b/packages/gel/src/primitives/lru.ts
similarity index 100%
rename from packages/driver/src/primitives/lru.ts
rename to packages/gel/src/primitives/lru.ts
diff --git a/packages/driver/src/primitives/queues.ts b/packages/gel/src/primitives/queues.ts
similarity index 100%
rename from packages/driver/src/primitives/queues.ts
rename to packages/gel/src/primitives/queues.ts
diff --git a/packages/driver/src/rawConn.ts b/packages/gel/src/rawConn.ts
similarity index 100%
rename from packages/driver/src/rawConn.ts
rename to packages/gel/src/rawConn.ts
diff --git a/packages/driver/src/reflection/analyzeQuery.ts b/packages/gel/src/reflection/analyzeQuery.ts
similarity index 100%
rename from packages/driver/src/reflection/analyzeQuery.ts
rename to packages/gel/src/reflection/analyzeQuery.ts
diff --git a/packages/driver/src/reflection/enums.ts b/packages/gel/src/reflection/enums.ts
similarity index 100%
rename from packages/driver/src/reflection/enums.ts
rename to packages/gel/src/reflection/enums.ts
diff --git a/packages/driver/src/reflection/index.ts b/packages/gel/src/reflection/index.ts
similarity index 100%
rename from packages/driver/src/reflection/index.ts
rename to packages/gel/src/reflection/index.ts
diff --git a/packages/driver/src/reflection/queries.ts b/packages/gel/src/reflection/queries.ts
similarity index 100%
rename from packages/driver/src/reflection/queries.ts
rename to packages/gel/src/reflection/queries.ts
diff --git a/packages/driver/src/reflection/queries/casts.ts b/packages/gel/src/reflection/queries/casts.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/casts.ts
rename to packages/gel/src/reflection/queries/casts.ts
diff --git a/packages/driver/src/reflection/queries/functions.ts b/packages/gel/src/reflection/queries/functions.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/functions.ts
rename to packages/gel/src/reflection/queries/functions.ts
diff --git a/packages/driver/src/reflection/queries/globals.ts b/packages/gel/src/reflection/queries/globals.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/globals.ts
rename to packages/gel/src/reflection/queries/globals.ts
diff --git a/packages/driver/src/reflection/queries/operators.ts b/packages/gel/src/reflection/queries/operators.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/operators.ts
rename to packages/gel/src/reflection/queries/operators.ts
diff --git a/packages/driver/src/reflection/queries/queryTypes.ts b/packages/gel/src/reflection/queries/queryTypes.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/queryTypes.ts
rename to packages/gel/src/reflection/queries/queryTypes.ts
diff --git a/packages/driver/src/reflection/queries/scalars.ts b/packages/gel/src/reflection/queries/scalars.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/scalars.ts
rename to packages/gel/src/reflection/queries/scalars.ts
diff --git a/packages/driver/src/reflection/queries/types.ts b/packages/gel/src/reflection/queries/types.ts
similarity index 100%
rename from packages/driver/src/reflection/queries/types.ts
rename to packages/gel/src/reflection/queries/types.ts
diff --git a/packages/driver/src/reflection/reservedKeywords.ts b/packages/gel/src/reflection/reservedKeywords.ts
similarity index 100%
rename from packages/driver/src/reflection/reservedKeywords.ts
rename to packages/gel/src/reflection/reservedKeywords.ts
diff --git a/packages/driver/src/reflection/strictMap.ts b/packages/gel/src/reflection/strictMap.ts
similarity index 100%
rename from packages/driver/src/reflection/strictMap.ts
rename to packages/gel/src/reflection/strictMap.ts
diff --git a/packages/driver/src/reflection/syntax.ts b/packages/gel/src/reflection/syntax.ts
similarity index 100%
rename from packages/driver/src/reflection/syntax.ts
rename to packages/gel/src/reflection/syntax.ts
diff --git a/packages/driver/src/reflection/typeutil.ts b/packages/gel/src/reflection/typeutil.ts
similarity index 100%
rename from packages/driver/src/reflection/typeutil.ts
rename to packages/gel/src/reflection/typeutil.ts
diff --git a/packages/driver/src/reflection/util.ts b/packages/gel/src/reflection/util.ts
similarity index 100%
rename from packages/driver/src/reflection/util.ts
rename to packages/gel/src/reflection/util.ts
diff --git a/packages/driver/src/retry.ts b/packages/gel/src/retry.ts
similarity index 100%
rename from packages/driver/src/retry.ts
rename to packages/gel/src/retry.ts
diff --git a/packages/driver/src/scram.ts b/packages/gel/src/scram.ts
similarity index 100%
rename from packages/driver/src/scram.ts
rename to packages/gel/src/scram.ts
diff --git a/packages/driver/src/systemUtils.ts b/packages/gel/src/systemUtils.ts
similarity index 100%
rename from packages/driver/src/systemUtils.ts
rename to packages/gel/src/systemUtils.ts
diff --git a/packages/driver/src/transaction.ts b/packages/gel/src/transaction.ts
similarity index 100%
rename from packages/driver/src/transaction.ts
rename to packages/gel/src/transaction.ts
diff --git a/packages/driver/src/typeutil.ts b/packages/gel/src/typeutil.ts
similarity index 100%
rename from packages/driver/src/typeutil.ts
rename to packages/gel/src/typeutil.ts
diff --git a/packages/driver/src/utils.ts b/packages/gel/src/utils.ts
similarity index 100%
rename from packages/driver/src/utils.ts
rename to packages/gel/src/utils.ts
diff --git a/packages/driver/test/browser.test.ts b/packages/gel/test/browser.test.ts
similarity index 100%
rename from packages/driver/test/browser.test.ts
rename to packages/gel/test/browser.test.ts
diff --git a/packages/driver/test/buffers.test.ts b/packages/gel/test/buffers.test.ts
similarity index 100%
rename from packages/driver/test/buffers.test.ts
rename to packages/gel/test/buffers.test.ts
diff --git a/packages/driver/test/client.test.ts b/packages/gel/test/client.test.ts
similarity index 100%
rename from packages/driver/test/client.test.ts
rename to packages/gel/test/client.test.ts
diff --git a/packages/driver/test/connection-config.test.ts b/packages/gel/test/connection-config.test.ts
similarity index 100%
rename from packages/driver/test/connection-config.test.ts
rename to packages/gel/test/connection-config.test.ts
diff --git a/packages/driver/test/connection.test.ts b/packages/gel/test/connection.test.ts
similarity index 100%
rename from packages/driver/test/connection.test.ts
rename to packages/gel/test/connection.test.ts
diff --git a/packages/driver/test/createClient.test.ts b/packages/gel/test/createClient.test.ts
similarity index 100%
rename from packages/driver/test/createClient.test.ts
rename to packages/gel/test/createClient.test.ts
diff --git a/packages/driver/test/credentials.test.ts b/packages/gel/test/credentials.test.ts
similarity index 100%
rename from packages/driver/test/credentials.test.ts
rename to packages/gel/test/credentials.test.ts
diff --git a/packages/driver/test/credentials1.json b/packages/gel/test/credentials1.json
similarity index 100%
rename from packages/driver/test/credentials1.json
rename to packages/gel/test/credentials1.json
diff --git a/packages/driver/test/datetime.test.ts b/packages/gel/test/datetime.test.ts
similarity index 100%
rename from packages/driver/test/datetime.test.ts
rename to packages/gel/test/datetime.test.ts
diff --git a/packages/driver/test/errors.test.ts b/packages/gel/test/errors.test.ts
similarity index 100%
rename from packages/driver/test/errors.test.ts
rename to packages/gel/test/errors.test.ts
diff --git a/packages/driver/test/globalSetup.ts b/packages/gel/test/globalSetup.ts
similarity index 100%
rename from packages/driver/test/globalSetup.ts
rename to packages/gel/test/globalSetup.ts
diff --git a/packages/driver/test/globalTeardown.ts b/packages/gel/test/globalTeardown.ts
similarity index 100%
rename from packages/driver/test/globalTeardown.ts
rename to packages/gel/test/globalTeardown.ts
diff --git a/packages/driver/test/jsdom-with-fetch.ts b/packages/gel/test/jsdom-with-fetch.ts
similarity index 100%
rename from packages/driver/test/jsdom-with-fetch.ts
rename to packages/gel/test/jsdom-with-fetch.ts
diff --git a/packages/driver/test/lru.test.ts b/packages/gel/test/lru.test.ts
similarity index 100%
rename from packages/driver/test/lru.test.ts
rename to packages/gel/test/lru.test.ts
diff --git a/packages/driver/test/misc.test.ts b/packages/gel/test/misc.test.ts
similarity index 100%
rename from packages/driver/test/misc.test.ts
rename to packages/gel/test/misc.test.ts
diff --git a/packages/driver/test/pool.test.ts b/packages/gel/test/pool.test.ts
similarity index 100%
rename from packages/driver/test/pool.test.ts
rename to packages/gel/test/pool.test.ts
diff --git a/packages/driver/test/postgis.test.ts b/packages/gel/test/postgis.test.ts
similarity index 100%
rename from packages/driver/test/postgis.test.ts
rename to packages/gel/test/postgis.test.ts
diff --git a/packages/driver/test/queues.test.ts b/packages/gel/test/queues.test.ts
similarity index 100%
rename from packages/driver/test/queues.test.ts
rename to packages/gel/test/queues.test.ts
diff --git a/packages/driver/test/retry.test.ts b/packages/gel/test/retry.test.ts
similarity index 100%
rename from packages/driver/test/retry.test.ts
rename to packages/gel/test/retry.test.ts
diff --git a/packages/driver/test/retryConnError.test.ts b/packages/gel/test/retryConnError.test.ts
similarity index 100%
rename from packages/driver/test/retryConnError.test.ts
rename to packages/gel/test/retryConnError.test.ts
diff --git a/packages/driver/test/scram.test.ts b/packages/gel/test/scram.test.ts
similarity index 100%
rename from packages/driver/test/scram.test.ts
rename to packages/gel/test/scram.test.ts
diff --git a/packages/driver/test/session.test.ts b/packages/gel/test/session.test.ts
similarity index 100%
rename from packages/driver/test/session.test.ts
rename to packages/gel/test/session.test.ts
diff --git a/packages/gel/test/shared-client-testcases b/packages/gel/test/shared-client-testcases
new file mode 160000
index 000000000..d9803726e
--- /dev/null
+++ b/packages/gel/test/shared-client-testcases
@@ -0,0 +1 @@
+Subproject commit d9803726ebe9434d0635f3c0b63cdd349f80e7d9
diff --git a/packages/driver/test/testUtil.ts b/packages/gel/test/testUtil.ts
similarity index 100%
rename from packages/driver/test/testUtil.ts
rename to packages/gel/test/testUtil.ts
diff --git a/packages/driver/test/testbase.ts b/packages/gel/test/testbase.ts
similarity index 100%
rename from packages/driver/test/testbase.ts
rename to packages/gel/test/testbase.ts
diff --git a/packages/driver/test/transaction.test.ts b/packages/gel/test/transaction.test.ts
similarity index 100%
rename from packages/driver/test/transaction.test.ts
rename to packages/gel/test/transaction.test.ts
diff --git a/packages/driver/test/types.test.ts b/packages/gel/test/types.test.ts
similarity index 100%
rename from packages/driver/test/types.test.ts
rename to packages/gel/test/types.test.ts
diff --git a/packages/driver/tsconfig.cli.json b/packages/gel/tsconfig.cli.json
similarity index 100%
rename from packages/driver/tsconfig.cli.json
rename to packages/gel/tsconfig.cli.json
diff --git a/packages/driver/tsconfig.json b/packages/gel/tsconfig.json
similarity index 100%
rename from packages/driver/tsconfig.json
rename to packages/gel/tsconfig.json
diff --git a/packages/generate/README.md b/packages/generate/README.md
index ca8dd6c7b..bc515495d 100644
--- a/packages/generate/README.md
+++ b/packages/generate/README.md
@@ -98,7 +98,7 @@ Execute `playground.ts` (uses `tsx`). Useful for testing things quickly in devel
 yarn play
 ```
 
-> ⚠️ All imports from `"gel"` resolve to the local build version of the driver in `packages/driver/dist`. This imports the _built_ library, not the so you need to re-run `yarn workspace gel build` for changes to be reflected in your playground code. Run `yarn dev` watcher inside `packages/driver` to rebuild the project anytime you make a change.
+> ⚠️ All imports from `"gel"` resolve to the local build version of the driver in `packages/gel/dist`. This imports the _built_ library, not the so you need to re-run `yarn workspace gel build` for changes to be reflected in your playground code. Run `yarn dev` watcher inside `packages/gel` to rebuild the project anytime you make a change.
 
 Run commands in watch mode. Useful when in development. The following command rebuilds the package and executes the playground whenever a file change is detected.
 
diff --git a/packages/generate/test/testRunner.ts b/packages/generate/test/testRunner.ts
index fd9c0692c..c511d324b 100644
--- a/packages/generate/test/testRunner.ts
+++ b/packages/generate/test/testRunner.ts
@@ -1,4 +1,4 @@
-import createClient from "../../driver/src/index.node";
+import createClient from "../../gel/src/index.node";
 
 import {
   shutdown,
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../../driver/test/testUtil";
+} from "../../gel/test/testUtil";
 
 (async function main() {
   console.log("\nStarting Gel test cluster...");