diff --git a/packages/bloom/lib/commands/bloom/ADD.ts b/packages/bloom/lib/commands/bloom/ADD.ts
index f394755acc..e12d9cfa1d 100644
--- a/packages/bloom/lib/commands/bloom/ADD.ts
+++ b/packages/bloom/lib/commands/bloom/ADD.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformBooleanReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/bloom/CARD.ts b/packages/bloom/lib/commands/bloom/CARD.ts
index 1d206b30af..c2f9aeb00f 100644
--- a/packages/bloom/lib/commands/bloom/CARD.ts
+++ b/packages/bloom/lib/commands/bloom/CARD.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/bloom/EXISTS.ts b/packages/bloom/lib/commands/bloom/EXISTS.ts
index 3de18dd07c..b3f19af951 100644
--- a/packages/bloom/lib/commands/bloom/EXISTS.ts
+++ b/packages/bloom/lib/commands/bloom/EXISTS.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformBooleanReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/bloom/INFO.ts b/packages/bloom/lib/commands/bloom/INFO.ts
index b1e3f137c8..b715bf5773 100644
--- a/packages/bloom/lib/commands/bloom/INFO.ts
+++ b/packages/bloom/lib/commands/bloom/INFO.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, UnwrapReply, NullReply, NumberReply, TuplesToMapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, UnwrapReply, NullReply, NumberReply, TuplesToMapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
 import { transformInfoV2Reply } from '.';
 
 export type BfInfoReplyMap = TuplesToMapReply<[
diff --git a/packages/bloom/lib/commands/bloom/INSERT.ts b/packages/bloom/lib/commands/bloom/INSERT.ts
index 14831f2f11..b8dcef325f 100644
--- a/packages/bloom/lib/commands/bloom/INSERT.ts
+++ b/packages/bloom/lib/commands/bloom/INSERT.ts
@@ -1,7 +1,7 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
-import { transformBooleanArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
+import { transformBooleanArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface BfInsertOptions {
   CAPACITY?: number;
diff --git a/packages/bloom/lib/commands/bloom/LOADCHUNK.ts b/packages/bloom/lib/commands/bloom/LOADCHUNK.ts
index 47036e042a..ef3cc4a3e1 100644
--- a/packages/bloom/lib/commands/bloom/LOADCHUNK.ts
+++ b/packages/bloom/lib/commands/bloom/LOADCHUNK.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/bloom/MADD.ts b/packages/bloom/lib/commands/bloom/MADD.ts
index fda7419bf1..efbd932b40 100644
--- a/packages/bloom/lib/commands/bloom/MADD.ts
+++ b/packages/bloom/lib/commands/bloom/MADD.ts
@@ -1,7 +1,7 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
-import { transformBooleanArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
+import { transformBooleanArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/bloom/MEXISTS.ts b/packages/bloom/lib/commands/bloom/MEXISTS.ts
index acd85786f9..a5a311a8e4 100644
--- a/packages/bloom/lib/commands/bloom/MEXISTS.ts
+++ b/packages/bloom/lib/commands/bloom/MEXISTS.ts
@@ -1,7 +1,7 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
-import { transformBooleanArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
+import { transformBooleanArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/bloom/RESERVE.ts b/packages/bloom/lib/commands/bloom/RESERVE.ts
index aff155ab76..00f17c1889 100644
--- a/packages/bloom/lib/commands/bloom/RESERVE.ts
+++ b/packages/bloom/lib/commands/bloom/RESERVE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface BfReserveOptions {
   EXPANSION?: number;
diff --git a/packages/bloom/lib/commands/bloom/SCANDUMP.ts b/packages/bloom/lib/commands/bloom/SCANDUMP.ts
index 37b1f57045..d0472b649c 100644
--- a/packages/bloom/lib/commands/bloom/SCANDUMP.ts
+++ b/packages/bloom/lib/commands/bloom/SCANDUMP.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, TuplesReply, NumberReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, TuplesReply, NumberReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/bloom/index.ts b/packages/bloom/lib/commands/bloom/index.ts
index e87f57220d..a93f79c9c5 100644
--- a/packages/bloom/lib/commands/bloom/index.ts
+++ b/packages/bloom/lib/commands/bloom/index.ts
@@ -1,4 +1,4 @@
-import type { RedisCommands, TypeMapping } from '@redis/client/lib/RESP/types';
+import type { RedisCommands, TypeMapping } from '@redis/client/dist/lib/RESP/types';
 
 import ADD from './ADD';
 import CARD from './CARD';
diff --git a/packages/bloom/lib/commands/count-min-sketch/INCRBY.ts b/packages/bloom/lib/commands/count-min-sketch/INCRBY.ts
index 39cc52d31d..a011957ece 100644
--- a/packages/bloom/lib/commands/count-min-sketch/INCRBY.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/INCRBY.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface BfIncrByItem {
   item: RedisArgument;
diff --git a/packages/bloom/lib/commands/count-min-sketch/INFO.ts b/packages/bloom/lib/commands/count-min-sketch/INFO.ts
index 9b77409f2d..fef1cac97e 100644
--- a/packages/bloom/lib/commands/count-min-sketch/INFO.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/INFO.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, TuplesToMapReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, TuplesToMapReply, NumberReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
 import { transformInfoV2Reply } from '../bloom';
 
 export type CmsInfoReplyMap = TuplesToMapReply<[
diff --git a/packages/bloom/lib/commands/count-min-sketch/INITBYDIM.ts b/packages/bloom/lib/commands/count-min-sketch/INITBYDIM.ts
index cd295d0696..44e6a75952 100644
--- a/packages/bloom/lib/commands/count-min-sketch/INITBYDIM.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/INITBYDIM.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/count-min-sketch/INITBYPROB.ts b/packages/bloom/lib/commands/count-min-sketch/INITBYPROB.ts
index e7e85d4100..3b96120bd0 100644
--- a/packages/bloom/lib/commands/count-min-sketch/INITBYPROB.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/INITBYPROB.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/count-min-sketch/MERGE.ts b/packages/bloom/lib/commands/count-min-sketch/MERGE.ts
index cc0fc92907..4d959bd619 100644
--- a/packages/bloom/lib/commands/count-min-sketch/MERGE.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/MERGE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 interface BfMergeSketch {
   name: RedisArgument;
diff --git a/packages/bloom/lib/commands/count-min-sketch/QUERY.ts b/packages/bloom/lib/commands/count-min-sketch/QUERY.ts
index 54d838c193..b55b51d1bb 100644
--- a/packages/bloom/lib/commands/count-min-sketch/QUERY.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/QUERY.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { ArrayReply, NumberReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { ArrayReply, NumberReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/count-min-sketch/index.ts b/packages/bloom/lib/commands/count-min-sketch/index.ts
index 1132a7524e..4f0f395ca3 100644
--- a/packages/bloom/lib/commands/count-min-sketch/index.ts
+++ b/packages/bloom/lib/commands/count-min-sketch/index.ts
@@ -1,4 +1,4 @@
-import type { RedisCommands } from '@redis/client/lib/RESP/types';
+import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
 import INCRBY from './INCRBY';
 import INFO from './INFO';
 import INITBYDIM from './INITBYDIM';
diff --git a/packages/bloom/lib/commands/cuckoo/ADD.ts b/packages/bloom/lib/commands/cuckoo/ADD.ts
index 3d0dc77be2..37a5d1b5b8 100644
--- a/packages/bloom/lib/commands/cuckoo/ADD.ts
+++ b/packages/bloom/lib/commands/cuckoo/ADD.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformBooleanReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/cuckoo/ADDNX.ts b/packages/bloom/lib/commands/cuckoo/ADDNX.ts
index f358f1581e..ceaf62be21 100644
--- a/packages/bloom/lib/commands/cuckoo/ADDNX.ts
+++ b/packages/bloom/lib/commands/cuckoo/ADDNX.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformBooleanReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/cuckoo/COUNT.ts b/packages/bloom/lib/commands/cuckoo/COUNT.ts
index 512b014327..f0cd5a7210 100644
--- a/packages/bloom/lib/commands/cuckoo/COUNT.ts
+++ b/packages/bloom/lib/commands/cuckoo/COUNT.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/cuckoo/DEL.ts b/packages/bloom/lib/commands/cuckoo/DEL.ts
index 0b2bdaea99..c97b7c2d9f 100644
--- a/packages/bloom/lib/commands/cuckoo/DEL.ts
+++ b/packages/bloom/lib/commands/cuckoo/DEL.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformBooleanReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/cuckoo/EXISTS.ts b/packages/bloom/lib/commands/cuckoo/EXISTS.ts
index ef93462990..2299cb3de9 100644
--- a/packages/bloom/lib/commands/cuckoo/EXISTS.ts
+++ b/packages/bloom/lib/commands/cuckoo/EXISTS.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformBooleanReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformBooleanReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/cuckoo/INFO.ts b/packages/bloom/lib/commands/cuckoo/INFO.ts
index 15972b206f..6a8f06f1e7 100644
--- a/packages/bloom/lib/commands/cuckoo/INFO.ts
+++ b/packages/bloom/lib/commands/cuckoo/INFO.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
 import { transformInfoV2Reply } from '../bloom';
 
 export type CfInfoReplyMap = TuplesToMapReply<[
diff --git a/packages/bloom/lib/commands/cuckoo/INSERT.ts b/packages/bloom/lib/commands/cuckoo/INSERT.ts
index 75534e0a7f..3ad3feee16 100644
--- a/packages/bloom/lib/commands/cuckoo/INSERT.ts
+++ b/packages/bloom/lib/commands/cuckoo/INSERT.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument, transformBooleanArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument, transformBooleanArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface CfInsertOptions {
   CAPACITY?: number;
diff --git a/packages/bloom/lib/commands/cuckoo/INSERTNX.ts b/packages/bloom/lib/commands/cuckoo/INSERTNX.ts
index 581cfcd9e6..7ddc952e2f 100644
--- a/packages/bloom/lib/commands/cuckoo/INSERTNX.ts
+++ b/packages/bloom/lib/commands/cuckoo/INSERTNX.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import INSERT, { parseCfInsertArguments } from './INSERT';
 
 export default {
diff --git a/packages/bloom/lib/commands/cuckoo/LOADCHUNK.ts b/packages/bloom/lib/commands/cuckoo/LOADCHUNK.ts
index 420774a650..8fb21be8e0 100644
--- a/packages/bloom/lib/commands/cuckoo/LOADCHUNK.ts
+++ b/packages/bloom/lib/commands/cuckoo/LOADCHUNK.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/cuckoo/RESERVE.ts b/packages/bloom/lib/commands/cuckoo/RESERVE.ts
index ba401dcdee..2685b0db06 100644
--- a/packages/bloom/lib/commands/cuckoo/RESERVE.ts
+++ b/packages/bloom/lib/commands/cuckoo/RESERVE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface CfReserveOptions {
   BUCKETSIZE?: number;
diff --git a/packages/bloom/lib/commands/cuckoo/SCANDUMP.ts b/packages/bloom/lib/commands/cuckoo/SCANDUMP.ts
index aab7a5eecc..25ef2c3f6d 100644
--- a/packages/bloom/lib/commands/cuckoo/SCANDUMP.ts
+++ b/packages/bloom/lib/commands/cuckoo/SCANDUMP.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, TuplesReply, NumberReply, BlobStringReply, NullReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, TuplesReply, NumberReply, BlobStringReply, NullReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/cuckoo/index.ts b/packages/bloom/lib/commands/cuckoo/index.ts
index 7ee99b41cd..62c63fe8d1 100644
--- a/packages/bloom/lib/commands/cuckoo/index.ts
+++ b/packages/bloom/lib/commands/cuckoo/index.ts
@@ -1,4 +1,4 @@
-import type { RedisCommands } from '@redis/client/lib/RESP/types';
+import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
 import ADD from './ADD';
 import ADDNX from './ADDNX';
 import COUNT from './COUNT';
diff --git a/packages/bloom/lib/commands/t-digest/ADD.ts b/packages/bloom/lib/commands/t-digest/ADD.ts
index d9d67144a9..5534d58065 100644
--- a/packages/bloom/lib/commands/t-digest/ADD.ts
+++ b/packages/bloom/lib/commands/t-digest/ADD.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/t-digest/BYRANK.ts b/packages/bloom/lib/commands/t-digest/BYRANK.ts
index 126c9963e7..9c1ab0059f 100644
--- a/packages/bloom/lib/commands/t-digest/BYRANK.ts
+++ b/packages/bloom/lib/commands/t-digest/BYRANK.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformDoubleArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export function transformByRankArguments(
   parser: CommandParser, 
diff --git a/packages/bloom/lib/commands/t-digest/BYREVRANK.ts b/packages/bloom/lib/commands/t-digest/BYREVRANK.ts
index 4995bf86cc..8721c081e7 100644
--- a/packages/bloom/lib/commands/t-digest/BYREVRANK.ts
+++ b/packages/bloom/lib/commands/t-digest/BYREVRANK.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import BYRANK, { transformByRankArguments } from './BYRANK';
 
 export default {
diff --git a/packages/bloom/lib/commands/t-digest/CDF.ts b/packages/bloom/lib/commands/t-digest/CDF.ts
index e786dc4c8a..4d1d8ea278 100644
--- a/packages/bloom/lib/commands/t-digest/CDF.ts
+++ b/packages/bloom/lib/commands/t-digest/CDF.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformDoubleArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/t-digest/CREATE.ts b/packages/bloom/lib/commands/t-digest/CREATE.ts
index fd160cce84..58b1e00828 100644
--- a/packages/bloom/lib/commands/t-digest/CREATE.ts
+++ b/packages/bloom/lib/commands/t-digest/CREATE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface TDigestCreateOptions {
   COMPRESSION?: number;
diff --git a/packages/bloom/lib/commands/t-digest/INFO.ts b/packages/bloom/lib/commands/t-digest/INFO.ts
index 43624e8f9b..2cb9e93443 100644
--- a/packages/bloom/lib/commands/t-digest/INFO.ts
+++ b/packages/bloom/lib/commands/t-digest/INFO.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, NumberReply, TuplesToMapReply, UnwrapReply, Resp2Reply, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
 import { transformInfoV2Reply } from '../bloom';
 
 export type TdInfoReplyMap = TuplesToMapReply<[
diff --git a/packages/bloom/lib/commands/t-digest/MAX.ts b/packages/bloom/lib/commands/t-digest/MAX.ts
index 64852d8e6d..140db6a3e4 100644
--- a/packages/bloom/lib/commands/t-digest/MAX.ts
+++ b/packages/bloom/lib/commands/t-digest/MAX.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/t-digest/MERGE.ts b/packages/bloom/lib/commands/t-digest/MERGE.ts
index 1031f0e917..80049d1e54 100644
--- a/packages/bloom/lib/commands/t-digest/MERGE.ts
+++ b/packages/bloom/lib/commands/t-digest/MERGE.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface TDigestMergeOptions {
   COMPRESSION?: number;
diff --git a/packages/bloom/lib/commands/t-digest/MIN.ts b/packages/bloom/lib/commands/t-digest/MIN.ts
index cc44dbbea4..d6e56fb672 100644
--- a/packages/bloom/lib/commands/t-digest/MIN.ts
+++ b/packages/bloom/lib/commands/t-digest/MIN.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/t-digest/QUANTILE.ts b/packages/bloom/lib/commands/t-digest/QUANTILE.ts
index 962c3a9b4c..1c27b5f6ec 100644
--- a/packages/bloom/lib/commands/t-digest/QUANTILE.ts
+++ b/packages/bloom/lib/commands/t-digest/QUANTILE.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformDoubleArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/t-digest/RANK.ts b/packages/bloom/lib/commands/t-digest/RANK.ts
index 316ca74b54..053c0c544e 100644
--- a/packages/bloom/lib/commands/t-digest/RANK.ts
+++ b/packages/bloom/lib/commands/t-digest/RANK.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export function transformRankArguments(
   parser: CommandParser,
diff --git a/packages/bloom/lib/commands/t-digest/RESET.ts b/packages/bloom/lib/commands/t-digest/RESET.ts
index 571102bfc2..c2bda72d6d 100644
--- a/packages/bloom/lib/commands/t-digest/RESET.ts
+++ b/packages/bloom/lib/commands/t-digest/RESET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/t-digest/REVRANK.ts b/packages/bloom/lib/commands/t-digest/REVRANK.ts
index ca9301bb42..e7f2357a2f 100644
--- a/packages/bloom/lib/commands/t-digest/REVRANK.ts
+++ b/packages/bloom/lib/commands/t-digest/REVRANK.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import RANK, { transformRankArguments } from './RANK';
 
 export default {
diff --git a/packages/bloom/lib/commands/t-digest/TRIMMED_MEAN.ts b/packages/bloom/lib/commands/t-digest/TRIMMED_MEAN.ts
index f411198260..1fd6360ab6 100644
--- a/packages/bloom/lib/commands/t-digest/TRIMMED_MEAN.ts
+++ b/packages/bloom/lib/commands/t-digest/TRIMMED_MEAN.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/t-digest/index.ts b/packages/bloom/lib/commands/t-digest/index.ts
index fb80b35d0a..d180911dbf 100644
--- a/packages/bloom/lib/commands/t-digest/index.ts
+++ b/packages/bloom/lib/commands/t-digest/index.ts
@@ -1,4 +1,4 @@
-import type { RedisCommands } from '@redis/client/lib/RESP/types';
+import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
 import ADD from './ADD';
 import BYRANK from './BYRANK';
 import BYREVRANK from './BYREVRANK';
diff --git a/packages/bloom/lib/commands/top-k/ADD.ts b/packages/bloom/lib/commands/top-k/ADD.ts
index 42b162165c..244e6209c9 100644
--- a/packages/bloom/lib/commands/top-k/ADD.ts
+++ b/packages/bloom/lib/commands/top-k/ADD.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/top-k/COUNT.ts b/packages/bloom/lib/commands/top-k/COUNT.ts
index 7cca009c59..7e75a3b68a 100644
--- a/packages/bloom/lib/commands/top-k/COUNT.ts
+++ b/packages/bloom/lib/commands/top-k/COUNT.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/top-k/INCRBY.ts b/packages/bloom/lib/commands/top-k/INCRBY.ts
index 52ea0edc96..9e9a49e18f 100644
--- a/packages/bloom/lib/commands/top-k/INCRBY.ts
+++ b/packages/bloom/lib/commands/top-k/INCRBY.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, SimpleStringReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, SimpleStringReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface TopKIncrByItem {
   item: string;
diff --git a/packages/bloom/lib/commands/top-k/INFO.ts b/packages/bloom/lib/commands/top-k/INFO.ts
index 89ebeaa8eb..53da265c1f 100644
--- a/packages/bloom/lib/commands/top-k/INFO.ts
+++ b/packages/bloom/lib/commands/top-k/INFO.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, TuplesToMapReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/lib/RESP/types';
-import { transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, TuplesToMapReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command, SimpleStringReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 import { transformInfoV2Reply } from '../bloom';
 
 export type TopKInfoReplyMap = TuplesToMapReply<[
diff --git a/packages/bloom/lib/commands/top-k/LIST.ts b/packages/bloom/lib/commands/top-k/LIST.ts
index 74b85e0f71..d7adeaa193 100644
--- a/packages/bloom/lib/commands/top-k/LIST.ts
+++ b/packages/bloom/lib/commands/top-k/LIST.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/top-k/LIST_WITHCOUNT.ts b/packages/bloom/lib/commands/top-k/LIST_WITHCOUNT.ts
index a3a3d3f43f..2c0f10e785 100644
--- a/packages/bloom/lib/commands/top-k/LIST_WITHCOUNT.ts
+++ b/packages/bloom/lib/commands/top-k/LIST_WITHCOUNT.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, BlobStringReply, NumberReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, NumberReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/bloom/lib/commands/top-k/QUERY.ts b/packages/bloom/lib/commands/top-k/QUERY.ts
index 49b9171437..a6fb4bae69 100644
--- a/packages/bloom/lib/commands/top-k/QUERY.ts
+++ b/packages/bloom/lib/commands/top-k/QUERY.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument, transformBooleanArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument, transformBooleanArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/bloom/lib/commands/top-k/RESERVE.ts b/packages/bloom/lib/commands/top-k/RESERVE.ts
index f3ef3bf720..ee3ee9a8cf 100644
--- a/packages/bloom/lib/commands/top-k/RESERVE.ts
+++ b/packages/bloom/lib/commands/top-k/RESERVE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
 
 export interface TopKReserveOptions {
   width: number;
diff --git a/packages/bloom/lib/commands/top-k/index.ts b/packages/bloom/lib/commands/top-k/index.ts
index 0352745fd0..fb5de543ca 100644
--- a/packages/bloom/lib/commands/top-k/index.ts
+++ b/packages/bloom/lib/commands/top-k/index.ts
@@ -1,4 +1,4 @@
-import type { RedisCommands } from '@redis/client/lib/RESP/types';
+import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
 import ADD from './ADD';
 import COUNT from './COUNT';
 import INCRBY from './INCRBY';
diff --git a/packages/graph/lib/commands/CONFIG_GET.ts b/packages/graph/lib/commands/CONFIG_GET.ts
index 8ff289876d..4986dfc181 100644
--- a/packages/graph/lib/commands/CONFIG_GET.ts
+++ b/packages/graph/lib/commands/CONFIG_GET.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, TuplesReply, ArrayReply, BlobStringReply, NumberReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, TuplesReply, ArrayReply, BlobStringReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 type ConfigItemReply = TuplesReply<[
   configKey: BlobStringReply,
diff --git a/packages/graph/lib/commands/CONFIG_SET.ts b/packages/graph/lib/commands/CONFIG_SET.ts
index b37d8690bf..63f604402e 100644
--- a/packages/graph/lib/commands/CONFIG_SET.ts
+++ b/packages/graph/lib/commands/CONFIG_SET.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/graph/lib/commands/DELETE.ts b/packages/graph/lib/commands/DELETE.ts
index 2e1f9ff003..43af38d6fb 100644
--- a/packages/graph/lib/commands/DELETE.ts
+++ b/packages/graph/lib/commands/DELETE.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/graph/lib/commands/EXPLAIN.ts b/packages/graph/lib/commands/EXPLAIN.ts
index c690450a10..a9af7e73a2 100644
--- a/packages/graph/lib/commands/EXPLAIN.ts
+++ b/packages/graph/lib/commands/EXPLAIN.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/graph/lib/commands/LIST.ts b/packages/graph/lib/commands/LIST.ts
index 4fe66d748f..70fa8bda81 100644
--- a/packages/graph/lib/commands/LIST.ts
+++ b/packages/graph/lib/commands/LIST.ts
@@ -1,5 +1,5 @@
-import { ArrayReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { ArrayReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/graph/lib/commands/PROFILE.ts b/packages/graph/lib/commands/PROFILE.ts
index fba0973baa..c3229fb9a0 100644
--- a/packages/graph/lib/commands/PROFILE.ts
+++ b/packages/graph/lib/commands/PROFILE.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/graph/lib/commands/QUERY.ts b/packages/graph/lib/commands/QUERY.ts
index c96c00ff32..23ea24c576 100644
--- a/packages/graph/lib/commands/QUERY.ts
+++ b/packages/graph/lib/commands/QUERY.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, ArrayReply, BlobStringReply, NumberReply, NullReply, TuplesReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, NumberReply, NullReply, TuplesReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 type Headers = ArrayReply<BlobStringReply>;
 
diff --git a/packages/graph/lib/commands/RO_QUERY.ts b/packages/graph/lib/commands/RO_QUERY.ts
index 98668675d2..f052877b99 100644
--- a/packages/graph/lib/commands/RO_QUERY.ts
+++ b/packages/graph/lib/commands/RO_QUERY.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import QUERY, { parseQueryArguments } from './QUERY';
 
 export default {
diff --git a/packages/graph/lib/commands/SLOWLOG.ts b/packages/graph/lib/commands/SLOWLOG.ts
index bba615efb2..4110335f92 100644
--- a/packages/graph/lib/commands/SLOWLOG.ts
+++ b/packages/graph/lib/commands/SLOWLOG.ts
@@ -1,5 +1,5 @@
-import { RedisArgument, ArrayReply, TuplesReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { RedisArgument, ArrayReply, TuplesReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 
 type SlowLogRawReply = ArrayReply<TuplesReply<[
   timestamp: BlobStringReply,
diff --git a/packages/graph/lib/commands/index.ts b/packages/graph/lib/commands/index.ts
index 362d98f970..e93356aa95 100644
--- a/packages/graph/lib/commands/index.ts
+++ b/packages/graph/lib/commands/index.ts
@@ -1,4 +1,4 @@
-import type { RedisCommands } from '@redis/client/lib/RESP/types';
+import type { RedisCommands } from '@redis/client/dist/lib/RESP/types';
 import CONFIG_GET from './CONFIG_GET';
 import CONFIG_SET from './CONFIG_SET';;
 import DELETE from './DELETE';
diff --git a/packages/graph/lib/graph.ts b/packages/graph/lib/graph.ts
index cacdcd5aec..348c8b7155 100644
--- a/packages/graph/lib/graph.ts
+++ b/packages/graph/lib/graph.ts
@@ -1,5 +1,5 @@
 import { RedisClientType } from '@redis/client';
-import { RedisArgument, RedisFunctions, RedisScripts } from '@redis/client/lib/RESP/types';
+import { RedisArgument, RedisFunctions, RedisScripts } from '@redis/client/dist/lib/RESP/types';
 import QUERY, { QueryOptions } from './commands/QUERY';
 
 interface GraphMetadata {
diff --git a/packages/json/lib/commands/ARRAPPEND.ts b/packages/json/lib/commands/ARRAPPEND.ts
index ee79119b9f..539eb91a29 100644
--- a/packages/json/lib/commands/ARRAPPEND.ts
+++ b/packages/json/lib/commands/ARRAPPEND.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisJSON, transformRedisJsonArgument } from '.';
-import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/json/lib/commands/ARRINDEX.ts b/packages/json/lib/commands/ARRINDEX.ts
index d0533862c6..23f010b1f0 100644
--- a/packages/json/lib/commands/ARRINDEX.ts
+++ b/packages/json/lib/commands/ARRINDEX.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
 export interface JsonArrIndexOptions {
diff --git a/packages/json/lib/commands/ARRINSERT.ts b/packages/json/lib/commands/ARRINSERT.ts
index 7a55577c9d..eb1d7c882f 100644
--- a/packages/json/lib/commands/ARRINSERT.ts
+++ b/packages/json/lib/commands/ARRINSERT.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
 export default {
diff --git a/packages/json/lib/commands/ARRLEN.ts b/packages/json/lib/commands/ARRLEN.ts
index 26accf8df9..f49166c218 100644
--- a/packages/json/lib/commands/ARRLEN.ts
+++ b/packages/json/lib/commands/ARRLEN.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonArrLenOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/ARRPOP.ts b/packages/json/lib/commands/ARRPOP.ts
index 375668471d..5f1489c3bd 100644
--- a/packages/json/lib/commands/ARRPOP.ts
+++ b/packages/json/lib/commands/ARRPOP.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NullReply, BlobStringReply, Command, UnwrapReply } from '@redis/client/lib/RESP/types';
-import { isArrayReply } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NullReply, BlobStringReply, Command, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
+import { isArrayReply } from '@redis/client/dist/lib/commands/generic-transformers';
 import { transformRedisJsonNullReply } from '.';
 
 export interface RedisArrPopOptions {
diff --git a/packages/json/lib/commands/ARRTRIM.ts b/packages/json/lib/commands/ARRTRIM.ts
index e7cde0dc17..573fa78750 100644
--- a/packages/json/lib/commands/ARRTRIM.ts
+++ b/packages/json/lib/commands/ARRTRIM.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/json/lib/commands/CLEAR.ts b/packages/json/lib/commands/CLEAR.ts
index 65d69ef18e..b86513cc21 100644
--- a/packages/json/lib/commands/CLEAR.ts
+++ b/packages/json/lib/commands/CLEAR.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonClearOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/DEBUG_MEMORY.ts b/packages/json/lib/commands/DEBUG_MEMORY.ts
index 5c4641c327..aa36d74c07 100644
--- a/packages/json/lib/commands/DEBUG_MEMORY.ts
+++ b/packages/json/lib/commands/DEBUG_MEMORY.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonDebugMemoryOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/DEL.ts b/packages/json/lib/commands/DEL.ts
index d4d8ed4620..e86366bebe 100644
--- a/packages/json/lib/commands/DEL.ts
+++ b/packages/json/lib/commands/DEL.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonDelOptions {
   path?: RedisArgument
diff --git a/packages/json/lib/commands/FORGET.ts b/packages/json/lib/commands/FORGET.ts
index 1b5b97038e..0a8ed3d91c 100644
--- a/packages/json/lib/commands/FORGET.ts
+++ b/packages/json/lib/commands/FORGET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonForgetOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/GET.ts b/packages/json/lib/commands/GET.ts
index 3d623483d2..d43d7464c5 100644
--- a/packages/json/lib/commands/GET.ts
+++ b/packages/json/lib/commands/GET.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { transformRedisJsonNullReply } from '.';
 
 export interface JsonGetOptions {
diff --git a/packages/json/lib/commands/MERGE.ts b/packages/json/lib/commands/MERGE.ts
index 25ae84c6ed..0cb8131a68 100644
--- a/packages/json/lib/commands/MERGE.ts
+++ b/packages/json/lib/commands/MERGE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
 export default {
diff --git a/packages/json/lib/commands/MGET.ts b/packages/json/lib/commands/MGET.ts
index 79241bee7c..447de064d2 100644
--- a/packages/json/lib/commands/MGET.ts
+++ b/packages/json/lib/commands/MGET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, UnwrapReply, ArrayReply, NullReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, UnwrapReply, ArrayReply, NullReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { transformRedisJsonNullReply } from '.';
 
 export default {
diff --git a/packages/json/lib/commands/MSET.ts b/packages/json/lib/commands/MSET.ts
index b6b42563c7..cb0bea26dd 100644
--- a/packages/json/lib/commands/MSET.ts
+++ b/packages/json/lib/commands/MSET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
 export interface JsonMSetItem {
diff --git a/packages/json/lib/commands/NUMINCRBY.ts b/packages/json/lib/commands/NUMINCRBY.ts
index 8c41194a9b..02c1c17dbc 100644
--- a/packages/json/lib/commands/NUMINCRBY.ts
+++ b/packages/json/lib/commands/NUMINCRBY.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, DoubleReply, NullReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, DoubleReply, NullReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/json/lib/commands/NUMMULTBY.ts b/packages/json/lib/commands/NUMMULTBY.ts
index 5eeb4b50e8..c3621908a4 100644
--- a/packages/json/lib/commands/NUMMULTBY.ts
+++ b/packages/json/lib/commands/NUMMULTBY.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
 import NUMINCRBY from './NUMINCRBY';
 
 export default {
diff --git a/packages/json/lib/commands/OBJKEYS.ts b/packages/json/lib/commands/OBJKEYS.ts
index 6d23da2053..f7e94dd4df 100644
--- a/packages/json/lib/commands/OBJKEYS.ts
+++ b/packages/json/lib/commands/OBJKEYS.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, BlobStringReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonObjKeysOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/OBJLEN.ts b/packages/json/lib/commands/OBJLEN.ts
index e15a72e216..d1286a89b8 100644
--- a/packages/json/lib/commands/OBJLEN.ts
+++ b/packages/json/lib/commands/OBJLEN.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, ArrayReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonObjLenOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/RESP.ts b/packages/json/lib/commands/RESP.ts
index c971383395..62084d73b0 100644
--- a/packages/json/lib/commands/RESP.ts
+++ b/packages/json/lib/commands/RESP.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from "@redis/client/lib/client/parser";
-import { Command, RedisArgument } from "@redis/client/lib/RESP/types";
+import { CommandParser } from "@redis/client/dist/lib/client/parser";
+import { Command, RedisArgument } from "@redis/client/dist/lib/RESP/types";
 
 type RESPReply = Array<string | number | RESPReply>;
 
diff --git a/packages/json/lib/commands/SET.ts b/packages/json/lib/commands/SET.ts
index 6bd89803de..75d7099acf 100644
--- a/packages/json/lib/commands/SET.ts
+++ b/packages/json/lib/commands/SET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RedisJSON, transformRedisJsonArgument } from '.';
 
 export interface JsonSetOptions {
diff --git a/packages/json/lib/commands/STRAPPEND.ts b/packages/json/lib/commands/STRAPPEND.ts
index 97bbebf931..45d503856a 100644
--- a/packages/json/lib/commands/STRAPPEND.ts
+++ b/packages/json/lib/commands/STRAPPEND.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, NullReply, NumberReply, ArrayReply } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, NullReply, NumberReply, ArrayReply } from '@redis/client/dist/lib/RESP/types';
 import { transformRedisJsonArgument } from '.';
 
 export interface JsonStrAppendOptions {
diff --git a/packages/json/lib/commands/STRLEN.ts b/packages/json/lib/commands/STRLEN.ts
index b72f30cd6d..644cdf27ef 100644
--- a/packages/json/lib/commands/STRLEN.ts
+++ b/packages/json/lib/commands/STRLEN.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonStrLenOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/TOGGLE.ts b/packages/json/lib/commands/TOGGLE.ts
index 2707d54b6f..85c769729c 100644
--- a/packages/json/lib/commands/TOGGLE.ts
+++ b/packages/json/lib/commands/TOGGLE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, NumberReply, NullReply, Command, } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, NumberReply, NullReply, Command, } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/json/lib/commands/TYPE.ts b/packages/json/lib/commands/TYPE.ts
index d19de31df6..1146043b2c 100644
--- a/packages/json/lib/commands/TYPE.ts
+++ b/packages/json/lib/commands/TYPE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { NullReply, BlobStringReply, ArrayReply, Command, RedisArgument, UnwrapReply } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { NullReply, BlobStringReply, ArrayReply, Command, RedisArgument, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 
 export interface JsonTypeOptions {
   path?: RedisArgument;
diff --git a/packages/json/lib/commands/index.ts b/packages/json/lib/commands/index.ts
index 8ea44ce804..2724ff2565 100644
--- a/packages/json/lib/commands/index.ts
+++ b/packages/json/lib/commands/index.ts
@@ -1,4 +1,4 @@
-import { BlobStringReply, NullReply, UnwrapReply } from '@redis/client/lib/RESP/types';
+import { BlobStringReply, NullReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 import ARRAPPEND from './ARRAPPEND';
 import ARRINDEX from './ARRINDEX';
 import ARRINSERT from './ARRINSERT';
@@ -23,7 +23,7 @@ import STRAPPEND from './STRAPPEND';
 import STRLEN from './STRLEN';
 import TOGGLE from './TOGGLE';
 import TYPE from './TYPE';
-import { isNullReply } from '@redis/client/lib/commands/generic-transformers';
+import { isNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   ARRAPPEND,
diff --git a/packages/search/lib/commands/AGGREGATE.ts b/packages/search/lib/commands/AGGREGATE.ts
index 0105b08268..925a91da00 100644
--- a/packages/search/lib/commands/AGGREGATE.ts
+++ b/packages/search/lib/commands/AGGREGATE.ts
@@ -1,8 +1,8 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { ArrayReply, BlobStringReply, Command, MapReply, NumberReply, RedisArgument, ReplyUnion, TypeMapping, UnwrapReply } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { ArrayReply, BlobStringReply, Command, MapReply, NumberReply, RedisArgument, ReplyUnion, TypeMapping, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 import { RediSearchProperty } from './CREATE';
 import { FtSearchParams, parseParamsArgument } from './SEARCH';
-import { transformTuplesReply } from '@redis/client/lib/commands/generic-transformers';
+import { transformTuplesReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 type LoadField = RediSearchProperty | {
   identifier: RediSearchProperty;
diff --git a/packages/search/lib/commands/AGGREGATE_WITHCURSOR.ts b/packages/search/lib/commands/AGGREGATE_WITHCURSOR.ts
index f9a7e75942..8dfca7169e 100644
--- a/packages/search/lib/commands/AGGREGATE_WITHCURSOR.ts
+++ b/packages/search/lib/commands/AGGREGATE_WITHCURSOR.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, ReplyUnion, NumberReply } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, ReplyUnion, NumberReply } from '@redis/client/dist/lib/RESP/types';
 import AGGREGATE, { AggregateRawReply, AggregateReply, FtAggregateOptions } from './AGGREGATE';
 
 export interface FtAggregateWithCursorOptions extends FtAggregateOptions {
diff --git a/packages/search/lib/commands/ALIASADD.ts b/packages/search/lib/commands/ALIASADD.ts
index db8eb54326..c35e60bed4 100644
--- a/packages/search/lib/commands/ALIASADD.ts
+++ b/packages/search/lib/commands/ALIASADD.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/ALIASDEL.ts b/packages/search/lib/commands/ALIASDEL.ts
index 3e4b70a194..9a2dbda4b9 100644
--- a/packages/search/lib/commands/ALIASDEL.ts
+++ b/packages/search/lib/commands/ALIASDEL.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/ALIASUPDATE.ts b/packages/search/lib/commands/ALIASUPDATE.ts
index 46f0aa3e02..3bd5ea92ba 100644
--- a/packages/search/lib/commands/ALIASUPDATE.ts
+++ b/packages/search/lib/commands/ALIASUPDATE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/ALTER.ts b/packages/search/lib/commands/ALTER.ts
index 4cde32e6ad..4a68817bd2 100644
--- a/packages/search/lib/commands/ALTER.ts
+++ b/packages/search/lib/commands/ALTER.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { RediSearchSchema, parseSchema } from './CREATE';
 
 export default {
diff --git a/packages/search/lib/commands/CONFIG_GET.ts b/packages/search/lib/commands/CONFIG_GET.ts
index 9c0be73e2e..ae7a9e0c78 100644
--- a/packages/search/lib/commands/CONFIG_GET.ts
+++ b/packages/search/lib/commands/CONFIG_GET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { ArrayReply, TuplesReply, BlobStringReply, NullReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { ArrayReply, TuplesReply, BlobStringReply, NullReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/CONFIG_SET.ts b/packages/search/lib/commands/CONFIG_SET.ts
index ae57dd7d8f..499b9525aa 100644
--- a/packages/search/lib/commands/CONFIG_SET.ts
+++ b/packages/search/lib/commands/CONFIG_SET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 // using `string & {}` to avoid TS widening the type to `string`
 // TODO
diff --git a/packages/search/lib/commands/CREATE.ts b/packages/search/lib/commands/CREATE.ts
index d0096282f3..5eec979926 100644
--- a/packages/search/lib/commands/CREATE.ts
+++ b/packages/search/lib/commands/CREATE.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument, parseOptionalVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument, parseOptionalVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export const SCHEMA_FIELD_TYPE = {
   TEXT: 'TEXT',
diff --git a/packages/search/lib/commands/CURSOR_DEL.ts b/packages/search/lib/commands/CURSOR_DEL.ts
index 1ea4b46c8b..5f638ebb0e 100644
--- a/packages/search/lib/commands/CURSOR_DEL.ts
+++ b/packages/search/lib/commands/CURSOR_DEL.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument, NumberReply, UnwrapReply } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument, NumberReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/CURSOR_READ.ts b/packages/search/lib/commands/CURSOR_READ.ts
index d23a0f0bd1..e64070122d 100644
--- a/packages/search/lib/commands/CURSOR_READ.ts
+++ b/packages/search/lib/commands/CURSOR_READ.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, NumberReply, UnwrapReply } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, NumberReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
 import AGGREGATE_WITHCURSOR from './AGGREGATE_WITHCURSOR';
 
 export interface FtCursorReadOptions {
diff --git a/packages/search/lib/commands/DICTADD.ts b/packages/search/lib/commands/DICTADD.ts
index 67f94a82c1..2106775f85 100644
--- a/packages/search/lib/commands/DICTADD.ts
+++ b/packages/search/lib/commands/DICTADD.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/DICTDEL.ts b/packages/search/lib/commands/DICTDEL.ts
index 9b0bda3a7a..988af1139e 100644
--- a/packages/search/lib/commands/DICTDEL.ts
+++ b/packages/search/lib/commands/DICTDEL.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/DICTDUMP.ts b/packages/search/lib/commands/DICTDUMP.ts
index 00dd5aba4e..3c223442ec 100644
--- a/packages/search/lib/commands/DICTDUMP.ts
+++ b/packages/search/lib/commands/DICTDUMP.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/DROPINDEX.ts b/packages/search/lib/commands/DROPINDEX.ts
index e7be806ac1..407bdd031a 100644
--- a/packages/search/lib/commands/DROPINDEX.ts
+++ b/packages/search/lib/commands/DROPINDEX.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface FtDropIndexOptions {
   DD?: true;
diff --git a/packages/search/lib/commands/EXPLAIN.ts b/packages/search/lib/commands/EXPLAIN.ts
index deb75229b5..dcd7c3c0d2 100644
--- a/packages/search/lib/commands/EXPLAIN.ts
+++ b/packages/search/lib/commands/EXPLAIN.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { FtSearchParams, parseParamsArgument } from './SEARCH';
 
 export interface FtExplainOptions {
diff --git a/packages/search/lib/commands/EXPLAINCLI.ts b/packages/search/lib/commands/EXPLAINCLI.ts
index 7a4ae3a4b2..5371106705 100644
--- a/packages/search/lib/commands/EXPLAINCLI.ts
+++ b/packages/search/lib/commands/EXPLAINCLI.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/INFO.ts b/packages/search/lib/commands/INFO.ts
index 6792645fe3..cee6ae683c 100644
--- a/packages/search/lib/commands/INFO.ts
+++ b/packages/search/lib/commands/INFO.ts
@@ -1,8 +1,8 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { RedisArgument } from "@redis/client";
-import { ArrayReply, BlobStringReply, Command, DoubleReply, MapReply, NullReply, NumberReply, ReplyUnion, SimpleStringReply, TypeMapping } from "@redis/client/lib/RESP/types";
-import { createTransformTuplesReplyFunc, transformDoubleReply } from "@redis/client/lib/commands/generic-transformers";
-import { TuplesReply } from '@redis/client/lib/RESP/types';
+import { ArrayReply, BlobStringReply, Command, DoubleReply, MapReply, NullReply, NumberReply, ReplyUnion, SimpleStringReply, TypeMapping } from "@redis/client/dist/lib/RESP/types";
+import { createTransformTuplesReplyFunc, transformDoubleReply } from "@redis/client/dist/lib/commands/generic-transformers";
+import { TuplesReply } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/PROFILE_AGGREGATE.ts b/packages/search/lib/commands/PROFILE_AGGREGATE.ts
index 703bfcacc7..ad671c9eb4 100644
--- a/packages/search/lib/commands/PROFILE_AGGREGATE.ts
+++ b/packages/search/lib/commands/PROFILE_AGGREGATE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, ReplyUnion } from "@redis/client/lib/RESP/types";
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, ReplyUnion } from "@redis/client/dist/lib/RESP/types";
 import AGGREGATE, { AggregateRawReply, FtAggregateOptions, parseAggregateOptions } from "./AGGREGATE";
 import { ProfileOptions, ProfileRawReply, ProfileReply, transformProfile } from "./PROFILE_SEARCH";
 
diff --git a/packages/search/lib/commands/PROFILE_SEARCH.ts b/packages/search/lib/commands/PROFILE_SEARCH.ts
index c345e70dd7..86ce85ba7f 100644
--- a/packages/search/lib/commands/PROFILE_SEARCH.ts
+++ b/packages/search/lib/commands/PROFILE_SEARCH.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, RedisArgument, ReplyUnion } from "@redis/client/lib/RESP/types";
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, RedisArgument, ReplyUnion } from "@redis/client/dist/lib/RESP/types";
 import { AggregateReply } from "./AGGREGATE";
 import SEARCH, { FtSearchOptions, SearchRawReply, SearchReply, parseSearchOptions } from "./SEARCH";
 
diff --git a/packages/search/lib/commands/SEARCH.ts b/packages/search/lib/commands/SEARCH.ts
index de03ac0070..c2d2a9d269 100644
--- a/packages/search/lib/commands/SEARCH.ts
+++ b/packages/search/lib/commands/SEARCH.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, ReplyUnion } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument, parseOptionalVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument, parseOptionalVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { RediSearchProperty, RediSearchLanguage } from './CREATE';
 
 export type FtSearchParams = Record<string, RedisArgument | number>;
diff --git a/packages/search/lib/commands/SEARCH_NOCONTENT.ts b/packages/search/lib/commands/SEARCH_NOCONTENT.ts
index a4c6f6a27a..c0a152375d 100644
--- a/packages/search/lib/commands/SEARCH_NOCONTENT.ts
+++ b/packages/search/lib/commands/SEARCH_NOCONTENT.ts
@@ -1,4 +1,4 @@
-import { Command, ReplyUnion } from '@redis/client/lib/RESP/types';
+import { Command, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
 import SEARCH, { SearchRawReply } from './SEARCH';
 
 export default {
diff --git a/packages/search/lib/commands/SPELLCHECK.ts b/packages/search/lib/commands/SPELLCHECK.ts
index 1e6981d01f..ae95b72c24 100644
--- a/packages/search/lib/commands/SPELLCHECK.ts
+++ b/packages/search/lib/commands/SPELLCHECK.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command, ReplyUnion } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command, ReplyUnion } from '@redis/client/dist/lib/RESP/types';
 
 export interface Terms {
   mode: 'INCLUDE' | 'EXCLUDE';
diff --git a/packages/search/lib/commands/SUGADD.ts b/packages/search/lib/commands/SUGADD.ts
index a82f03ffa1..34e5bccb7f 100644
--- a/packages/search/lib/commands/SUGADD.ts
+++ b/packages/search/lib/commands/SUGADD.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface FtSugAddOptions {
   INCR?: boolean;
diff --git a/packages/search/lib/commands/SUGDEL.ts b/packages/search/lib/commands/SUGDEL.ts
index 1cdf56d202..6bc99456d2 100644
--- a/packages/search/lib/commands/SUGDEL.ts
+++ b/packages/search/lib/commands/SUGDEL.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/search/lib/commands/SUGGET.ts b/packages/search/lib/commands/SUGGET.ts
index 607e26df94..e8a3aecdab 100644
--- a/packages/search/lib/commands/SUGGET.ts
+++ b/packages/search/lib/commands/SUGGET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { NullReply, ArrayReply, BlobStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { NullReply, ArrayReply, BlobStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
 
 export interface FtSugGetOptions {
   FUZZY?: boolean;
diff --git a/packages/search/lib/commands/SUGGET_WITHPAYLOADS.ts b/packages/search/lib/commands/SUGGET_WITHPAYLOADS.ts
index b2112bb4b3..60bf5ee86d 100644
--- a/packages/search/lib/commands/SUGGET_WITHPAYLOADS.ts
+++ b/packages/search/lib/commands/SUGGET_WITHPAYLOADS.ts
@@ -1,5 +1,5 @@
-import { NullReply, ArrayReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
-import { isNullReply } from '@redis/client/lib/commands/generic-transformers';
+import { NullReply, ArrayReply, BlobStringReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { isNullReply } from '@redis/client/dist/lib/commands/generic-transformers';
 import SUGGET from './SUGGET';
 
 export default {
diff --git a/packages/search/lib/commands/SUGGET_WITHSCORES.ts b/packages/search/lib/commands/SUGGET_WITHSCORES.ts
index 088153c31f..060e59132d 100644
--- a/packages/search/lib/commands/SUGGET_WITHSCORES.ts
+++ b/packages/search/lib/commands/SUGGET_WITHSCORES.ts
@@ -1,5 +1,5 @@
-import { NullReply, ArrayReply, BlobStringReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '@redis/client/lib/RESP/types';
-import { isNullReply, transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { NullReply, ArrayReply, BlobStringReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { isNullReply, transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 import SUGGET from './SUGGET';
 
 type SuggestScore = {
diff --git a/packages/search/lib/commands/SUGGET_WITHSCORES_WITHPAYLOADS.ts b/packages/search/lib/commands/SUGGET_WITHSCORES_WITHPAYLOADS.ts
index 6f032a1589..0727742033 100644
--- a/packages/search/lib/commands/SUGGET_WITHSCORES_WITHPAYLOADS.ts
+++ b/packages/search/lib/commands/SUGGET_WITHSCORES_WITHPAYLOADS.ts
@@ -1,5 +1,5 @@
-import { NullReply, ArrayReply, BlobStringReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '@redis/client/lib/RESP/types';
-import { isNullReply, transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { NullReply, ArrayReply, BlobStringReply, DoubleReply, UnwrapReply, Command, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { isNullReply, transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 import SUGGET from './SUGGET';
 
 type SuggestScoreWithPayload = {
diff --git a/packages/search/lib/commands/SUGLEN.ts b/packages/search/lib/commands/SUGLEN.ts
index 7437559843..a3f0fbe45e 100644
--- a/packages/search/lib/commands/SUGLEN.ts
+++ b/packages/search/lib/commands/SUGLEN.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: true,
diff --git a/packages/search/lib/commands/SYNDUMP.ts b/packages/search/lib/commands/SYNDUMP.ts
index 0c3b68bf2e..5f454f96fe 100644
--- a/packages/search/lib/commands/SYNDUMP.ts
+++ b/packages/search/lib/commands/SYNDUMP.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, MapReply, BlobStringReply, ArrayReply, UnwrapReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, MapReply, BlobStringReply, ArrayReply, UnwrapReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/SYNUPDATE.ts b/packages/search/lib/commands/SYNUPDATE.ts
index 2baf2ded18..3af735412a 100644
--- a/packages/search/lib/commands/SYNUPDATE.ts
+++ b/packages/search/lib/commands/SYNUPDATE.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { SimpleStringReply, Command, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { SimpleStringReply, Command, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface FtSynUpdateOptions {
   SKIPINITIALSCAN?: boolean;
diff --git a/packages/search/lib/commands/TAGVALS.ts b/packages/search/lib/commands/TAGVALS.ts
index d00d657f3a..0afddb247f 100644
--- a/packages/search/lib/commands/TAGVALS.ts
+++ b/packages/search/lib/commands/TAGVALS.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/search/lib/commands/_LIST.ts b/packages/search/lib/commands/_LIST.ts
index 432eea6479..c1ca8cc2ee 100644
--- a/packages/search/lib/commands/_LIST.ts
+++ b/packages/search/lib/commands/_LIST.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { ArrayReply, SetReply, BlobStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/test-utils/lib/dockers.ts b/packages/test-utils/lib/dockers.ts
index e8d7ad45ca..a1cb63eb7b 100644
--- a/packages/test-utils/lib/dockers.ts
+++ b/packages/test-utils/lib/dockers.ts
@@ -2,7 +2,7 @@ import { createConnection } from 'node:net';
 import { once } from 'node:events';
 import { createClient } from '@redis/client/index';
 import { setTimeout } from 'node:timers/promises';
-// import { ClusterSlotsReply } from '@redis/client/lib/commands/CLUSTER_SLOTS';
+// import { ClusterSlotsReply } from '@redis/client/dist/lib/commands/CLUSTER_SLOTS';
 import { promisify } from 'node:util';
 import { exec } from 'node:child_process';
 const execAsync = promisify(exec);
diff --git a/packages/time-series/lib/commands/ADD.ts b/packages/time-series/lib/commands/ADD.ts
index f79a27c5db..e7626d227d 100644
--- a/packages/time-series/lib/commands/ADD.ts
+++ b/packages/time-series/lib/commands/ADD.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 import {
   transformTimestampArgument,
   parseRetentionArgument,
diff --git a/packages/time-series/lib/commands/ALTER.ts b/packages/time-series/lib/commands/ALTER.ts
index 8217e81c21..f7f6948da7 100644
--- a/packages/time-series/lib/commands/ALTER.ts
+++ b/packages/time-series/lib/commands/ALTER.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { TsCreateOptions } from './CREATE';
 import { parseRetentionArgument, parseChunkSizeArgument, parseDuplicatePolicy, parseLabelsArgument, parseIgnoreArgument } from '.';
 
diff --git a/packages/time-series/lib/commands/CREATE.ts b/packages/time-series/lib/commands/CREATE.ts
index 86defd1e0a..39f35c06ed 100644
--- a/packages/time-series/lib/commands/CREATE.ts
+++ b/packages/time-series/lib/commands/CREATE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 import {
   parseRetentionArgument,
   TimeSeriesEncoding,
diff --git a/packages/time-series/lib/commands/CREATERULE.ts b/packages/time-series/lib/commands/CREATERULE.ts
index 99a8a4c9d5..1e4f38c6ee 100644
--- a/packages/time-series/lib/commands/CREATERULE.ts
+++ b/packages/time-series/lib/commands/CREATERULE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export const TIME_SERIES_AGGREGATION_TYPE = {
   AVG: 'AVG',
diff --git a/packages/time-series/lib/commands/DECRBY.ts b/packages/time-series/lib/commands/DECRBY.ts
index c2a7e6abd9..8ff09d926c 100644
--- a/packages/time-series/lib/commands/DECRBY.ts
+++ b/packages/time-series/lib/commands/DECRBY.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import INCRBY, { parseIncrByArguments } from './INCRBY';
 
 export default {
diff --git a/packages/time-series/lib/commands/DEL.ts b/packages/time-series/lib/commands/DEL.ts
index ad957e6c40..fc96c989b1 100644
--- a/packages/time-series/lib/commands/DEL.ts
+++ b/packages/time-series/lib/commands/DEL.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { Timestamp, transformTimestampArgument } from '.';
-import { RedisArgument, NumberReply, Command, } from '@redis/client/lib/RESP/types';
+import { RedisArgument, NumberReply, Command, } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/time-series/lib/commands/DELETERULE.ts b/packages/time-series/lib/commands/DELETERULE.ts
index 8a1aa41385..b4e47a0fba 100644
--- a/packages/time-series/lib/commands/DELETERULE.ts
+++ b/packages/time-series/lib/commands/DELETERULE.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, SimpleStringReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, SimpleStringReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export default {
   IS_READ_ONLY: false,
diff --git a/packages/time-series/lib/commands/GET.ts b/packages/time-series/lib/commands/GET.ts
index 9f165bed6e..c1bb2c1c74 100644
--- a/packages/time-series/lib/commands/GET.ts
+++ b/packages/time-series/lib/commands/GET.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, TuplesReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, TuplesReply, NumberReply, DoubleReply, UnwrapReply, Resp2Reply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface TsGetOptions {
   LATEST?: boolean;
diff --git a/packages/time-series/lib/commands/INCRBY.ts b/packages/time-series/lib/commands/INCRBY.ts
index 7dbdb6b9ea..e62ec42690 100644
--- a/packages/time-series/lib/commands/INCRBY.ts
+++ b/packages/time-series/lib/commands/INCRBY.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, NumberReply, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, NumberReply, Command } from '@redis/client/dist/lib/RESP/types';
 import { Timestamp, transformTimestampArgument, parseRetentionArgument, parseChunkSizeArgument, Labels, parseLabelsArgument, parseIgnoreArgument } from '.';
 import { TsIgnoreOptions } from './ADD';
 
diff --git a/packages/time-series/lib/commands/INFO.ts b/packages/time-series/lib/commands/INFO.ts
index fbd66875b1..fe0e49e095 100644
--- a/packages/time-series/lib/commands/INFO.ts
+++ b/packages/time-series/lib/commands/INFO.ts
@@ -1,8 +1,8 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { ArrayReply, BlobStringReply, Command, DoubleReply, NumberReply, ReplyUnion, SimpleStringReply, TypeMapping } from "@redis/client/lib/RESP/types";
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { ArrayReply, BlobStringReply, Command, DoubleReply, NumberReply, ReplyUnion, SimpleStringReply, TypeMapping } from "@redis/client/dist/lib/RESP/types";
 import { TimeSeriesDuplicatePolicies } from ".";
 import { TimeSeriesAggregationType } from "./CREATERULE";
-import { transformDoubleReply } from '@redis/client/lib/commands/generic-transformers';
+import { transformDoubleReply } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export type InfoRawReplyTypes = SimpleStringReply | 
   NumberReply | 
diff --git a/packages/time-series/lib/commands/INFO_DEBUG.ts b/packages/time-series/lib/commands/INFO_DEBUG.ts
index bee1147f2b..89d66a36ef 100644
--- a/packages/time-series/lib/commands/INFO_DEBUG.ts
+++ b/packages/time-series/lib/commands/INFO_DEBUG.ts
@@ -1,5 +1,5 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { BlobStringReply, Command, NumberReply, SimpleStringReply, TypeMapping, ReplyUnion } from "@redis/client/lib/RESP/types";
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { BlobStringReply, Command, NumberReply, SimpleStringReply, TypeMapping, ReplyUnion } from "@redis/client/dist/lib/RESP/types";
 import INFO, { InfoRawReply, InfoRawReplyTypes, InfoReply } from "./INFO";
 
 type chunkType = Array<[
diff --git a/packages/time-series/lib/commands/MADD.ts b/packages/time-series/lib/commands/MADD.ts
index cb1f077055..5af94d6d49 100644
--- a/packages/time-series/lib/commands/MADD.ts
+++ b/packages/time-series/lib/commands/MADD.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
 import { Timestamp, transformTimestampArgument } from '.';
-import { ArrayReply, NumberReply, SimpleErrorReply, Command } from '@redis/client/lib/RESP/types';
+import { ArrayReply, NumberReply, SimpleErrorReply, Command } from '@redis/client/dist/lib/RESP/types';
 
 export interface TsMAddSample {
   key: string;
diff --git a/packages/time-series/lib/commands/MGET.ts b/packages/time-series/lib/commands/MGET.ts
index add742a70d..fa4e3fc63d 100644
--- a/packages/time-series/lib/commands/MGET.ts
+++ b/packages/time-series/lib/commands/MGET.ts
@@ -1,7 +1,7 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, BlobStringReply, ArrayReply, Resp2Reply, MapReply, TuplesReply, TypeMapping } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, BlobStringReply, ArrayReply, Resp2Reply, MapReply, TuplesReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
 import { resp2MapToValue, resp3MapToValue, SampleRawReply, transformSampleReply } from '.';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export interface TsMGetOptions {
   LATEST?: boolean;
diff --git a/packages/time-series/lib/commands/MGET_SELECTED_LABELS.ts b/packages/time-series/lib/commands/MGET_SELECTED_LABELS.ts
index 67c7dc7960..e93b517f80 100644
--- a/packages/time-series/lib/commands/MGET_SELECTED_LABELS.ts
+++ b/packages/time-series/lib/commands/MGET_SELECTED_LABELS.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, BlobStringReply, NullReply } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, BlobStringReply, NullReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { TsMGetOptions, parseLatestArgument, parseFilterArgument } from './MGET';
 import { parseSelectedLabelsArguments } from '.';
 import { createTransformMGetLabelsReply } from './MGET_WITHLABELS';
diff --git a/packages/time-series/lib/commands/MGET_WITHLABELS.ts b/packages/time-series/lib/commands/MGET_WITHLABELS.ts
index f6d50c91b1..38b8442db3 100644
--- a/packages/time-series/lib/commands/MGET_WITHLABELS.ts
+++ b/packages/time-series/lib/commands/MGET_WITHLABELS.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, BlobStringReply, ArrayReply, Resp2Reply, MapReply, TuplesReply, TypeMapping } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, BlobStringReply, ArrayReply, Resp2Reply, MapReply, TuplesReply, TypeMapping } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { TsMGetOptions, parseLatestArgument, parseFilterArgument } from './MGET';
 import { RawLabelValue, resp2MapToValue, resp3MapToValue, SampleRawReply, transformRESP2Labels, transformSampleReply } from '.';
 
diff --git a/packages/time-series/lib/commands/MRANGE.ts b/packages/time-series/lib/commands/MRANGE.ts
index dbe48d6f54..95fa5297bd 100644
--- a/packages/time-series/lib/commands/MRANGE.ts
+++ b/packages/time-series/lib/commands/MRANGE.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { resp2MapToValue, resp3MapToValue, SampleRawReply, Timestamp, transformSamplesReply } from '.';
 import { TsRangeOptions, parseRangeArguments } from './RANGE';
 import { parseFilterArgument } from './MGET';
diff --git a/packages/time-series/lib/commands/MRANGE_GROUPBY.ts b/packages/time-series/lib/commands/MRANGE_GROUPBY.ts
index 0d996521d1..5ccd61b2a2 100644
--- a/packages/time-series/lib/commands/MRANGE_GROUPBY.ts
+++ b/packages/time-series/lib/commands/MRANGE_GROUPBY.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument, TuplesToMapReply, UnwrapReply } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument, TuplesToMapReply, UnwrapReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { resp2MapToValue, resp3MapToValue, SampleRawReply, Timestamp, transformSamplesReply } from '.';
 import { TsRangeOptions, parseRangeArguments } from './RANGE';
 import { parseFilterArgument } from './MGET';
diff --git a/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS.ts b/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS.ts
index 115944a2f4..643b57a67e 100644
--- a/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS.ts
+++ b/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, NullReply, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, NullReply, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { parseSelectedLabelsArguments, resp2MapToValue, resp3MapToValue, SampleRawReply, Timestamp, transformRESP2Labels, transformSamplesReply } from '.';
 import { TsRangeOptions, parseRangeArguments } from './RANGE';
 import { parseFilterArgument } from './MGET';
diff --git a/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS_GROUPBY.ts b/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS_GROUPBY.ts
index b4e8006a84..c5cf1ef56c 100644
--- a/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS_GROUPBY.ts
+++ b/packages/time-series/lib/commands/MRANGE_SELECTED_LABELS_GROUPBY.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, ArrayReply, BlobStringReply, MapReply, TuplesReply, RedisArgument, NullReply } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, ArrayReply, BlobStringReply, MapReply, TuplesReply, RedisArgument, NullReply } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { parseSelectedLabelsArguments, resp3MapToValue, SampleRawReply, Timestamp, transformSamplesReply } from '.';
 import { TsRangeOptions, parseRangeArguments } from './RANGE';
 import { extractResp3MRangeSources, parseGroupByArguments, TsMRangeGroupBy, TsMRangeGroupByRawMetadataReply3 } from './MRANGE_GROUPBY';
diff --git a/packages/time-series/lib/commands/MRANGE_WITHLABELS.ts b/packages/time-series/lib/commands/MRANGE_WITHLABELS.ts
index 04d72411b7..19641596a6 100644
--- a/packages/time-series/lib/commands/MRANGE_WITHLABELS.ts
+++ b/packages/time-series/lib/commands/MRANGE_WITHLABELS.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, UnwrapReply, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, UnwrapReply, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { resp2MapToValue, resp3MapToValue, SampleRawReply, Timestamp, transformSamplesReply } from '.';
 import { TsRangeOptions, parseRangeArguments } from './RANGE';
 import { parseFilterArgument } from './MGET';
diff --git a/packages/time-series/lib/commands/MRANGE_WITHLABELS_GROUPBY.ts b/packages/time-series/lib/commands/MRANGE_WITHLABELS_GROUPBY.ts
index f09d630dcd..ff0065e22b 100644
--- a/packages/time-series/lib/commands/MRANGE_WITHLABELS_GROUPBY.ts
+++ b/packages/time-series/lib/commands/MRANGE_WITHLABELS_GROUPBY.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { Command, ArrayReply, BlobStringReply, Resp2Reply, MapReply, TuplesReply, TypeMapping, RedisArgument } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 import { resp2MapToValue, resp3MapToValue, SampleRawReply, Timestamp, transformRESP2LabelsWithSources, transformSamplesReply } from '.';
 import { TsRangeOptions, parseRangeArguments } from './RANGE';
 import { extractResp3MRangeSources, parseGroupByArguments, TsMRangeGroupBy, TsMRangeGroupByRawMetadataReply3 } from './MRANGE_GROUPBY';
diff --git a/packages/time-series/lib/commands/MREVRANGE.ts b/packages/time-series/lib/commands/MREVRANGE.ts
index e2ed6d9cc9..99d3123dd2 100644
--- a/packages/time-series/lib/commands/MREVRANGE.ts
+++ b/packages/time-series/lib/commands/MREVRANGE.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import MRANGE, { createTransformMRangeArguments } from './MRANGE';
 
 export default {
diff --git a/packages/time-series/lib/commands/MREVRANGE_GROUPBY.ts b/packages/time-series/lib/commands/MREVRANGE_GROUPBY.ts
index efdd1acdcf..4afcd11350 100644
--- a/packages/time-series/lib/commands/MREVRANGE_GROUPBY.ts
+++ b/packages/time-series/lib/commands/MREVRANGE_GROUPBY.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import MRANGE_GROUPBY, { createTransformMRangeGroupByArguments } from './MRANGE_GROUPBY';
 
 export default {
diff --git a/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS.ts b/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS.ts
index 8b679e65b6..10e00fc7a2 100644
--- a/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS.ts
+++ b/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import MRANGE_SELECTED_LABELS, { createTransformMRangeSelectedLabelsArguments } from './MRANGE_SELECTED_LABELS';
 
 export default {
diff --git a/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS_GROUPBY.ts b/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS_GROUPBY.ts
index d01ebe1033..b000c04c18 100644
--- a/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS_GROUPBY.ts
+++ b/packages/time-series/lib/commands/MREVRANGE_SELECTED_LABELS_GROUPBY.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import MRANGE_SELECTED_LABELS_GROUPBY, { createMRangeSelectedLabelsGroupByTransformArguments } from './MRANGE_SELECTED_LABELS_GROUPBY';
 
 export default {
diff --git a/packages/time-series/lib/commands/MREVRANGE_WITHLABELS.ts b/packages/time-series/lib/commands/MREVRANGE_WITHLABELS.ts
index d4f6255592..6cde143c42 100644
--- a/packages/time-series/lib/commands/MREVRANGE_WITHLABELS.ts
+++ b/packages/time-series/lib/commands/MREVRANGE_WITHLABELS.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import MRANGE_WITHLABELS, { createTransformMRangeWithLabelsArguments } from './MRANGE_WITHLABELS';
 
 export default {
diff --git a/packages/time-series/lib/commands/MREVRANGE_WITHLABELS_GROUPBY.ts b/packages/time-series/lib/commands/MREVRANGE_WITHLABELS_GROUPBY.ts
index ed43d0eae6..4727112b97 100644
--- a/packages/time-series/lib/commands/MREVRANGE_WITHLABELS_GROUPBY.ts
+++ b/packages/time-series/lib/commands/MREVRANGE_WITHLABELS_GROUPBY.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import MRANGE_WITHLABELS_GROUPBY, { createMRangeWithLabelsGroupByTransformArguments } from './MRANGE_WITHLABELS_GROUPBY';
 
 export default {
diff --git a/packages/time-series/lib/commands/QUERYINDEX.ts b/packages/time-series/lib/commands/QUERYINDEX.ts
index 6962580197..1b53e84b7a 100644
--- a/packages/time-series/lib/commands/QUERYINDEX.ts
+++ b/packages/time-series/lib/commands/QUERYINDEX.ts
@@ -1,6 +1,6 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { ArrayReply, BlobStringReply, SetReply, Command } from '@redis/client/lib/RESP/types';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { ArrayReply, BlobStringReply, SetReply, Command } from '@redis/client/dist/lib/RESP/types';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
 
 export default {
   NOT_KEYED_COMMAND: true,
diff --git a/packages/time-series/lib/commands/RANGE.ts b/packages/time-series/lib/commands/RANGE.ts
index ef4c79fe60..f7f808cecd 100644
--- a/packages/time-series/lib/commands/RANGE.ts
+++ b/packages/time-series/lib/commands/RANGE.ts
@@ -1,8 +1,8 @@
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RedisArgument, Command } from '@redis/client/lib/RESP/types';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RedisArgument, Command } from '@redis/client/dist/lib/RESP/types';
 import { Timestamp, transformTimestampArgument, SamplesRawReply, transformSamplesReply } from '.';
 import { TimeSeriesAggregationType } from './CREATERULE';
-import { Resp2Reply } from '@redis/client/lib/RESP/types';
+import { Resp2Reply } from '@redis/client/dist/lib/RESP/types';
 
 export const TIME_SERIES_BUCKET_TIMESTAMP = {
   LOW: '-',
diff --git a/packages/time-series/lib/commands/REVRANGE.ts b/packages/time-series/lib/commands/REVRANGE.ts
index 24a31a785a..238b2ce9fe 100644
--- a/packages/time-series/lib/commands/REVRANGE.ts
+++ b/packages/time-series/lib/commands/REVRANGE.ts
@@ -1,4 +1,4 @@
-import { Command } from '@redis/client/lib/RESP/types';
+import { Command } from '@redis/client/dist/lib/RESP/types';
 import RANGE, { transformRangeArguments } from './RANGE';
 
 export default {
diff --git a/packages/time-series/lib/commands/index.ts b/packages/time-series/lib/commands/index.ts
index e0389a60a2..f340861cb9 100644
--- a/packages/time-series/lib/commands/index.ts
+++ b/packages/time-series/lib/commands/index.ts
@@ -1,4 +1,4 @@
-import type { DoubleReply, NumberReply, RedisCommands, TuplesReply, UnwrapReply, Resp2Reply, ArrayReply, BlobStringReply, MapReply, NullReply, TypeMapping, ReplyUnion, RespType } from '@redis/client/lib/RESP/types';
+import type { DoubleReply, NumberReply, RedisCommands, TuplesReply, UnwrapReply, Resp2Reply, ArrayReply, BlobStringReply, MapReply, NullReply, TypeMapping, ReplyUnion, RespType } from '@redis/client/dist/lib/RESP/types';
 import ADD, { TsIgnoreOptions } from './ADD';
 import ALTER from './ALTER';
 import CREATE from './CREATE';
@@ -29,9 +29,9 @@ import MREVRANGE from './MREVRANGE';
 import QUERYINDEX from './QUERYINDEX';
 import RANGE from './RANGE';
 import REVRANGE from './REVRANGE';
-import { RedisVariadicArgument } from '@redis/client/lib/commands/generic-transformers';
-import { CommandParser } from '@redis/client/lib/client/parser';
-import { RESP_TYPES } from '@redis/client/lib/RESP/decoder';
+import { RedisVariadicArgument } from '@redis/client/dist/lib/commands/generic-transformers';
+import { CommandParser } from '@redis/client/dist/lib/client/parser';
+import { RESP_TYPES } from '@redis/client/dist/lib/RESP/decoder';
 
 export default {
   ADD,