diff --git a/packages/lumos/.gitignore b/packages/lumos/.gitignore
index 4d8ef3e74..516d246c9 100644
--- a/packages/lumos/.gitignore
+++ b/packages/lumos/.gitignore
@@ -1,6 +1,6 @@
 *
 !src
-!src/*
+!src/**/*
 !.gitignore
 !.npmignore
 !CHANGELOG.md
diff --git a/packages/lumos/src/base/index.ts b/packages/lumos/src/base/index.ts
new file mode 100644
index 000000000..fe2423c1d
--- /dev/null
+++ b/packages/lumos/src/base/index.ts
@@ -0,0 +1,2 @@
+export * from "./types";
+export * as since from "./since";
diff --git a/packages/lumos/src/base/since.ts b/packages/lumos/src/base/since.ts
new file mode 100644
index 000000000..366617b33
--- /dev/null
+++ b/packages/lumos/src/base/since.ts
@@ -0,0 +1,15 @@
+export {
+  type EpochSinceValue,
+  type SinceValidationInfo,
+  type SinceType,
+  generateSince,
+  generateAbsoluteEpochSince,
+  generateHeaderEpoch,
+  parseAbsoluteEpochSince,
+  parseSinceCompatible,
+  parseEpoch,
+  parseSince,
+  validateAbsoluteEpochSince,
+  validateSince,
+  maximumAbsoluteEpochSince,
+} from "@ckb-lumos/base/lib/since";
diff --git a/packages/lumos/src/base/types.ts b/packages/lumos/src/base/types.ts
new file mode 100644
index 000000000..99f7fe53e
--- /dev/null
+++ b/packages/lumos/src/base/types.ts
@@ -0,0 +1,26 @@
+export {
+  type Script,
+  type Cell,
+  type RawTransaction,
+  type Transaction,
+  type OutPoint,
+  type CellDep,
+  type WitnessArgs,
+  type Header,
+  type Block,
+  type HashType,
+  type DepType,
+  type Input,
+  type Output,
+} from "@ckb-lumos/base/lib/api";
+
+export {
+  type Address,
+  type Hash,
+  type HexNumber,
+  type HexString,
+  type Hexadecimal,
+  type HexadecimalRange,
+  type PackedDao,
+  type PackedSince,
+} from "@ckb-lumos/base/lib/primitive";
diff --git a/packages/lumos/src/bi.ts b/packages/lumos/src/bi.ts
new file mode 100644
index 000000000..c6cd56b36
--- /dev/null
+++ b/packages/lumos/src/bi.ts
@@ -0,0 +1 @@
+export { BI, parseUnit, formatUnit, isBIish, type BIish } from "@ckb-lumos/bi";
diff --git a/packages/lumos/src/ckb-indexer.ts b/packages/lumos/src/ckb-indexer.ts
new file mode 100644
index 000000000..17ade941c
--- /dev/null
+++ b/packages/lumos/src/ckb-indexer.ts
@@ -0,0 +1,7 @@
+export {
+  Indexer,
+  TransactionCollector,
+  CellCollector,
+} from "@ckb-lumos/ckb-indexer";
+
+export { type QueryOptions } from "@ckb-lumos/base";
diff --git a/packages/lumos/src/codec/index.ts b/packages/lumos/src/codec/index.ts
index 2bb8b9718..a900e9ac6 100644
--- a/packages/lumos/src/codec/index.ts
+++ b/packages/lumos/src/codec/index.ts
@@ -65,4 +65,4 @@ export {
   isFixedCodec,
 } from "@ckb-lumos/codec";
 
-export { blockchain } from "@ckb-lumos/base";
+export * as blockchain from "./blockchain";
diff --git a/packages/lumos/src/hd.ts b/packages/lumos/src/hd.ts
new file mode 100644
index 000000000..55ce41a1f
--- /dev/null
+++ b/packages/lumos/src/hd.ts
@@ -0,0 +1 @@
+export * from "@ckb-lumos/hd";
diff --git a/packages/lumos/src/light-client.ts b/packages/lumos/src/light-client.ts
new file mode 100644
index 000000000..5b84960c1
--- /dev/null
+++ b/packages/lumos/src/light-client.ts
@@ -0,0 +1 @@
+export { LightClientRPC } from "@ckb-lumos/light-client";
diff --git a/packages/lumos/src/rpc.ts b/packages/lumos/src/rpc.ts
index 0a1ecb7fe..0c424819d 100644
--- a/packages/lumos/src/rpc.ts
+++ b/packages/lumos/src/rpc.ts
@@ -1,4 +1,5 @@
 export { RPC, CKBRPC, ParamsFormatter, ResultFormatter } from "@ckb-lumos/rpc";
-export type { Base } from "@ckb-lumos/rpc/lib/Base";
+export { Method } from "@ckb-lumos/rpc/lib/method";
+export { Base } from "@ckb-lumos/rpc/lib/Base";
 export type { RPC as RPCTypes } from "@ckb-lumos/rpc/lib/types/rpc";
 export type { CKBComponents } from "@ckb-lumos/rpc/lib/types/api";
diff --git a/packages/lumos/src/utils.ts b/packages/lumos/src/utils.ts
index 28ef646d9..e92496462 100644
--- a/packages/lumos/src/utils.ts
+++ b/packages/lumos/src/utils.ts
@@ -5,6 +5,7 @@ export {
   assertHexadecimal,
   computeScriptHash,
   generateTypeIdScript,
+  ckbHash160,
 } from "@ckb-lumos/base/lib/utils";
 
 export { parseUnit, formatUnit } from "@ckb-lumos/bi";