diff --git a/.gitignore b/.gitignore
index 0bf5325b3..12606e682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,9 @@ tmp/
 .env.development.local
 .env.test.local
 .env.production.local
+.idea
 .npmrc
+.vscode
 .yarn/*
 !.yarn/releases
 !.yarn/plugins
@@ -24,5 +26,4 @@ yarn-debug.log*
 yarn-error.log*
 store.db
 store.db.compacted
-.idea
-.vscode
+tsconfig.*buildinfo
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 000000000..ddc090a5b
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,35 @@
+{
+  "extends": "@polkadot/dev/config/tsconfig.json",
+	"compilerOptions": {
+		"composite": true,
+		"paths": {
+      "@polkadot/hw-ledger": [ "ledger/src" ],
+      "@polkadot/hw-ledger/*": [ "ledger/src/*" ],
+      "@polkadot/hw-ledger-transports": [ "hw-ledger-transports/src/browser" ],
+      "@polkadot/hw-ledger-transports/*": [ "hw-ledger-transports/src/browser" ],
+      "@polkadot/keyring": [ "keyring/src" ],
+      "@polkadot/keyring/*": [ "keyring/src/*" ],
+      "@polkadot/networks": [ "networks/src" ],
+      "@polkadot/networks/*": [ "networks/src/*" ],
+      "@polkadot/util-crypto": [ "util-crypto/src" ],
+      "@polkadot/util-crypto/*": [ "util-crypto/src/*" ],
+      "@polkadot/util": [ "util/src" ],
+      "@polkadot/util/*": [ "util/src/*" ],
+      "@polkadot/x-bundle/*": [ "x-bundle/src/*" ],
+      "@polkadot/x-bigint": [ "x-bigint/src" ],
+      "@polkadot/x-fetch": [ "x-fetch/src/browser" ],
+      "@polkadot/x-global": [ "x-global/src" ],
+      "@polkadot/x-noble-hashes/*": [ "x-noble-hashes/src/*" ],
+      "@polkadot/x-noble-secp256k1": [ "x-noble-secp256k1/src" ],
+      "@polkadot/x-randomvalues": [ "x-randomvalues/src/browser" ],
+      "@polkadot/x-textdecoder": [ "x-textdecoder/src/browser" ],
+      "@polkadot/x-textencoder": [ "x-textencoder/src/browser" ],
+      "@polkadot/x-ws": [ "x-ws/src/browser" ]
+    },
+    "skipLibCheck": true,
+    "typeRoots": [
+      "./node_modules/@polkadot/ts",
+      "./node_modules/@types"
+    ]
+	}
+ }
diff --git a/tsconfig.json b/tsconfig.json
index 03a04c812..f8dbc9fff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,39 +1,10 @@
 {
-  "extends": "@polkadot/dev/config/tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "exclude": [
     "build/**/*",
     "**/build/**/*"
   ],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/hw-ledger": [ "packages/ledger/src" ],
-      "@polkadot/hw-ledger/*": [ "packages/ledger/src/*" ],
-      "@polkadot/hw-ledger-transports": [ "packages/hw-ledger-transports/src/browser" ],
-      "@polkadot/hw-ledger-transports/*": [ "packages/hw-ledger-transports/src/browser" ],
-      "@polkadot/keyring": [ "packages/keyring/src" ],
-      "@polkadot/keyring/*": [ "packages/keyring/src/*" ],
-      "@polkadot/networks": [ "packages/networks/src" ],
-      "@polkadot/networks/*": [ "packages/networks/src/*" ],
-      "@polkadot/util-crypto": [ "packages/util-crypto/src" ],
-      "@polkadot/util-crypto/*": [ "packages/util-crypto/src/*" ],
-      "@polkadot/util": [ "packages/util/src" ],
-      "@polkadot/util/*": [ "packages/util/src/*" ],
-      "@polkadot/x-bundle/*": [ "packages/x-bundle/src/*" ],
-      "@polkadot/x-bigint": [ "packages/x-bigint/src" ],
-      "@polkadot/x-fetch": [ "packages/x-fetch/src/browser" ],
-      "@polkadot/x-global": [ "packages/x-global/src" ],
-      "@polkadot/x-noble-hashes/*": [ "packages/x-noble-hashes/src/*" ],
-      "@polkadot/x-noble-secp256k1": [ "packages/x-noble-secp256k1/src" ],
-      "@polkadot/x-randomvalues": [ "packages/x-randomvalues/src/browser" ],
-      "@polkadot/x-textdecoder": [ "packages/x-textdecoder/src/browser" ],
-      "@polkadot/x-textencoder": [ "packages/x-textencoder/src/browser" ],
-      "@polkadot/x-ws": [ "packages/x-ws/src/browser" ]
-    },
-    "skipLibCheck": true,
-    "typeRoots": [
-      "./node_modules/@polkadot/ts",
-      "./node_modules/@types"
-    ]
+    "baseUrl": "./packages"
   }
 }