diff --git a/examples/demo-trading.ts b/examples/Rest/demo-trading.ts
similarity index 96%
rename from examples/demo-trading.ts
rename to examples/Rest/demo-trading.ts
index a1c6aeb..21a1377 100644
--- a/examples/demo-trading.ts
+++ b/examples/Rest/demo-trading.ts
@@ -1,4 +1,4 @@
-import { RestClient, WebsocketClient } from '../src/index';
+import { RestClient, WebsocketClient } from '../../src/index.js';
 
 // or
 // import { RestClient} from 'okx-api';
@@ -55,7 +55,7 @@ demoWsClient.on('reconnect', ({ wsKey }) => {
 demoWsClient.on('reconnected', (data) => {
   console.log('ws has reconnected ', data?.wsKey);
 });
-demoWsClient.on('error', (data) => {
+demoWsClient.on('exception', (data) => {
   console.error('ws exception: ', data);
 });
 
diff --git a/examples/my.okx.com.ts b/examples/Rest/my.okx.com.ts
similarity index 95%
rename from examples/my.okx.com.ts
rename to examples/Rest/my.okx.com.ts
index 9da6ccd..cf2f5f0 100644
--- a/examples/my.okx.com.ts
+++ b/examples/Rest/my.okx.com.ts
@@ -1,4 +1,4 @@
-import { RestClient, WebsocketClient } from '../src/index';
+import { RestClient, WebsocketClient } from '../../src/index.js';
 
 // or
 // import { RestClient } from 'okx-api';
diff --git a/examples/rest-private-trade.ts b/examples/Rest/rest-private-trade.ts
similarity index 97%
rename from examples/rest-private-trade.ts
rename to examples/Rest/rest-private-trade.ts
index e75c073..afd8a33 100644
--- a/examples/rest-private-trade.ts
+++ b/examples/Rest/rest-private-trade.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { RestClient } from '../src/index.js';
-import { OrderRequest } from '../src/types/rest/request/trade.js';
+import { RestClient } from '../../src/index.js';
+import { OrderRequest } from '../../src/types/rest/request/trade.js';
 
 // or
 // import { SpotClient } from 'okx-api';
diff --git a/examples/rest-public.ts b/examples/Rest/rest-public.ts
similarity index 91%
rename from examples/rest-public.ts
rename to examples/Rest/rest-public.ts
index bcc5b17..43198fe 100644
--- a/examples/rest-public.ts
+++ b/examples/Rest/rest-public.ts
@@ -1,4 +1,4 @@
-import { RestClient } from '../src/index';
+import { RestClient } from '../../src/index.js';
 
 // or
 // import { RestClient } from 'okx-api';
diff --git a/examples/ws-api-client.ts b/examples/Websocket/WS-API/ws-api-client.ts
similarity index 96%
rename from examples/ws-api-client.ts
rename to examples/Websocket/WS-API/ws-api-client.ts
index ee10ee6..5653f63 100644
--- a/examples/ws-api-client.ts
+++ b/examples/Websocket/WS-API/ws-api-client.ts
@@ -1,4 +1,4 @@
-import { DefaultLogger, WebsocketAPIClient } from '../src';
+import { DefaultLogger, WebsocketAPIClient } from '../../../src/index.js';
 
 // or use the module installed via `npm install okx-api`:
 // import { WebsocketClient, DefaultLogger } from 'okx-api';
@@ -55,9 +55,9 @@ import { DefaultLogger, WebsocketAPIClient } from '../src';
       accounts: [
         // For private topics, include one or more accounts in an array. Otherwise only public topics will work
         {
-          apiKey: API_KEY,
-          apiSecret: API_SECRET,
-          apiPass: API_PASSPHRASE,
+          apiKey: API_KEY || '',
+          apiSecret: API_SECRET || '',
+          apiPass: API_PASSPHRASE || '',
         },
       ],
     },
diff --git a/examples/ws-api-trade-raw.ts b/examples/Websocket/WS-API/ws-api-trade-raw.ts
similarity index 96%
rename from examples/ws-api-trade-raw.ts
rename to examples/Websocket/WS-API/ws-api-trade-raw.ts
index 6163fe2..309a5c8 100644
--- a/examples/ws-api-trade-raw.ts
+++ b/examples/Websocket/WS-API/ws-api-trade-raw.ts
@@ -1,5 +1,9 @@
 // If you cloned the repo and are using typescript, you can import from src directly:
-import { DefaultLogger, WebsocketClient, WS_KEY_MAP } from '../src';
+import {
+  DefaultLogger,
+  WebsocketClient,
+  WS_KEY_MAP,
+} from '../../../src/index.js';
 
 // or use the module installed via `npm install okx-api`:
 // import { WebsocketClient, DefaultLogger } from 'okx-api';
@@ -26,9 +30,9 @@ import { DefaultLogger, WebsocketClient, WS_KEY_MAP } from '../src';
       accounts: [
         // For private topics, include one or more accounts in an array. Otherwise only public topics will work
         {
-          apiKey: API_KEY,
-          apiSecret: API_SECRET,
-          apiPass: API_PASSPHRASE,
+          apiKey: API_KEY || '',
+          apiSecret: API_SECRET || '',
+          apiPass: API_PASSPHRASE || '',
         },
       ],
     },
diff --git a/examples/ws-private-handle-auth-fail.ts b/examples/Websocket/ws-private-handle-auth-fail.ts
similarity index 97%
rename from examples/ws-private-handle-auth-fail.ts
rename to examples/Websocket/ws-private-handle-auth-fail.ts
index 4930e41..ce04ca7 100644
--- a/examples/ws-private-handle-auth-fail.ts
+++ b/examples/Websocket/ws-private-handle-auth-fail.ts
@@ -1,5 +1,5 @@
 // If you cloned the repo and are using typescript, you can import from src directly:
-import { WebsocketClient } from '../src';
+import { WebsocketClient } from '../../src/index.js';
 
 /**
  *
diff --git a/examples/ws-private.ts b/examples/Websocket/ws-private.ts
similarity index 98%
rename from examples/ws-private.ts
rename to examples/Websocket/ws-private.ts
index 912d564..eeecaf8 100644
--- a/examples/ws-private.ts
+++ b/examples/Websocket/ws-private.ts
@@ -1,5 +1,5 @@
 // If you cloned the repo and are using typescript, you can import from src directly:
-import { DefaultLogger, WebsocketClient } from '../src';
+import { DefaultLogger, WebsocketClient } from '../../src/index.js';
 
 // or use the module installed via `npm install okx-api`:
 // import { WebsocketClient, DefaultLogger } from 'okx-api';
diff --git a/examples/ws-public.ts b/examples/Websocket/ws-public.ts
similarity index 98%
rename from examples/ws-public.ts
rename to examples/Websocket/ws-public.ts
index ce74343..b267dab 100644
--- a/examples/ws-public.ts
+++ b/examples/Websocket/ws-public.ts
@@ -1,4 +1,4 @@
-import { DefaultLogger, WebsocketClient } from '../src';
+import { DefaultLogger, WebsocketClient } from '../../src/index.js';
 
 // or use the module installed via `npm install okx-api`:
 // import { WebsocketClient, DefaultLogger } from 'okx-api';
diff --git a/examples/app.okx.com.ts b/examples/app.okx.com.ts
index ea2d1aa..6fdb2fe 100644
--- a/examples/app.okx.com.ts
+++ b/examples/app.okx.com.ts
@@ -1,4 +1,4 @@
-import { RestClient, WebsocketClient } from '../src/index';
+import { RestClient, WebsocketClient } from '../src/index.js';
 
 // or
 // import { RestClient } from 'okx-api';
diff --git a/examples/auth/fasterHmacSign.ts b/examples/auth/fasterHmacSign.ts
index ddda42a..187272b 100644
--- a/examples/auth/fasterHmacSign.ts
+++ b/examples/auth/fasterHmacSign.ts
@@ -1,6 +1,10 @@
 import { createHmac } from 'crypto';
 
-import { DefaultLogger, RestClient, WebsocketClient } from '../../src/';
+import {
+  DefaultLogger,
+  RestClient,
+  WebsocketClient,
+} from '../../src/index.js';
 
 // or
 // import { createHmac } from 'crypto';
@@ -62,9 +66,9 @@ const wsClient = new WebsocketClient(
     accounts: [
       // For private topics, include one or more accounts in an array. Otherwise only public topics will work
       {
-        apiKey: API_KEY,
-        apiSecret: API_SECRET,
-        apiPass: API_PASS,
+        apiKey: API_KEY || '',
+        apiSecret: API_SECRET || '',
+        apiPass: API_PASS || '',
       },
     ],
     /**
diff --git a/examples/rest-private-trade-market.ts b/examples/rest-private-trade-market.ts
index dc349b6..0dafe88 100644
--- a/examples/rest-private-trade-market.ts
+++ b/examples/rest-private-trade-market.ts
@@ -1,4 +1,4 @@
-import { OrderRequest, RestClient } from '../src/index';
+import { OrderRequest, RestClient } from '../src/index.js';
 
 // or
 // import { RestClient, OrderRequest } from 'okx-api';