diff --git a/src/browser-index.ts b/src/browser-index.ts
index 9918555488..a1ae062378 100644
--- a/src/browser-index.ts
+++ b/src/browser-index.ts
@@ -1,37 +1,2 @@
-'use strict';
-
-import * as providers from './providers';
-import * as utils from './utils';
-import * as keyStores from './key_stores/browser-index';
-import * as transactions from './transaction';
-
-import { Account } from './account';
-import * as accountCreator from './account_creator';
-import { Connection } from './connection';
-import { Signer, InMemorySigner } from './signer';
-import { Contract } from './contract';
-import { KeyPair } from './utils/key_pair';
-import { connect } from './near';
-
-// TODO: Deprecate and remove WalletAccount
-import { WalletAccount, WalletConnection } from './wallet-account';
-
-export {
-    accountCreator,
-    keyStores,
-    providers,
-    utils,
-    transactions,
-
-    Account,
-    Connection,
-    Contract,
-    InMemorySigner,
-    Signer,
-    KeyPair,
-
-    connect,
-
-    WalletAccount,
-    WalletConnection
-};
+export * as keyStores from './key_stores/browser-index';
+export * from './common-index';
\ No newline at end of file
diff --git a/src/common-index.ts b/src/common-index.ts
new file mode 100644
index 0000000000..3cdf1ee283
--- /dev/null
+++ b/src/common-index.ts
@@ -0,0 +1,36 @@
+import * as providers from './providers';
+import * as utils from './utils';
+import * as transactions from './transaction';
+import * as validators from './validators';
+
+import { Account } from './account';
+import * as accountCreator from './account_creator';
+import { Connection } from './connection';
+import { Signer, InMemorySigner } from './signer';
+import { Contract } from './contract';
+import { KeyPair } from './utils/key_pair';
+import { connect, Near } from './near';
+
+// TODO: Deprecate and remove WalletAccount
+import { WalletAccount, WalletConnection } from './wallet-account';
+
+export {
+    accountCreator,
+    providers,
+    utils,
+    transactions,
+    validators,
+
+    Account,
+    Connection,
+    Contract,
+    InMemorySigner,
+    Signer,
+    KeyPair,
+
+    connect,
+    Near,
+
+    WalletAccount,
+    WalletConnection
+};
diff --git a/src/index.ts b/src/index.ts
index c681f16516..5f4b7f306b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,38 +1,2 @@
-import * as providers from './providers';
-import * as utils from './utils';
-import * as keyStores from './key_stores';
-import * as transactions from './transaction';
-import * as validators from './validators';
-
-import { Account } from './account';
-import * as accountCreator from './account_creator';
-import { Connection } from './connection';
-import { Signer, InMemorySigner } from './signer';
-import { Contract } from './contract';
-import { KeyPair } from './utils/key_pair';
-import { connect, Near } from './near';
-
-// TODO: Deprecate and remove WalletAccount
-import { WalletAccount, WalletConnection } from './wallet-account';
-
-export {
-    accountCreator,
-    keyStores,
-    providers,
-    utils,
-    transactions,
-    validators,
-
-    Account,
-    Connection,
-    Contract,
-    InMemorySigner,
-    Signer,
-    KeyPair,
-
-    connect,
-    Near,
-
-    WalletAccount,
-    WalletConnection
-};
+export * as keyStores from './key_stores/index';
+export * from './common-index';
\ No newline at end of file