diff --git a/src/core/index.ts b/src/core/index.ts
index 9e402555..237adc21 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -6,17 +6,6 @@
 
 require("./globals");
 
-export * from "../abi";
-export * from "../accountManagement";
-export * from "../accounts";
-export * from "../delegation";
-export * from "../entrypoints";
-export * from "../networkProviders";
-export * from "../relayed";
-export * from "../tokenManagement";
-export * from "../transactionsOutcomeParsers";
-export * from "../transfers";
-export * from "../wallet";
 export * from "./address";
 export * from "./asyncTimer";
 export * from "./config";
diff --git a/src/delegation/delegationTransactionsFactory.spec.ts b/src/delegation/delegationTransactionsFactory.spec.ts
index 47f32598..2b35d300 100644
--- a/src/delegation/delegationTransactionsFactory.spec.ts
+++ b/src/delegation/delegationTransactionsFactory.spec.ts
@@ -1,6 +1,7 @@
 import { assert } from "chai";
-import { Address, TransactionsFactoryConfig, ValidatorPublicKey } from "../core";
+import { Address, TransactionsFactoryConfig } from "../core";
 import { DELEGATION_MANAGER_SC_ADDRESS_HEX } from "../core/constants";
+import { ValidatorPublicKey } from "../wallet";
 import { DelegationTransactionsFactory } from "./delegationTransactionsFactory";
 
 describe("test delegation transactions factory", function () {
diff --git a/src/delegation/delegationTransactionsOutcomeParser.spec.ts b/src/delegation/delegationTransactionsOutcomeParser.spec.ts
index c804a295..99067b28 100644
--- a/src/delegation/delegationTransactionsOutcomeParser.spec.ts
+++ b/src/delegation/delegationTransactionsOutcomeParser.spec.ts
@@ -1,6 +1,7 @@
 import { assert } from "chai";
-import { Address, SmartContractResult, TransactionEvent, TransactionLogs, TransactionOnNetwork } from "../core";
+import { Address, TransactionEvent, TransactionLogs, TransactionOnNetwork } from "../core";
 import { b64TopicsToBytes } from "../testutils";
+import { SmartContractResult } from "../transactionsOutcomeParsers";
 import { DelegationTransactionsOutcomeParser } from "./delegationTransactionsOutcomeParser";
 
 describe("test delegation transactions outcome parser", () => {
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 00000000..2ed005e1
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,20 @@
+/**
+ * A library for interacting with the MultiversX blockchain (in general) and Smart Contracts (in particular).
+ *
+ * @packageDocumentation
+ */
+
+require("./globals");
+
+export * from "./abi";
+export * from "./accountManagement";
+export * from "./accounts";
+export * from "./core";
+export * from "./delegation";
+export * from "./entrypoints";
+export * from "./networkProviders";
+export * from "./relayed";
+export * from "./tokenManagement";
+export * from "./transactionsOutcomeParsers";
+export * from "./transfers";
+export * from "./wallet";
diff --git a/src/tokenManagement/tokenManagementTransactionsOutcomeParser.spec.ts b/src/tokenManagement/tokenManagementTransactionsOutcomeParser.spec.ts
index b5d68676..1c68fecc 100644
--- a/src/tokenManagement/tokenManagementTransactionsOutcomeParser.spec.ts
+++ b/src/tokenManagement/tokenManagementTransactionsOutcomeParser.spec.ts
@@ -1,13 +1,7 @@
 import { assert } from "chai";
-import {
-    Address,
-    ErrParseTransactionOutcome,
-    SmartContractResult,
-    TransactionEvent,
-    TransactionLogs,
-    TransactionOnNetwork,
-} from "../core";
+import { Address, ErrParseTransactionOutcome, TransactionEvent, TransactionLogs, TransactionOnNetwork } from "../core";
 import { b64TopicsToBytes } from "../testutils";
+import { SmartContractResult } from "../transactionsOutcomeParsers";
 import { TokenManagementTransactionsOutcomeParser } from "./tokenManagementTransactionsOutcomeParser";
 
 describe("test token management transactions outcome parser", () => {
diff --git a/src/wallet/users.spec.ts b/src/wallet/users.spec.ts
index 07cfd840..c4578b03 100644
--- a/src/wallet/users.spec.ts
+++ b/src/wallet/users.spec.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 import path from "path";
-import { Address, ErrBadMnemonicEntropy, ErrInvariantFailed, Message, Randomness, Transaction } from "../core";
+import { Address, ErrBadMnemonicEntropy, ErrInvariantFailed, Message, Transaction } from "../core";
 import {
     DummyMnemonicOf12Words,
     loadMnemonic,
@@ -9,6 +9,7 @@ import {
     loadTestWallet,
     TestWallet,
 } from "./../testutils/wallets";
+import { Randomness } from "./crypto";
 import { Mnemonic } from "./mnemonic";
 import { UserSecretKey } from "./userKeys";
 import { UserSigner } from "./userSigner";