diff --git a/packages/core/package.json b/packages/core/package.json
index 180633a97..3904f3670 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,7 +2,8 @@
   "name": "@draftbit/core",
   "version": "54.0.7",
   "description": "Core (non-native) Components",
-  "main": "lib/commonjs/index.js",
+  "main": "./src/index.tsx",
+  "react-native": "./src/index.tsx",
   "types": "lib/typescript/src/index.d.ts",
   "files": [
     "src",
@@ -14,8 +15,7 @@
   "scripts": {
     "clean": "rimraf lib",
     "clean:modules": "rimraf node_modules",
-    "build:commonjs": "../../node_modules/.bin/babel src --out-dir lib/commonjs --extensions .tsx,.ts,.js,.jsx",
-    "build": "yarn clean && yarn build:commonjs  && yarn tsc",
+    "build": "yarn clean && yarn tsc",
     "test": "jest",
     "test:coverage": "jest --coverage"
   },
diff --git a/packages/maps/package.json b/packages/maps/package.json
index 0b5b0fde0..2ef5e2eba 100644
--- a/packages/maps/package.json
+++ b/packages/maps/package.json
@@ -2,7 +2,8 @@
   "name": "@draftbit/maps",
   "version": "54.0.7",
   "description": "Map Components",
-  "main": "lib/commonjs/index.js",
+  "main": "./src/index.tsx",
+  "react-native": "./src/index.tsx",
   "types": "lib/typescript/src/index.d.ts",
   "files": [
     "src",
@@ -14,8 +15,7 @@
   "scripts": {
     "clean": "rimraf lib",
     "clean:modules": "rimraf node_modules",
-    "build:commonjs": "../../node_modules/.bin/babel src --out-dir lib/commonjs --extensions .tsx,.ts,.js,.jsx",
-    "build": "yarn clean && yarn build:commonjs  && yarn tsc",
+    "build": "yarn clean && yarn tsc",
     "test": "jest",
     "test:coverage": "jest --coverage"
   },
diff --git a/packages/native/package.json b/packages/native/package.json
index 0110fbeaa..29f50edde 100644
--- a/packages/native/package.json
+++ b/packages/native/package.json
@@ -2,7 +2,8 @@
   "name": "@draftbit/native",
   "version": "54.0.7",
   "description": "Draftbit UI Components that Depend on Native Components",
-  "main": "lib/commonjs/index.js",
+  "main": "./src/index.tsx",
+  "react-native": "./src/index.tsx",
   "types": "lib/typescript/src/index.d.ts",
   "files": [
     "src",
@@ -14,8 +15,7 @@
   "scripts": {
     "clean": "rimraf lib",
     "clean:modules": "rimraf node_modules",
-    "build:commonjs": "../../node_modules/.bin/babel src --out-dir lib/commonjs --extensions .tsx,.ts,.js,.jsx",
-    "build": "yarn clean && yarn build:commonjs  && yarn tsc",
+    "build": "yarn clean && yarn tsc",
     "test": "jest",
     "test:coverage": "jest --coverage"
   },
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 214465b80..7699755ed 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -2,7 +2,8 @@
   "name": "@draftbit/theme",
   "version": "54.0.7",
   "description": "Draftbit's themeing system",
-  "main": "lib/commonjs/index.js",
+  "main": "./src/index.ts",
+  "react-native": "./src/index.ts",
   "types": "lib/typescript/src/index.d.ts",
   "files": [
     "src",
@@ -14,8 +15,7 @@
   "scripts": {
     "clean": "rimraf lib",
     "clean:modules": "rimraf node_modules",
-    "build:commonjs": "../../node_modules/.bin/babel src --out-dir lib/commonjs --extensions .tsx,.ts,.js,.jsx",
-    "build": "yarn clean && yarn build:commonjs  && yarn tsc",
+    "build": "yarn clean && yarn tsc",
     "test": "jest",
     "test:coverage": "jest --coverage"
   },
diff --git a/packages/ui/package.json b/packages/ui/package.json
index c555796e2..3e0960285 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -2,7 +2,8 @@
   "name": "@draftbit/ui",
   "version": "54.0.7",
   "description": "Draftbit UI Library",
-  "main": "lib/commonjs/index.js",
+  "main": "./src/index.tsx",
+  "react-native": "./src/index.tsx",
   "types": "lib/typescript/src/index.d.ts",
   "files": [
     "src",
@@ -18,8 +19,7 @@
   "scripts": {
     "clean": "rimraf lib",
     "clean:modules": "rimraf node_modules",
-    "build:commonjs": "../../node_modules/.bin/babel src --out-dir lib/commonjs --extensions .tsx,.ts,.js,.jsx",
-    "build": "yarn clean && yarn build:commonjs  && yarn tsc",
+    "build": "yarn clean && yarn tsc",
     "test": "jest",
     "test:coverage": "jest --coverage"
   },