diff --git a/packages/react-identicon/src/bundle.ts b/packages/react-identicon/src/bundle.ts
new file mode 100644
index 00000000..a7ccc299
--- /dev/null
+++ b/packages/react-identicon/src/bundle.ts
@@ -0,0 +1,7 @@
+// Copyright 2017-2021 @polkadot/react-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './icons';
+
+export { Identicon } from './Identicon';
+export { packageInfo } from './packageInfo';
diff --git a/packages/react-identicon/src/index.ts b/packages/react-identicon/src/index.ts
index f80d420d..c71d3cc9 100644
--- a/packages/react-identicon/src/index.ts
+++ b/packages/react-identicon/src/index.ts
@@ -3,11 +3,8 @@
 
 import './detectPackage';
 
-import { Identicon } from './Identicon';
+import { Identicon } from './bundle';
 
-export * from './icons';
-export { packageInfo } from './packageInfo';
-
-export { Identicon };
+export * from './bundle';
 
 export default Identicon;
diff --git a/packages/ui-keyring/src/bundle.ts b/packages/ui-keyring/src/bundle.ts
new file mode 100644
index 00000000..04fcdabf
--- /dev/null
+++ b/packages/ui-keyring/src/bundle.ts
@@ -0,0 +1,11 @@
+// Copyright 2017-2021 @polkadot/ui-keyring authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { Keyring } from './Keyring';
+
+export { Ledger } from '@polkadot/hw-ledger';
+export { packageInfo } from './packageInfo';
+
+const keyring = new Keyring();
+
+export { Keyring, keyring };
diff --git a/packages/ui-keyring/src/index.ts b/packages/ui-keyring/src/index.ts
index 93e320d2..3a3edcc6 100644
--- a/packages/ui-keyring/src/index.ts
+++ b/packages/ui-keyring/src/index.ts
@@ -3,13 +3,8 @@
 
 import './detectPackage';
 
-import { Keyring } from './Keyring';
+import { keyring } from './bundle';
 
-export { Ledger } from '@polkadot/hw-ledger';
-export { packageInfo } from './packageInfo';
-
-const keyring = new Keyring();
-
-export { Keyring, keyring };
+export * from './bundle';
 
 export default keyring;
diff --git a/packages/ui-settings/src/bundle.ts b/packages/ui-settings/src/bundle.ts
new file mode 100644
index 00000000..b35db130
--- /dev/null
+++ b/packages/ui-settings/src/bundle.ts
@@ -0,0 +1,9 @@
+// Copyright 2017-2021 @polkadot/ui-settings authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { Settings, settings } from './Settings';
+
+export { ENDPOINT_DEFAULT, ICON_DEFAULT, ICON_DEFAULT_HOST, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
+export { packageInfo } from './packageInfo';
+
+export { settings, Settings };
diff --git a/packages/ui-settings/src/index.ts b/packages/ui-settings/src/index.ts
index 28d3d5ee..f3996e1f 100644
--- a/packages/ui-settings/src/index.ts
+++ b/packages/ui-settings/src/index.ts
@@ -1,11 +1,8 @@
 // Copyright 2017-2021 @polkadot/ui-settings authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Settings, settings } from './Settings';
+import { settings } from './bundle';
 
-export { ENDPOINT_DEFAULT, ICON_DEFAULT, ICON_DEFAULT_HOST, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
-export { packageInfo } from './packageInfo';
-
-export { settings, Settings };
+export * from './bundle';
 
 export default settings;