diff --git a/libs/assets/package.json b/libs/assets/package.json
index cc5935833b..c46c2a4e95 100644
--- a/libs/assets/package.json
+++ b/libs/assets/package.json
@@ -4,8 +4,8 @@
   "description": "Assets used in Bitwarden clients",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "ui-foundation",
   "scripts": {
diff --git a/libs/assets/project.json b/libs/assets/project.json
index 97e32a24b3..7c1d39adc1 100644
--- a/libs/assets/project.json
+++ b/libs/assets/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/assets",
         "main": "libs/assets/src/index.ts",
         "tsConfig": "libs/assets/tsconfig.lib.json",
-        "assets": ["libs/assets/*.md"]
+        "assets": ["libs/assets/*.md"],
+        "rootDir": "libs/assets/src"
       }
     },
     "lint": {
diff --git a/libs/client-type/package.json b/libs/client-type/package.json
index 1db72603bf..9a18cf2818 100644
--- a/libs/client-type/package.json
+++ b/libs/client-type/package.json
@@ -4,8 +4,8 @@
   "description": "Exports the ClientType enum",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/client-type/project.json b/libs/client-type/project.json
index 8231e6634e..1e6268afdf 100644
--- a/libs/client-type/project.json
+++ b/libs/client-type/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/client-type",
         "main": "libs/client-type/src/index.ts",
         "tsConfig": "libs/client-type/tsconfig.lib.json",
-        "assets": ["libs/client-type/*.md"]
+        "assets": ["libs/client-type/*.md"],
+        "rootDir": "libs/client-type/src"
       }
     },
     "lint": {
diff --git a/libs/core-test-utils/package.json b/libs/core-test-utils/package.json
index acb2edc8eb..dd9e54e654 100644
--- a/libs/core-test-utils/package.json
+++ b/libs/core-test-utils/package.json
@@ -4,8 +4,8 @@
   "description": "Async test tools for state and clients",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/core-test-utils/project.json b/libs/core-test-utils/project.json
index a526209edc..78eea10708 100644
--- a/libs/core-test-utils/project.json
+++ b/libs/core-test-utils/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/core-test-utils",
         "main": "libs/core-test-utils/src/index.ts",
         "tsConfig": "libs/core-test-utils/tsconfig.lib.json",
-        "assets": ["libs/core-test-utils/*.md"]
+        "assets": ["libs/core-test-utils/*.md"],
+        "rootDir": "libs/core-test-utils/src"
       }
     },
     "lint": {
diff --git a/libs/guid/package.json b/libs/guid/package.json
index 9f7af0667a..4461add637 100644
--- a/libs/guid/package.json
+++ b/libs/guid/package.json
@@ -4,8 +4,8 @@
   "description": "Guid utilities extracted from common",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/guid/project.json b/libs/guid/project.json
index e5d510b2e2..4117c8d5b7 100644
--- a/libs/guid/project.json
+++ b/libs/guid/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/guid",
         "main": "libs/guid/src/index.ts",
         "tsConfig": "libs/guid/tsconfig.lib.json",
-        "assets": ["libs/guid/*.md"]
+        "assets": ["libs/guid/*.md"],
+        "rootDir": "libs/guid/src"
       }
     },
     "lint": {
diff --git a/libs/logging/package.json b/libs/logging/package.json
index b9cfbe35eb..2b1d529af3 100644
--- a/libs/logging/package.json
+++ b/libs/logging/package.json
@@ -4,8 +4,8 @@
   "description": "Logging primitives",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/logging/project.json b/libs/logging/project.json
index f2b5db313b..f47ade5854 100644
--- a/libs/logging/project.json
+++ b/libs/logging/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/logging",
         "main": "libs/logging/src/index.ts",
         "tsConfig": "libs/logging/tsconfig.lib.json",
-        "assets": ["libs/logging/*.md"]
+        "assets": ["libs/logging/*.md"],
+        "rootDir": "libs/logging/src"
       }
     },
     "lint": {
diff --git a/libs/messaging/package.json b/libs/messaging/package.json
index 01c8d7cb0e..7f83f0170c 100644
--- a/libs/messaging/package.json
+++ b/libs/messaging/package.json
@@ -4,8 +4,8 @@
   "description": "Services for sending and recieving messages from different contexts of the same application.",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/messaging/project.json b/libs/messaging/project.json
index f00e0bd2dc..224e9781f8 100644
--- a/libs/messaging/project.json
+++ b/libs/messaging/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/messaging",
         "main": "libs/messaging/src/index.ts",
         "tsConfig": "libs/messaging/tsconfig.lib.json",
-        "assets": ["libs/messaging/*.md"]
+        "assets": ["libs/messaging/*.md"],
+        "rootDir": "libs/messaging/src"
       }
     },
     "lint": {
diff --git a/libs/nx-plugin/package.json b/libs/nx-plugin/package.json
index 8a3bdebf9a..8d132bad96 100644
--- a/libs/nx-plugin/package.json
+++ b/libs/nx-plugin/package.json
@@ -4,8 +4,8 @@
   "description": "Custom Nx tools like generators and executors for Bitwarden projects",
   "private": true,
   "type": "commonjs",
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "Platform",
   "generators": "./generators.json"
diff --git a/libs/nx-plugin/project.json b/libs/nx-plugin/project.json
index 7456cf0326..1d4931e167 100644
--- a/libs/nx-plugin/project.json
+++ b/libs/nx-plugin/project.json
@@ -34,7 +34,8 @@
             "glob": "executors.json",
             "output": "."
           }
-        ]
+        ],
+        "rootDir": "libs/nx-plugin/src"
       }
     },
     "lint": {
diff --git a/libs/nx-plugin/src/generators/files/package.json__tmpl__ b/libs/nx-plugin/src/generators/files/package.json__tmpl__
index b4da6154ce..6b032fd670 100644
--- a/libs/nx-plugin/src/generators/files/package.json__tmpl__
+++ b/libs/nx-plugin/src/generators/files/package.json__tmpl__
@@ -4,8 +4,8 @@
   "description": "<%= description %>",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "<%= team %>"
 }
\ No newline at end of file
diff --git a/libs/nx-plugin/src/generators/files/project.json__tmpl__ b/libs/nx-plugin/src/generators/files/project.json__tmpl__
index 50671e5671..e9685af75e 100644
--- a/libs/nx-plugin/src/generators/files/project.json__tmpl__
+++ b/libs/nx-plugin/src/generators/files/project.json__tmpl__
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/<%= name %>",
         "main": "libs/<%= name %>/src/index.ts",
         "tsConfig": "libs/<%= name %>/tsconfig.lib.json",
-        "assets": ["libs/<%= name%>/*.md"]
+        "assets": ["libs/<%= name %>/*.md"],
+        "rootDir": "libs/<%= name %>/src"
       }
     },
     "lint": {
diff --git a/libs/serialization/package.json b/libs/serialization/package.json
index d582d28ac2..09d1e05e19 100644
--- a/libs/serialization/package.json
+++ b/libs/serialization/package.json
@@ -4,8 +4,8 @@
   "description": "Core serialization utilities",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/serialization/project.json b/libs/serialization/project.json
index 3fe8968ea4..9f8a75cd6e 100644
--- a/libs/serialization/project.json
+++ b/libs/serialization/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/serialization",
         "main": "libs/serialization/src/index.ts",
         "tsConfig": "libs/serialization/tsconfig.lib.json",
-        "assets": ["libs/serialization/*.md"]
+        "assets": ["libs/serialization/*.md"],
+        "rootDir": "libs/serialization/src"
       }
     },
     "lint": {
diff --git a/libs/state-internal/package.json b/libs/state-internal/package.json
index 2a62522059..b8634a672f 100644
--- a/libs/state-internal/package.json
+++ b/libs/state-internal/package.json
@@ -4,8 +4,8 @@
   "description": "The internal parts of @bitwarden/state that should not be used by other teams.",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/state-internal/project.json b/libs/state-internal/project.json
index fde95837ff..cad7b6529f 100644
--- a/libs/state-internal/project.json
+++ b/libs/state-internal/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/state-internal",
         "main": "libs/state-internal/src/index.ts",
         "tsConfig": "libs/state-internal/tsconfig.lib.json",
-        "assets": ["libs/state-internal/*.md"]
+        "assets": ["libs/state-internal/*.md"],
+        "rootDir": "libs/state-internal/src"
       }
     },
     "lint": {
diff --git a/libs/state-test-utils/package.json b/libs/state-test-utils/package.json
index 9fd9aa64e5..f4c2fb45a1 100644
--- a/libs/state-test-utils/package.json
+++ b/libs/state-test-utils/package.json
@@ -4,8 +4,8 @@
   "description": "Test utilities and fakes for state management",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/state-test-utils/project.json b/libs/state-test-utils/project.json
index ef524e5347..39a50cc205 100644
--- a/libs/state-test-utils/project.json
+++ b/libs/state-test-utils/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/state-test-utils",
         "main": "libs/state-test-utils/src/index.ts",
         "tsConfig": "libs/state-test-utils/tsconfig.lib.json",
-        "assets": ["libs/state-test-utils/*.md"]
+        "assets": ["libs/state-test-utils/*.md"],
+        "rootDir": "libs/state-test-utils/src"
       }
     },
     "lint": {
diff --git a/libs/state/package.json b/libs/state/package.json
index 2c25647e4e..62805f6a08 100644
--- a/libs/state/package.json
+++ b/libs/state/package.json
@@ -4,8 +4,8 @@
   "description": "Centralized application state management",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/state/project.json b/libs/state/project.json
index 85313ddf14..44da4e912d 100644
--- a/libs/state/project.json
+++ b/libs/state/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/state",
         "main": "libs/state/src/index.ts",
         "tsConfig": "libs/state/tsconfig.lib.json",
-        "assets": ["libs/state/*.md"]
+        "assets": ["libs/state/*.md"],
+        "rootDir": "libs/state/src"
       }
     },
     "lint": {
diff --git a/libs/storage-core/package.json b/libs/storage-core/package.json
index 7b18e4dcb5..4f566ef205 100644
--- a/libs/storage-core/package.json
+++ b/libs/storage-core/package.json
@@ -4,8 +4,8 @@
   "description": "Abstractions over storage APIs",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/storage-core/project.json b/libs/storage-core/project.json
index 9b4a3e00fc..4f30b2469d 100644
--- a/libs/storage-core/project.json
+++ b/libs/storage-core/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/storage-core",
         "main": "libs/storage-core/src/index.ts",
         "tsConfig": "libs/storage-core/tsconfig.lib.json",
-        "assets": ["libs/storage-core/*.md"]
+        "assets": ["libs/storage-core/*.md"],
+        "rootDir": "libs/storage-core/src"
       }
     },
     "lint": {
diff --git a/libs/storage-test-utils/package.json b/libs/storage-test-utils/package.json
index 22d83f2334..6fcca07803 100644
--- a/libs/storage-test-utils/package.json
+++ b/libs/storage-test-utils/package.json
@@ -4,8 +4,8 @@
   "description": "Test tools for the storage library",
   "private": true,
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "platform"
 }
diff --git a/libs/storage-test-utils/project.json b/libs/storage-test-utils/project.json
index f1aad63c9e..f5e28fa57f 100644
--- a/libs/storage-test-utils/project.json
+++ b/libs/storage-test-utils/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/storage-test-utils",
         "main": "libs/storage-test-utils/src/index.ts",
         "tsConfig": "libs/storage-test-utils/tsconfig.lib.json",
-        "assets": ["libs/storage-test-utils/*.md"]
+        "assets": ["libs/storage-test-utils/*.md"],
+        "rootDir": "libs/storage-test-utils/src"
       }
     },
     "lint": {
diff --git a/libs/user-core/package.json b/libs/user-core/package.json
index 2251d2ceac..b32afd6d8f 100644
--- a/libs/user-core/package.json
+++ b/libs/user-core/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "description": "The very basic concept that constitutes a user, this needs to be very low level to facilitate Platform keeping their own code low level.",
   "type": "commonjs",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "license": "GPL-3.0",
   "author": "auth"
 }
diff --git a/libs/user-core/project.json b/libs/user-core/project.json
index 60d5873208..d2c617687d 100644
--- a/libs/user-core/project.json
+++ b/libs/user-core/project.json
@@ -12,7 +12,8 @@
         "outputPath": "dist/libs/user-core",
         "main": "libs/user-core/src/index.ts",
         "tsConfig": "libs/user-core/tsconfig.lib.json",
-        "assets": ["libs/user-core/*.md"]
+        "assets": ["libs/user-core/*.md"],
+        "rootDir": "libs/user-core/src"
       }
     },
     "test": {