diff --git a/src/chains/index.ts b/src/chains/index.ts
index d7c6291..7bd6388 100644
--- a/src/chains/index.ts
+++ b/src/chains/index.ts
@@ -3,7 +3,7 @@ import { registerBitcoinTools } from "./UTXO/bitcoin"
 import { registerLitecoinTools } from "./UTXO/litecoin"
 import { registerDogecoinTools } from "./UTXO/dogecoin"
 import { registerBitcoinCashTools } from "./UTXO/bitcoincash"
-import { registerThorchainTools } from "./thorchain"
+import { registerThorchainTools } from "./thorchain/thorchain"
 
 // Export all UTXO tools registration function
 export function registerUtxoTools(server: McpServer) {
diff --git a/src/chains/jupiter.ts b/src/chains/solana/jupiter.ts
similarity index 100%
rename from src/chains/jupiter.ts
rename to src/chains/solana/jupiter.ts
diff --git a/src/chains/solana.ts b/src/chains/solana/solana.ts
similarity index 100%
rename from src/chains/solana.ts
rename to src/chains/solana/solana.ts
diff --git a/src/chains/thorchain.ts b/src/chains/thorchain/thorchain.ts
similarity index 100%
rename from src/chains/thorchain.ts
rename to src/chains/thorchain/thorchain.ts
diff --git a/src/index.ts b/src/index.ts
index a4edb90..6b29ba1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -22,7 +22,7 @@ if (result.error) {
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { registerSolanaTools } from "./chains/solana.js";
+import { registerSolanaTools } from "./chains/solana/solana.js";
 import { registerEvmTools } from "./chains/evm/evm.js";
 import { 
   registerBitcoinTools,
@@ -30,7 +30,7 @@ import {
   registerDogecoinTools,
   registerBitcoinCashTools,
 } from "./chains/UTXO/index.js";
-import { registerThorchainTools } from "./chains/thorchain.js";
+import { registerThorchainTools } from "./chains/thorchain/thorchain.js";
 
 // Create server instance
 const server = new McpServer({