diff --git a/package.json b/package.json
index 21edc18d..3fd64629 100644
--- a/package.json
+++ b/package.json
@@ -10,13 +10,13 @@
     "test"
   ],
   "scripts": {
-    "build:cjs": "lerna exec 'tsc --module CommonJS --outDir lib/cjs' --no-private",
-    "build:esm": "lerna exec 'tsc --module NodeNext --outDir lib/esm --declaration true' --no-private",
+    "build:cjs": "lerna exec 'tsc --module CommonJS --outDir lib && yarn rename-to-cjs' --no-private",
+    "build:esm": "lerna exec 'tsc --module NodeNext --outDir lib/esm' --no-private",
+    "compile": "yarn build:cjs && yarn build:esm",
     "prepublishOnly": "yarn reset && yarn compile",
-    "reset": "lerna exec 'rm -rf lib' && yarn delete-js",
+    "reset": "lerna exec 'rm -rf lib'",
     "test": "yarn workspace @rc-ex/test run vitest",
-    "upgrade-all": "yarn-upgrade-all -W && yarn workspaces run yarn-upgrade-all && yarn install",
-    "delete-js": "find . -type f \\( -name \"*.js\" -o -name \"*.d.ts\" -o -name \"*.js.map\" \\) -not -path \"*/node_modules/*\" -exec rm -f {} +"
+    "upgrade-all": "yarn-upgrade-all -W && yarn workspaces run yarn-upgrade-all && yarn install"
   },
   "devDependencies": {
     "@types/node": "^22.10.10",
diff --git a/packages/core/package.json b/packages/core/package.json
index fe19371e..11b6da86 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -30,6 +30,7 @@
     "ts-node": "^10.9.2"
   },
   "scripts": {
-    "generate": "ts-node -r dotenv-override-true/config code-generator.ts"
+    "generate": "ts-node -r dotenv-override-true/config code-generator.ts",
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/authorize-uri/package.json b/packages/extensions/authorize-uri/package.json
index 86a84d46..39735c52 100644
--- a/packages/extensions/authorize-uri/package.json
+++ b/packages/extensions/authorize-uri/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -25,5 +25,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/auto-refresh/package.json b/packages/extensions/auto-refresh/package.json
index d7080672..2ec28ed4 100644
--- a/packages/extensions/auto-refresh/package.json
+++ b/packages/extensions/auto-refresh/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -21,5 +21,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/debug/package.json b/packages/extensions/debug/package.json
index e060927c..ea5a8a24 100644
--- a/packages/extensions/debug/package.json
+++ b/packages/extensions/debug/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -21,5 +21,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/events/package.json b/packages/extensions/events/package.json
index a37339e8..e2303ad3 100644
--- a/packages/extensions/events/package.json
+++ b/packages/extensions/events/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -21,5 +21,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/rate-limit/package.json b/packages/extensions/rate-limit/package.json
index 7dccb40a..fcf19f10 100644
--- a/packages/extensions/rate-limit/package.json
+++ b/packages/extensions/rate-limit/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -24,5 +24,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/rcsdk/package.json b/packages/extensions/rcsdk/package.json
index 6b120d21..6172917c 100644
--- a/packages/extensions/rcsdk/package.json
+++ b/packages/extensions/rcsdk/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -22,5 +22,8 @@
   "devDependencies": {
     "@rc-ex/core": "file:../../core",
     "@ringcentral/sdk": "^5.0.3"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/retry/package.json b/packages/extensions/retry/package.json
index 197070b4..8d33870d 100644
--- a/packages/extensions/retry/package.json
+++ b/packages/extensions/retry/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -24,5 +24,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/packages/extensions/ws/package.json b/packages/extensions/ws/package.json
index a1d72d00..440852e5 100644
--- a/packages/extensions/ws/package.json
+++ b/packages/extensions/ws/package.json
@@ -7,7 +7,7 @@
   "license": "MIT",
   "type": "module",
   "types": "./lib/esm/index.d.ts",
-  "main": "./lib/cjs/index.cjs",
+  "main": "./lib/index.cjs",
   "module": "./lib/esm/index.js",
   "repository": {
     "type": "git",
@@ -29,5 +29,8 @@
   },
   "devDependencies": {
     "@rc-ex/core": "file:../../core"
+  },
+  "scripts": {
+    "rename-to-cjs": "find lib -type f -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.cjs\"' {} \\;"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index b44e40e1..fa949a45 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "sourceMap": true
+    "sourceMap": true,
+    "declaration": true
   }
 }