diff --git a/.gitignore b/.gitignore
index 802f26f1..c05683c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,6 @@ tmp/
 cc-test-reporter
 package-lock.json
 npm-debug.log*
+tsconfig.*buildinfo
 yarn-debug.log*
 yarn-error.log*
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000..7444d381
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,29 @@
+{
+  "extends": "@polkadot/dev/config/tsconfig.json",
+	"compilerOptions": {
+		"composite": true,
+		"paths": {
+      "@polkadot/react-identicon": [ "react-identicon/src" ],
+      "@polkadot/react-identicon/*": [ "react-identicon/src/*" ],
+      "@polkadot/react-qr": [ "react-qr/src" ],
+      "@polkadot/react-qr/*": [ "react-qr/src/*" ],
+      "@polkadot/reactnative-identicon": [ "reactnative-identicon/src" ],
+      "@polkadot/reactnative-identicon/*": [ "reactnative-identicon/src/*" ],
+      "@polkadot/ui-assets": [ "ui-assets/src" ],
+      "@polkadot/ui-assets/*": [ "ui-assets/src/*" ],
+      "@polkadot/ui-keyring": [ "ui-keyring/src" ],
+      "@polkadot/ui-keyring/*": [ "ui-keyring/src/*" ],
+      "@polkadot/ui-settings": [ "ui-settings/src" ],
+      "@polkadot/ui-settings/*": [ "ui-settings/src/*" ],
+      "@polkadot/ui-shared": [ "ui-shared/src" ],
+      "@polkadot/ui-shared/*": [ "ui-shared/src/*" ],
+      "@polkadot/vue-identicon": [ "vue-identicon/src" ],
+      "@polkadot/vue-identicon/*": [ "vue-identicon/src/*" ]
+    },
+    "skipLibCheck": true,
+    "typeRoots": [
+      "./node_modules/@polkadot/ts",
+      "./node_modules/@types"
+    ]
+	}
+ }
diff --git a/tsconfig.json b/tsconfig.json
index 8d0c65cb..f8dbc9ff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,33 +1,10 @@
 {
-  "extends": "@polkadot/dev/config/tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "exclude": [
     "build/**/*",
     "**/build/**/*"
   ],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/react-identicon": [ "packages/react-identicon/src" ],
-      "@polkadot/react-identicon/*": [ "packages/react-identicon/src/*" ],
-      "@polkadot/react-qr": [ "packages/react-qr/src" ],
-      "@polkadot/react-qr/*": [ "packages/react-qr/src/*" ],
-      "@polkadot/reactnative-identicon": [ "packages/reactnative-identicon/src" ],
-      "@polkadot/reactnative-identicon/*": [ "packages/reactnative-identicon/src/*" ],
-      "@polkadot/ui-assets": [ "packages/ui-assets/src" ],
-      "@polkadot/ui-assets/*": [ "packages/ui-assets/src/*" ],
-      "@polkadot/ui-keyring": [ "packages/ui-keyring/src" ],
-      "@polkadot/ui-keyring/*": [ "packages/ui-keyring/src/*" ],
-      "@polkadot/ui-settings": [ "packages/ui-settings/src" ],
-      "@polkadot/ui-settings/*": [ "packages/ui-settings/src/*" ],
-      "@polkadot/ui-shared": [ "packages/ui-shared/src" ],
-      "@polkadot/ui-shared/*": [ "packages/ui-shared/src/*" ],
-      "@polkadot/vue-identicon": [ "packages/vue-identicon/src" ],
-      "@polkadot/vue-identicon/*": [ "packages/vue-identicon/src/*" ]
-    },
-    "skipLibCheck": true,
-    "typeRoots": [
-      "./node_modules/@polkadot/ts",
-      "./node_modules/@types"
-    ]
+    "baseUrl": "./packages"
   }
 }