diff --git a/.eslintrc.js b/.eslintrc.js
index a081c38c7ade..da303c683c01 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,7 +10,16 @@ module.exports = {
     ecmaVersion: 2018,
   },
   extends: ['@sentry-internal/sdk'],
-  ignorePatterns: ['coverage/**', 'build/**', 'dist/**', 'esm/**', 'examples/**', 'test/manual/**', 'types/**'],
+  ignorePatterns: [
+    'coverage/**',
+    'build/**',
+    'dist/**',
+    'cjs/**',
+    'esm/**',
+    'examples/**',
+    'test/manual/**',
+    'types/**',
+  ],
   overrides: [
     {
       files: ['*.ts', '*.tsx', '*.d.ts'],
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 368412a4515c..aec9e06c66dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ env:
 
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/packages/**/build
-    ${{ github.workspace }}/packages/**/dist
+    ${{ github.workspace }}/packages/**/cjs
     ${{ github.workspace }}/packages/**/esm
     ${{ github.workspace }}/packages/ember/*.d.ts
     ${{ github.workspace }}/packages/ember/instance-initializers
diff --git a/.gitignore b/.gitignore
index 01098a94ef9f..4418a41432bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ package-lock.json
 
 # build and test
 build/
-packages/*/dist/
+packages/*/cjs/
 packages/*/esm/
 coverage/
 scratch/
diff --git a/.npmignore b/.npmignore
index facb3a101f90..cb864514088e 100644
--- a/.npmignore
+++ b/.npmignore
@@ -3,6 +3,6 @@
 
 *
 
-!/dist/**/*
+!/cjs/**/*
 !/esm/**/*
 !/types/**/*
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9670683310d6..bef12bd786af 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,16 +5,16 @@
   "version": "0.2.0",
   "inputs": [
     {
-        "id": "getPackageName",
-        "type": "command",
-        "command": "shellCommand.execute",
-        "args": {
-            "command": "echo '${file}' | sed s/'.*sentry-javascript\\/packages\\/'// | grep --extended-regexp --only-matching --max-count 1 '[^\\/]+' | head -1",
-            "cwd": "${workspaceFolder}" ,
-            // normally `input` commands bring up a selector for the user, but given that there should only be one
-            // choice here, this lets us skip the prompt
-            "useSingleResult": true
-        }
+      "id": "getPackageName",
+      "type": "command",
+      "command": "shellCommand.execute",
+      "args": {
+        "command": "echo '${file}' | sed s/'.*sentry-javascript\\/packages\\/'// | grep --extended-regexp --only-matching --max-count 1 '[^\\/]+' | head -1",
+        "cwd": "${workspaceFolder}",
+        // normally `input` commands bring up a selector for the user, but given that there should only be one
+        // choice here, this lets us skip the prompt
+        "useSingleResult": true
+      }
     }
   ],
   "configurations": [
@@ -25,18 +25,9 @@
       "cwd": "${workspaceFolder}/packages/${input:getPackageName}",
       "request": "launch",
       "runtimeExecutable": "yarn",
-      "runtimeArgs": [
-        "rollup",
-        "-c",
-        "${file}"
-      ],
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/**/*.js",
-        "!**/node_modules/**"
-      ],
+      "runtimeArgs": ["rollup", "-c", "${file}"],
+      "skipFiles": ["<node_internals>/**"],
+      "outFiles": ["${workspaceFolder}/**/*.js", "!**/node_modules/**"],
       "sourceMaps": true,
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
@@ -67,14 +58,13 @@
       ],
       "sourceMaps": true,
       "smartStep": true,
-       // otherwise it goes to the VSCode debug terminal, which prints the test output or console logs (depending on
-       // "outputCapture" option here; default is to show console logs), but not both
+      // otherwise it goes to the VSCode debug terminal, which prints the test output or console logs (depending on
+      // "outputCapture" option here; default is to show console logs), but not both
       "console": "integratedTerminal",
       // since we're not using it, don't automatically switch to it
-      "internalConsoleOptions": "neverOpen",
+      "internalConsoleOptions": "neverOpen"
     },
 
-
     // @sentry/nextjs - Run a specific integration test file
     // Must have test file in currently active tab when hitting the play button, and must already have run `yarn` in test app directory
     {
@@ -105,18 +95,17 @@
       // this controls which files are sourcemapped
       "outFiles": [
         // our SDK code
-        "${workspaceFolder}/**/dist/**/*.js",
+        "${workspaceFolder}/**/cjs/**/*.js",
         // the built test app
         "${workspaceFolder}/packages/nextjs/test/integration/.next/**/*.js",
         "!**/node_modules/**"
       ],
       "resolveSourceMapLocations": [
-        "${workspaceFolder}/**/dist/**",
+        "${workspaceFolder}/**/cjs/**",
         "${workspaceFolder}/packages/nextjs/test/integration/.next/**",
         "!**/node_modules/**"
       ],
       "internalConsoleOptions": "openOnSessionStart"
-
-    },
+    }
   ]
 }
diff --git a/packages/angular/.npmignore b/packages/angular/.npmignore
index 8904efca5aea..75ee79933841 100644
--- a/packages/angular/.npmignore
+++ b/packages/angular/.npmignore
@@ -1,4 +1,4 @@
 *
-!/dist/**/*
+!/cjs/**/*
 !/esm/**/*
 !/build/types/**/*
diff --git a/packages/angular/package.json b/packages/angular/package.json
index d1e1396acc10..9db6f128eaf0 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "dist/index.js",
+  "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -47,7 +47,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "npm pack",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf cjs esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/angular/tsconfig.cjs.json b/packages/angular/tsconfig.cjs.json
index abd80f77e1ff..4ec31d2ff68b 100644
--- a/packages/angular/tsconfig.cjs.json
+++ b/packages/angular/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "dist"
+    "outDir": "cjs"
   }
 }
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 5ba65a4c3b56..2c498962fb0a 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/npm/dist/index.js",
+  "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
   "publishConfig": {
diff --git a/packages/browser/test/package/test-code.js b/packages/browser/test/package/test-code.js
index e05a667db274..3a3811eebb89 100644
--- a/packages/browser/test/package/test-code.js
+++ b/packages/browser/test/package/test-code.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-const Sentry = require('../../build/npm/dist/index.js');
-const Integrations = require('../../../integrations/build/npm/dist/dedupe.js');
+const Sentry = require('../../build/npm/cjs/index.js');
+const Integrations = require('../../../integrations/build/npm/cjs/dedupe.js');
 
 // Init
 Sentry.init({
diff --git a/packages/browser/tsconfig.cjs.json b/packages/browser/tsconfig.cjs.json
index 6782dae5e453..0fa3132e7510 100644
--- a/packages/browser/tsconfig.cjs.json
+++ b/packages/browser/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/npm/dist"
+    "outDir": "build/npm/cjs"
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index 94093c3888f9..c6422c4dab99 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -37,7 +37,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/core/tsconfig.cjs.json b/packages/core/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/core/tsconfig.cjs.json
+++ b/packages/core/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/gatsby/.npmignore b/packages/gatsby/.npmignore
index b8bb08da7374..66474694b223 100644
--- a/packages/gatsby/.npmignore
+++ b/packages/gatsby/.npmignore
@@ -3,7 +3,7 @@
 
 *
 
-!/dist/**/*
+!/cjs/**/*
 !/esm/**/*
 !/types/**/*
 
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 4f1a814582d1..1789fe091a4f 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -13,7 +13,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -48,7 +48,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/gatsby/tsconfig.cjs.json b/packages/gatsby/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/gatsby/tsconfig.cjs.json
+++ b/packages/gatsby/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/hub/package.json b/packages/hub/package.json
index 3325b6ea6b6d..45408c158c39 100644
--- a/packages/hub/package.json
+++ b/packages/hub/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -35,7 +35,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm coverage",
+    "clean": "rimraf build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/hub/tsconfig.cjs.json b/packages/hub/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/hub/tsconfig.cjs.json
+++ b/packages/hub/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/integration-tests/utils/generatePlugin.ts b/packages/integration-tests/utils/generatePlugin.ts
index 5163f81a668a..1a7ebefad0b7 100644
--- a/packages/integration-tests/utils/generatePlugin.ts
+++ b/packages/integration-tests/utils/generatePlugin.ts
@@ -17,7 +17,7 @@ const useBundle = bundleKey && !useCompiledModule;
 
 const BUNDLE_PATHS: Record<string, Record<string, string>> = {
   browser: {
-    cjs: 'build/npm/dist/index.js',
+    cjs: 'build/npm/cjs/index.js',
     esm: 'build/npm/esm/index.js',
     bundle_es5: 'build/bundles/bundle.js',
     bundle_es5_min: 'build/bundles/bundle.min.js',
@@ -25,7 +25,7 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     bundle_es6_min: 'build/bundles/bundle.es6.min.js',
   },
   tracing: {
-    cjs: 'build/npm/dist/index.js',
+    cjs: 'build/npm/cjs/index.js',
     esm: 'build/npm/esm/index.js',
     bundle_es5: 'build/bundles/bundle.tracing.js',
     bundle_es5_min: 'build/bundles/bundle.tracing.min.js',
diff --git a/packages/integrations/package.json b/packages/integrations/package.json
index 459fa6325107..ede4c816e00d 100644
--- a/packages/integrations/package.json
+++ b/packages/integrations/package.json
@@ -12,7 +12,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "build/npm/dist/index.js",
+  "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
   "dependencies": {
@@ -40,7 +40,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage .rpt2_cache",
+    "clean": "rimraf build coverage .rpt2_cache",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/integrations/tsconfig.cjs.json b/packages/integrations/tsconfig.cjs.json
index 6782dae5e453..0fa3132e7510 100644
--- a/packages/integrations/tsconfig.cjs.json
+++ b/packages/integrations/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/npm/dist"
+    "outDir": "build/npm/cjs"
   }
 }
diff --git a/packages/minimal/package.json b/packages/minimal/package.json
index 7a303565e75e..4a8b6630cae0 100644
--- a/packages/minimal/package.json
+++ b/packages/minimal/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -35,7 +35,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/minimal/tsconfig.cjs.json b/packages/minimal/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/minimal/tsconfig.cjs.json
+++ b/packages/minimal/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 51018abce6f0..cec39c72c4aa 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.server.js",
+  "main": "build/cjs/index.server.js",
   "module": "build/esm/index.server.js",
   "browser": "build/esm/index.client.js",
   "types": "build/types/index.server.d.ts",
@@ -57,7 +57,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.client.ts && madge --circular --exclude 'config/types\\.ts' src/index.server.ts # see https://github.com/pahen/madge/issues/306",
-    "clean": "rimraf dist esm build coverage *.js *.js.map *.d.ts",
+    "clean": "rimraf build coverage *.js *.js.map *.d.ts",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
@@ -97,7 +97,7 @@
     }
   },
   "sideEffects": [
-    "./dist/index.server.js",
+    "./cjs/index.server.js",
     "./esm/index.server.js",
     "./src/index.server.ts"
   ]
diff --git a/packages/nextjs/tsconfig.cjs.json b/packages/nextjs/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/nextjs/tsconfig.cjs.json
+++ b/packages/nextjs/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/nextjs/vercel/install-sentry-from-branch.sh b/packages/nextjs/vercel/install-sentry-from-branch.sh
index af79d10ea04e..704601894308 100644
--- a/packages/nextjs/vercel/install-sentry-from-branch.sh
+++ b/packages/nextjs/vercel/install-sentry-from-branch.sh
@@ -28,7 +28,7 @@ yarn --prod false
 echo " "
 echo "BUILDING SDK"
 # We need to build es5 versions because `next.config.js` calls `require` on the SDK (to get `withSentryConfig`) and
-# therefore it looks for `dist/index.js`
+# therefore it looks for `cjs/index.js`
 yarn build:cjs
 # We need to build esm versions because that's what `next` actually uses when it builds the app
 yarn build:esm
diff --git a/packages/node/package.json b/packages/node/package.json
index ba296a8fd672..a9048c5b67a4 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -48,7 +48,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/node/test/manual/apm-transaction/main.js b/packages/node/test/manual/apm-transaction/main.js
index e34088b4eaaf..0584177e8b10 100644
--- a/packages/node/test/manual/apm-transaction/main.js
+++ b/packages/node/test/manual/apm-transaction/main.js
@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const app = express();
-const Sentry = require('../../../build/dist');
+const Sentry = require('../../../build/cjs');
 
 Sentry.init({
   debug: true,
diff --git a/packages/node/test/manual/express-scope-separation/start.js b/packages/node/test/manual/express-scope-separation/start.js
index 2e89fa14f4ec..9146c3ab2eba 100644
--- a/packages/node/test/manual/express-scope-separation/start.js
+++ b/packages/node/test/manual/express-scope-separation/start.js
@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const app = express();
-const Sentry = require('../../../build/dist');
+const Sentry = require('../../../build/cjs');
 
 function assertTags(actual, expected) {
   if (JSON.stringify(actual) !== JSON.stringify(expected)) {
diff --git a/packages/node/test/manual/memory-leak/context-memory.js b/packages/node/test/manual/memory-leak/context-memory.js
index 9c63343c1fd8..6c124d542ce5 100644
--- a/packages/node/test/manual/memory-leak/context-memory.js
+++ b/packages/node/test/manual/memory-leak/context-memory.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../build/dist');
+const Sentry = require('../../../build/cjs');
 
 Sentry.init({ dsn: 'https://public@app.getsentry.com/12345' });
 
diff --git a/packages/node/test/manual/memory-leak/express-patient.js b/packages/node/test/manual/memory-leak/express-patient.js
index 90be8be575d4..7a677a442972 100644
--- a/packages/node/test/manual/memory-leak/express-patient.js
+++ b/packages/node/test/manual/memory-leak/express-patient.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../build/dist');
+const Sentry = require('../../../build/cjs');
 
 Sentry.init({ dsn: 'https://public@app.getsentry.com/12345' });
 
diff --git a/packages/node/test/manual/release-health/session-aggregates/aggregates-disable-single-session.js b/packages/node/test/manual/release-health/session-aggregates/aggregates-disable-single-session.js
index cedd795e9a57..0c536e0accae 100644
--- a/packages/node/test/manual/release-health/session-aggregates/aggregates-disable-single-session.js
+++ b/packages/node/test/manual/release-health/session-aggregates/aggregates-disable-single-session.js
@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const app = express();
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const { assertSessions, BaseDummyTransport } = require('../test-utils');
 
 function cleanUpAndExitSuccessfully() {
diff --git a/packages/node/test/manual/release-health/single-session/caught-exception-errored-session.js b/packages/node/test/manual/release-health/single-session/caught-exception-errored-session.js
index 9f538a1ba993..db052b2bc508 100644
--- a/packages/node/test/manual/release-health/single-session/caught-exception-errored-session.js
+++ b/packages/node/test/manual/release-health/single-session/caught-exception-errored-session.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const {
   assertSessions,
   constructStrippedSessionObject,
diff --git a/packages/node/test/manual/release-health/single-session/errors-in-session-capped-to-one.js b/packages/node/test/manual/release-health/single-session/errors-in-session-capped-to-one.js
index 65c2bf05ef7f..983f10e9b294 100644
--- a/packages/node/test/manual/release-health/single-session/errors-in-session-capped-to-one.js
+++ b/packages/node/test/manual/release-health/single-session/errors-in-session-capped-to-one.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const {
   assertSessions,
   constructStrippedSessionObject,
diff --git a/packages/node/test/manual/release-health/single-session/healthy-session.js b/packages/node/test/manual/release-health/single-session/healthy-session.js
index 05712ae7dcc2..1906b8196bf5 100644
--- a/packages/node/test/manual/release-health/single-session/healthy-session.js
+++ b/packages/node/test/manual/release-health/single-session/healthy-session.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const {
   assertSessions,
   constructStrippedSessionObject,
diff --git a/packages/node/test/manual/release-health/single-session/terminal-state-sessions-sent-once.js b/packages/node/test/manual/release-health/single-session/terminal-state-sessions-sent-once.js
index 1fe58a972569..b2692957aa70 100644
--- a/packages/node/test/manual/release-health/single-session/terminal-state-sessions-sent-once.js
+++ b/packages/node/test/manual/release-health/single-session/terminal-state-sessions-sent-once.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const {
   assertSessions,
   constructStrippedSessionObject,
diff --git a/packages/node/test/manual/release-health/single-session/uncaught-exception-crashed-session.js b/packages/node/test/manual/release-health/single-session/uncaught-exception-crashed-session.js
index 8007b7d0ea4c..eaf247aa080a 100644
--- a/packages/node/test/manual/release-health/single-session/uncaught-exception-crashed-session.js
+++ b/packages/node/test/manual/release-health/single-session/uncaught-exception-crashed-session.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const { assertSessions, constructStrippedSessionObject, BaseDummyTransport } = require('../test-utils');
 
 class DummyTransport extends BaseDummyTransport {
diff --git a/packages/node/test/manual/release-health/single-session/unhandled-rejection-crashed-session.js b/packages/node/test/manual/release-health/single-session/unhandled-rejection-crashed-session.js
index f24c557c878a..c5a1874024ba 100644
--- a/packages/node/test/manual/release-health/single-session/unhandled-rejection-crashed-session.js
+++ b/packages/node/test/manual/release-health/single-session/unhandled-rejection-crashed-session.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../../build/dist');
+const Sentry = require('../../../../build/cjs');
 const {
   assertSessions,
   constructStrippedSessionObject,
diff --git a/packages/node/test/manual/webpack-domain/index.js b/packages/node/test/manual/webpack-domain/index.js
index e0479e0fec78..521699a6349a 100644
--- a/packages/node/test/manual/webpack-domain/index.js
+++ b/packages/node/test/manual/webpack-domain/index.js
@@ -1,4 +1,4 @@
-const Sentry = require('../../../build/dist');
+const Sentry = require('../../../build/cjs');
 
 let remaining = 2;
 
diff --git a/packages/node/tsconfig.cjs.json b/packages/node/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/node/tsconfig.cjs.json
+++ b/packages/node/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
index cfa931d6ed56..a92935e9c793 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -63,7 +63,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/react/tsconfig.cjs.json b/packages/react/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/react/tsconfig.cjs.json
+++ b/packages/react/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/serverless/README.md b/packages/serverless/README.md
index 4b99dde9b424..e6f819f0cf66 100644
--- a/packages/serverless/README.md
+++ b/packages/serverless/README.md
@@ -60,7 +60,7 @@ Another and much simpler way to integrate Sentry to your AWS Lambda function is
 1. Choose Layers -> Add Layer.
 2. Specify an ARN: `arn:aws:lambda:us-west-1:TODO:layer:TODO:VERSION`.
 3. Go to Environment variables and add:
-   - `NODE_OPTIONS`: `-r @sentry/serverless/dist/awslambda-auto`.
+   - `NODE_OPTIONS`: `-r @sentry/serverless/cjs/awslambda-auto`.
    - `SENTRY_DSN`: `your dsn`.
    - `SENTRY_TRACES_SAMPLE_RATE`: a number between 0 and 1 representing the chance a transaction is sent to Sentry. For more information, see [docs](https://docs.sentry.io/platforms/node/guides/aws-lambda/configuration/options/#tracesSampleRate).
 
diff --git a/packages/serverless/package.json b/packages/serverless/package.json
index ae3d084758d6..39ce5479d2bb 100644
--- a/packages/serverless/package.json
+++ b/packages/serverless/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=10"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -54,7 +54,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build dist-awslambda-layer coverage",
+    "clean": "rimraf build dist-awslambda-layer coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/serverless/scripts/build-awslambda-layer.js b/packages/serverless/scripts/build-awslambda-layer.js
index 674dba133c73..377abfbdf425 100644
--- a/packages/serverless/scripts/build-awslambda-layer.js
+++ b/packages/serverless/scripts/build-awslambda-layer.js
@@ -69,7 +69,7 @@ async function collectPackages(cwd, packages = {}) {
 
 async function main() {
   const workDir = path.resolve(__dirname, '..'); // packages/serverless directory
-  const distRequirements = path.resolve(workDir, 'build', 'dist');
+  const distRequirements = path.resolve(workDir, 'build', 'cjs');
   if (!fs.existsSync(distRequirements)) {
     console.log(`The path ${distRequirements} must exist.`);
     return;
diff --git a/packages/serverless/tsconfig.cjs.json b/packages/serverless/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/serverless/tsconfig.cjs.json
+++ b/packages/serverless/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/tracing/package.json b/packages/tracing/package.json
index 2b75c54c3ff7..1d99f2a3b564 100644
--- a/packages/tracing/package.json
+++ b/packages/tracing/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/npm/dist/index.js",
+  "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
   "publishConfig": {
@@ -44,7 +44,7 @@
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf build coverage",
     "circularDepCheck": "madge --circular src/index.ts",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
@@ -80,7 +80,7 @@
     }
   },
   "sideEffects": [
-    "./npm/dist/index.js",
+    "./npm/cjs/index.js",
     "./npm/esm/index.js",
     "./src/index.ts"
   ]
diff --git a/packages/tracing/tsconfig.cjs.json b/packages/tracing/tsconfig.cjs.json
index 6782dae5e453..0fa3132e7510 100644
--- a/packages/tracing/tsconfig.cjs.json
+++ b/packages/tracing/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/npm/dist"
+    "outDir": "build/npm/cjs"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index 7cf3960cbca7..aaf97dc1b6d7 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -29,7 +29,7 @@
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
-    "clean": "rimraf dist esm build",
+    "clean": "rimraf build",
     "link:yarn": "yarn link",
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
diff --git a/packages/types/tsconfig.cjs.json b/packages/types/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/types/tsconfig.cjs.json
+++ b/packages/types/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
index ef9a398f99b2..39df57d9e1fa 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -38,7 +38,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage *.js *.js.map *.d.ts",
+    "clean": "rimraf build coverage *.js *.js.map *.d.ts",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/utils/test/types/index.js b/packages/utils/test/types/index.js
index a8f9e9360b68..7b6936691197 100644
--- a/packages/utils/test/types/index.js
+++ b/packages/utils/test/types/index.js
@@ -3,7 +3,7 @@ const path = require('path');
 
 const testStrings = ['/// <reference types="node" />'];
 
-const paths = [path.join('./build/dist'), path.join('./build/esm')];
+const paths = [path.join('./build/cjs'), path.join('./build/esm')];
 
 paths.forEach(dir => {
   if (!fs.existsSync(dir)) {
diff --git a/packages/utils/tsconfig.cjs.json b/packages/utils/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/utils/tsconfig.cjs.json
+++ b/packages/utils/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
index c36c8f688ab0..01610c1ad8ab 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/dist/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
   "publishConfig": {
@@ -46,7 +46,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts && npm pack ./build",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage",
+    "clean": "rimraf esm build coverage",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/vue/tsconfig.cjs.json b/packages/vue/tsconfig.cjs.json
index e3a918fc70af..c1edc81a9657 100644
--- a/packages/vue/tsconfig.cjs.json
+++ b/packages/vue/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/dist"
+    "outDir": "build/cjs"
   }
 }
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index 775e80b8ec43..d2eaa28340d9 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=8"
   },
-  "main": "build/npm/dist/index.js",
+  "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
   "publishConfig": {
@@ -45,7 +45,7 @@
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:npm": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
     "circularDepCheck": "madge --circular src/index.ts",
-    "clean": "rimraf dist esm build coverage *.js.map *.d.ts",
+    "clean": "rimraf build coverage *.js.map *.d.ts",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",
     "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"",
diff --git a/packages/wasm/tsconfig.cjs.json b/packages/wasm/tsconfig.cjs.json
index 6782dae5e453..0fa3132e7510 100644
--- a/packages/wasm/tsconfig.cjs.json
+++ b/packages/wasm/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "build/npm/dist"
+    "outDir": "build/npm/cjs"
   }
 }
diff --git a/tsconfig-templates/tsconfig.cjs.json b/tsconfig-templates/tsconfig.cjs.json
index abd80f77e1ff..4ec31d2ff68b 100644
--- a/tsconfig-templates/tsconfig.cjs.json
+++ b/tsconfig-templates/tsconfig.cjs.json
@@ -3,6 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "dist"
+    "outDir": "cjs"
   }
 }
diff --git a/typedoc.js b/typedoc.js
index f6e0a7e2a805..4b1843c33aad 100644
--- a/typedoc.js
+++ b/typedoc.js
@@ -6,7 +6,7 @@ module.exports = {
   exclude: [
     '**/test/**/*',
     '**/*.js',
-    '**/dist/**/*',
+    '**/cjs/**/*',
     '**/esm/**/*',
     '**/build/**/*',
     '**/packages/typescript/**/*',