diff --git a/packages/shared/common/package.json b/packages/shared/common/package.json
index 7fe179a52..e1bfe9b94 100644
--- a/packages/shared/common/package.json
+++ b/packages/shared/common/package.json
@@ -2,8 +2,8 @@
   "name": "@launchdarkly/js-sdk-common",
   "version": "2.10.0",
   "type": "module",
-  "main": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/esm/index.mjs",
+  "types": "./dist/esm/index.d.ts",
   "homepage": "https://github.com/launchdarkly/js-core/tree/main/packages/shared/common",
   "repository": {
     "type": "git",
@@ -19,13 +19,15 @@
     "client"
   ],
   "exports": {
-    "types": "./dist/index.d.ts",
-    "require": "./dist/index.cjs",
-    "import": "./dist/index.mjs"
+    "require": { "types": "./dist/cjs/index.d.ts", "default": "./dist/cjs/index.cjs"},
+    "import": { "types": "./dist/esm/index.d.ts", "default": "./dist/esm/index.mjs"}
   },
   "scripts": {
     "test": "npx jest --ci",
-    "build": "npx tsc --noEmit && rollup -c rollup.config.js",
+    "make-cjs-package-json": "echo '{\"type\":\"commonjs\"}' > dist/cjs/package.json",
+    "make-esm-package-json": "echo '{\"type\":\"module\"}' > dist/esm/package.json",
+    "make-package-jsons": "npm run make-cjs-package-json && npm run make-esm-package-json",
+    "build": "npx tsc --noEmit && rollup -c rollup.config.js && npm run make-package-jsons",
     "clean": "rimraf dist",
     "lint": "npx eslint . --ext .ts",
     "lint:fix": "yarn run lint --fix",
diff --git a/packages/shared/common/rollup.config.js b/packages/shared/common/rollup.config.js
index c94bd7d48..5514151c2 100644
--- a/packages/shared/common/rollup.config.js
+++ b/packages/shared/common/rollup.config.js
@@ -20,7 +20,7 @@ const getSharedConfig = (format, file) => ({
 
 export default [
   {
-    ...getSharedConfig('es', 'dist/index.mjs'),
+    ...getSharedConfig('es', 'dist/esm/index.mjs'),
     plugins: [
       typescript({
         module: 'esnext',
@@ -35,7 +35,7 @@ export default [
     ],
   },
   {
-    ...getSharedConfig('cjs', 'dist/index.cjs'),
-    plugins: [typescript({ tsconfig: './tsconfig.json' }), common(), json()],
+    ...getSharedConfig('cjs', 'dist/cjs/index.cjs'),
+    plugins: [typescript({ tsconfig: './tsconfig.json', outputToFilesystem: true, }), common(), json()],
   },
 ];
diff --git a/packages/shared/common/tsconfig.json b/packages/shared/common/tsconfig.json
index 85640d32c..b5d080223 100644
--- a/packages/shared/common/tsconfig.json
+++ b/packages/shared/common/tsconfig.json
@@ -13,8 +13,7 @@
     "sourceMap": true,
     "declaration": true,
     "declarationMap": true, // enables importers to jump to source
-    "stripInternal": true,
-    "composite": true
+    "stripInternal": true
   },
   "include": ["src"],
   "exclude": ["**/*.test.ts", "dist", "node_modules", "__tests__"]
diff --git a/packages/shared/sdk-client/src/DataManager.ts b/packages/shared/sdk-client/src/DataManager.ts
index 14b9e866a..d3b33de1b 100644
--- a/packages/shared/sdk-client/src/DataManager.ts
+++ b/packages/shared/sdk-client/src/DataManager.ts
@@ -9,7 +9,6 @@ import {
   ProcessStreamResponse,
   subsystem,
 } from '@launchdarkly/js-sdk-common';
-import { LDStreamProcessor } from '@launchdarkly/js-sdk-common/dist/api/subsystem';
 
 import { LDIdentifyOptions } from './api/LDIdentifyOptions';
 import { Configuration } from './configuration/Configuration';
@@ -203,9 +202,9 @@ export abstract class BaseDataManager implements DataManager {
   }
 
   private _decorateProcessorWithStatusReporting(
-    processor: LDStreamProcessor,
+    processor: subsystem.LDStreamProcessor,
     statusManager: DataSourceStatusManager,
-  ): LDStreamProcessor {
+  ): subsystem.LDStreamProcessor {
     return {
       start: () => {
         // update status before starting processor to ensure potential errors are reported after initializing