diff --git a/examples/src/standard-nft/my-nft.ts b/examples/src/standard-nft/my-nft.ts
index 430dedfd1..4c31b04b9 100644
--- a/examples/src/standard-nft/my-nft.ts
+++ b/examples/src/standard-nft/my-nft.ts
@@ -9,7 +9,7 @@ import {
   NearPromise,
   PromiseOrValue,
   view,
-} from "near-sdk-js/lib";
+} from "near-sdk-js";
 import {
   NFTContractMetadata,
   NonFungibleTokenMetadataProvider,
@@ -19,7 +19,7 @@ import {
   IntoStorageKey,
   Option,
 } from "near-contract-standards/lib/non_fungible_token/utils";
-import { AccountId } from "near-sdk-js/lib/types";
+import { AccountId } from "near-sdk-js";
 import { NonFungibleTokenCore } from "near-contract-standards/lib/non_fungible_token/core";
 import {
   Token,
diff --git a/examples/src/standard-nft/test-approval-receiver.ts b/examples/src/standard-nft/test-approval-receiver.ts
index db5271002..8c614091e 100644
--- a/examples/src/standard-nft/test-approval-receiver.ts
+++ b/examples/src/standard-nft/test-approval-receiver.ts
@@ -6,8 +6,8 @@ import {
   PromiseOrValue,
   assert,
   call,
-} from "near-sdk-js/lib";
-import { AccountId } from "near-sdk-js/lib/types";
+} from "near-sdk-js";
+import { AccountId } from "near-sdk-js";
 import { NonFungibleTokenApprovalReceiver } from "near-contract-standards/lib/non_fungible_token/approval/approval_receiver";
 
 const BASE_GAS = 20_000_000_000_000n;
diff --git a/examples/src/standard-nft/test-token-receiver.ts b/examples/src/standard-nft/test-token-receiver.ts
index d9df9484b..9d4faf400 100644
--- a/examples/src/standard-nft/test-token-receiver.ts
+++ b/examples/src/standard-nft/test-token-receiver.ts
@@ -7,8 +7,8 @@ import {
   NearBindgen,
   NearPromise,
   PromiseOrValue,
-} from "near-sdk-js/lib";
-import { AccountId } from "near-sdk-js/lib/types";
+} from "near-sdk-js";
+import { AccountId } from "near-sdk-js";
 
 const BASE_GAS = 10_000_000_000_000n;
 const PROMISE_CALL = 10_000_000_000_000n;
diff --git a/lib/index.d.ts b/lib/index.d.ts
index 0e5a91038..434577a5e 100644
--- a/lib/index.d.ts
+++ b/lib/index.d.ts
@@ -1,7 +1,6 @@
-import { call, view, initialize, NearBindgen } from "./near-bindgen";
-import * as near from "./api";
-import { LookupMap, Vector, LookupSet, UnorderedMap, UnorderedSet } from "./collections";
-import { bytes, Bytes, assert, validateAccountId, serialize } from "./utils";
-import { NearPromise, PromiseOrValue } from "./promise";
-import { AccountId } from "./types";
-export { call, view, initialize, NearBindgen, near, LookupMap, Vector, LookupSet, UnorderedMap, UnorderedSet, bytes, Bytes, assert, validateAccountId, serialize, NearPromise, PromiseOrValue, AccountId, };
+export * as near from "./api";
+export * from "./types";
+export * from "./near-bindgen";
+export * from "./collections";
+export * from "./utils";
+export * from "./promise";
diff --git a/lib/index.js b/lib/index.js
index 04f3fdca7..434577a5e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,6 @@
-import { call, view, initialize, NearBindgen } from "./near-bindgen";
-import * as near from "./api";
-import { LookupMap, Vector, LookupSet, UnorderedMap, UnorderedSet, } from "./collections";
-import { bytes, assert, validateAccountId, serialize } from "./utils";
-import { NearPromise } from "./promise";
-export { call, view, initialize, NearBindgen, near, LookupMap, Vector, LookupSet, UnorderedMap, UnorderedSet, bytes, assert, validateAccountId, serialize, NearPromise, };
+export * as near from "./api";
+export * from "./types";
+export * from "./near-bindgen";
+export * from "./collections";
+export * from "./utils";
+export * from "./promise";
diff --git a/src/index.ts b/src/index.ts
index 3a917d5de..434577a5e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,37 +1,6 @@
-import { call, view, initialize, NearBindgen } from "./near-bindgen";
-
-import * as near from "./api";
-import {
-  LookupMap,
-  Vector,
-  LookupSet,
-  UnorderedMap,
-  UnorderedSet,
-} from "./collections";
-
-import { bytes, Bytes, assert, validateAccountId, serialize } from "./utils";
-
-import { NearPromise, PromiseOrValue } from "./promise";
-
-import { AccountId } from "./types";
-
-export {
-  call,
-  view,
-  initialize,
-  NearBindgen,
-  near,
-  LookupMap,
-  Vector,
-  LookupSet,
-  UnorderedMap,
-  UnorderedSet,
-  bytes,
-  Bytes,
-  assert,
-  validateAccountId,
-  serialize,
-  NearPromise,
-  PromiseOrValue,
-  AccountId,
-};
+export * as near from "./api";
+export * from "./types";
+export * from "./near-bindgen";
+export * from "./collections";
+export * from "./utils";
+export * from "./promise";
diff --git a/tests/src/highlevel-promise.js b/tests/src/highlevel-promise.js
index c9bc3800c..0c5b57a8f 100644
--- a/tests/src/highlevel-promise.js
+++ b/tests/src/highlevel-promise.js
@@ -1,5 +1,5 @@
 import { NearBindgen, call, NearPromise, near, bytes } from "near-sdk-js";
-import { PublicKey } from "near-sdk-js/lib/types";
+import { PublicKey } from "near-sdk-js";
 
 function callingData() {
   return {
diff --git a/tests/src/public-key.js b/tests/src/public-key.js
index a62a6480a..0f47bde54 100644
--- a/tests/src/public-key.js
+++ b/tests/src/public-key.js
@@ -1,6 +1,6 @@
 import { near, bytes } from "near-sdk-js";
-import { CurveType, PublicKey } from "near-sdk-js/lib/types";
-import { assert } from "near-sdk-js/lib/utils";
+import { CurveType, PublicKey } from "near-sdk-js";
+import { assert } from "near-sdk-js";
 
 function runtime_validate_public_key(prefix, public_key) {
   let promiseId = near.promiseBatchCreate(prefix + ".pk.test.near");