diff --git a/src/actions/onsol/getAllDomainsTLDs.ts b/src/actions/alldomains/getAllDomainsTLDs.ts
similarity index 100%
rename from src/actions/onsol/getAllDomainsTLDs.ts
rename to src/actions/alldomains/getAllDomainsTLDs.ts
diff --git a/src/actions/onsol/getOwnedAllDomains.ts b/src/actions/alldomains/getOwnedAllDomains.ts
similarity index 100%
rename from src/actions/onsol/getOwnedAllDomains.ts
rename to src/actions/alldomains/getOwnedAllDomains.ts
diff --git a/src/actions/onsol/getOwnedDomainsForTLD.ts b/src/actions/alldomains/getOwnedDomainsForTLD.ts
similarity index 100%
rename from src/actions/onsol/getOwnedDomainsForTLD.ts
rename to src/actions/alldomains/getOwnedDomainsForTLD.ts
diff --git a/src/actions/onsol/resolveDomain.ts b/src/actions/alldomains/resolveDomain.ts
similarity index 100%
rename from src/actions/onsol/resolveDomain.ts
rename to src/actions/alldomains/resolveDomain.ts
diff --git a/src/actions/index.ts b/src/actions/index.ts
index 0718c6b..e878aa1 100644
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -5,24 +5,24 @@ import deployCollectionAction from "./metaplex/deployCollection";
 import mintNFTAction from "./metaplex/mintNFT";
 import tradeAction from "./jupiter/trade";
 import requestFundsAction from "./solana/requestFunds";
-import resolveDomainAction from "./bonfida/registerDomain";
+import resolveDomainAction from "./sns/registerDomain";
 import getTokenDataAction from "./jupiter/getTokenData";
 import getTPSAction from "./solana/getTPS";
 import fetchPriceAction from "./jupiter/fetchPrice";
 import stakeWithJupAction from "./jupiter/stakeWithJup";
 import stakeWithSolayerAction from "./solayer/stakeWithSolayer";
-import registerDomainAction from "./bonfida/registerDomain";
+import registerDomainAction from "./sns/registerDomain";
 import lendAssetAction from "./lulo/lendAsset";
 import createGibworkTaskAction from "./gibwork/createGibworkTask";
-import resolveSolDomainAction from "./bonfida/resolveSolDomain";
+import resolveSolDomainAction from "./sns/resolveSolDomain";
 import pythFetchPriceAction from "./pyth/pythFetchPrice";
-import getOwnedDomainsForTLDAction from "./onsol/getOwnedDomainsForTLD";
-import getPrimaryDomainAction from "./bonfida/getPrimaryDomain";
-import getAllDomainsTLDsAction from "./onsol/getAllDomainsTLDs";
-import getOwnedAllDomainsAction from "./onsol/getOwnedAllDomains";
+import getOwnedDomainsForTLDAction from "./alldomains/getOwnedDomainsForTLD";
+import getPrimaryDomainAction from "./sns/getPrimaryDomain";
+import getAllDomainsTLDsAction from "./alldomains/getAllDomainsTLDs";
+import getOwnedAllDomainsAction from "./alldomains/getOwnedAllDomains";
 import createImageAction from "./agent/createImage";
-import getMainAllDomainsDomainAction from "./bonfida/getMainAllDomainsDomain";
-import getAllRegisteredAllDomainsAction from "./bonfida/getAllRegisteredAllDomains";
+import getMainAllDomainsDomainAction from "./sns/getMainAllDomainsDomain";
+import getAllRegisteredAllDomainsAction from "./sns/getAllRegisteredAllDomains";
 import raydiumCreateCpmmAction from "./raydium/raydiumCreateCpmm";
 import raydiumCreateAmmV4Action from "./raydium/raydiumCreateAmmV4";
 import createOrcaSingleSidedWhirlpoolAction from "./orca/createOrcaSingleSidedWhirlpool";
diff --git a/src/actions/bonfida/getAllRegisteredAllDomains.ts b/src/actions/sns/getAllRegisteredAllDomains.ts
similarity index 100%
rename from src/actions/bonfida/getAllRegisteredAllDomains.ts
rename to src/actions/sns/getAllRegisteredAllDomains.ts
diff --git a/src/actions/bonfida/getMainAllDomainsDomain.ts b/src/actions/sns/getMainAllDomainsDomain.ts
similarity index 100%
rename from src/actions/bonfida/getMainAllDomainsDomain.ts
rename to src/actions/sns/getMainAllDomainsDomain.ts
diff --git a/src/actions/bonfida/getPrimaryDomain.ts b/src/actions/sns/getPrimaryDomain.ts
similarity index 100%
rename from src/actions/bonfida/getPrimaryDomain.ts
rename to src/actions/sns/getPrimaryDomain.ts
diff --git a/src/actions/bonfida/registerDomain.ts b/src/actions/sns/registerDomain.ts
similarity index 100%
rename from src/actions/bonfida/registerDomain.ts
rename to src/actions/sns/registerDomain.ts
diff --git a/src/actions/bonfida/resolveSolDomain.ts b/src/actions/sns/resolveSolDomain.ts
similarity index 100%
rename from src/actions/bonfida/resolveSolDomain.ts
rename to src/actions/sns/resolveSolDomain.ts
diff --git a/src/langchain/onsol/get_all_tld.ts b/src/langchain/alldomains/get_all_tld.ts
similarity index 100%
rename from src/langchain/onsol/get_all_tld.ts
rename to src/langchain/alldomains/get_all_tld.ts
diff --git a/src/langchain/onsol/index.ts b/src/langchain/alldomains/index.ts
similarity index 100%
rename from src/langchain/onsol/index.ts
rename to src/langchain/alldomains/index.ts
diff --git a/src/langchain/onsol/owned_domains.ts b/src/langchain/alldomains/owned_domains.ts
similarity index 100%
rename from src/langchain/onsol/owned_domains.ts
rename to src/langchain/alldomains/owned_domains.ts
diff --git a/src/langchain/onsol/resolve_all_domains.ts b/src/langchain/alldomains/resolve_all_domains.ts
similarity index 100%
rename from src/langchain/onsol/resolve_all_domains.ts
rename to src/langchain/alldomains/resolve_all_domains.ts
diff --git a/src/langchain/onsol/tld_domains.ts b/src/langchain/alldomains/tld_domains.ts
similarity index 100%
rename from src/langchain/onsol/tld_domains.ts
rename to src/langchain/alldomains/tld_domains.ts
diff --git a/src/langchain/index.ts b/src/langchain/index.ts
index 76efb18..c2e5aff 100644
--- a/src/langchain/index.ts
+++ b/src/langchain/index.ts
@@ -1,7 +1,7 @@
 export * from "./adrena";
-export * from "./onsol";
+export * from "./alldomains";
 export * from "./dexscreener";
-export * from "./onsol";
+export * from "./alldomains";
 export * from "./flash";
 export * from "./gibwork";
 export * from "./jupiter";
@@ -21,7 +21,7 @@ export * from "./solayer";
 export * from "./tensor";
 export * from "./3land";
 export * from "./tiplink";
-export * from "./bonfida";
+export * from "./sns";
 export * from "./lightprotocol";
 
 import { SolanaAgentKit } from "../agent";
diff --git a/src/langchain/bonfida/get_domain.ts b/src/langchain/sns/get_domain.ts
similarity index 100%
rename from src/langchain/bonfida/get_domain.ts
rename to src/langchain/sns/get_domain.ts
diff --git a/src/langchain/bonfida/index.ts b/src/langchain/sns/index.ts
similarity index 100%
rename from src/langchain/bonfida/index.ts
rename to src/langchain/sns/index.ts
diff --git a/src/langchain/bonfida/main_domain.ts b/src/langchain/sns/main_domain.ts
similarity index 100%
rename from src/langchain/bonfida/main_domain.ts
rename to src/langchain/sns/main_domain.ts
diff --git a/src/langchain/bonfida/register_domain.ts b/src/langchain/sns/register_domain.ts
similarity index 100%
rename from src/langchain/bonfida/register_domain.ts
rename to src/langchain/sns/register_domain.ts
diff --git a/src/langchain/bonfida/resolve_domain.ts b/src/langchain/sns/resolve_domain.ts
similarity index 100%
rename from src/langchain/bonfida/resolve_domain.ts
rename to src/langchain/sns/resolve_domain.ts
diff --git a/src/tools/onsol/get_all_domains_tlds.ts b/src/tools/alldomains/get_all_domains_tlds.ts
similarity index 100%
rename from src/tools/onsol/get_all_domains_tlds.ts
rename to src/tools/alldomains/get_all_domains_tlds.ts
diff --git a/src/tools/onsol/get_owned_all_domains.ts b/src/tools/alldomains/get_owned_all_domains.ts
similarity index 100%
rename from src/tools/onsol/get_owned_all_domains.ts
rename to src/tools/alldomains/get_owned_all_domains.ts
diff --git a/src/tools/onsol/get_owned_domains_for_tld.ts b/src/tools/alldomains/get_owned_domains_for_tld.ts
similarity index 100%
rename from src/tools/onsol/get_owned_domains_for_tld.ts
rename to src/tools/alldomains/get_owned_domains_for_tld.ts
diff --git a/src/tools/onsol/index.ts b/src/tools/alldomains/index.ts
similarity index 100%
rename from src/tools/onsol/index.ts
rename to src/tools/alldomains/index.ts
diff --git a/src/tools/onsol/resolve_domain.ts b/src/tools/alldomains/resolve_domain.ts
similarity index 100%
rename from src/tools/onsol/resolve_domain.ts
rename to src/tools/alldomains/resolve_domain.ts
diff --git a/src/tools/index.ts b/src/tools/index.ts
index 18e1777..6ea6443 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -1,7 +1,7 @@
 export * from "./adrena";
-export * from "./bonfida";
+export * from "./sns";
 export * from "./dexscreener";
-export * from "./onsol";
+export * from "./alldomains";
 export * from "./flash";
 export * from "./gibwork";
 export * from "./jupiter";
diff --git a/src/tools/bonfida/get_all_registered_all_domains.ts b/src/tools/sns/get_all_registered_all_domains.ts
similarity index 93%
rename from src/tools/bonfida/get_all_registered_all_domains.ts
rename to src/tools/sns/get_all_registered_all_domains.ts
index 465c11b..f6565b4 100644
--- a/src/tools/bonfida/get_all_registered_all_domains.ts
+++ b/src/tools/sns/get_all_registered_all_domains.ts
@@ -1,7 +1,7 @@
 import { getAllDomains } from "@bonfida/spl-name-service";
 import { SolanaAgentKit } from "../../agent";
 import { PublicKey } from "@solana/web3.js";
-import { getAllDomainsTLDs } from "../onsol/get_all_domains_tlds";
+import { getAllDomainsTLDs } from "../alldomains/get_all_domains_tlds";
 
 /**
  * Get all registered domains across all TLDs
diff --git a/src/tools/bonfida/get_main_all_domains_domain.ts b/src/tools/sns/get_main_all_domains_domain.ts
similarity index 100%
rename from src/tools/bonfida/get_main_all_domains_domain.ts
rename to src/tools/sns/get_main_all_domains_domain.ts
diff --git a/src/tools/bonfida/get_primary_domain.ts b/src/tools/sns/get_primary_domain.ts
similarity index 100%
rename from src/tools/bonfida/get_primary_domain.ts
rename to src/tools/sns/get_primary_domain.ts
diff --git a/src/tools/bonfida/index.ts b/src/tools/sns/index.ts
similarity index 100%
rename from src/tools/bonfida/index.ts
rename to src/tools/sns/index.ts
diff --git a/src/tools/bonfida/register_domain.ts b/src/tools/sns/register_domain.ts
similarity index 100%
rename from src/tools/bonfida/register_domain.ts
rename to src/tools/sns/register_domain.ts
diff --git a/src/tools/bonfida/resolve_sol_domain.ts b/src/tools/sns/resolve_sol_domain.ts
similarity index 100%
rename from src/tools/bonfida/resolve_sol_domain.ts
rename to src/tools/sns/resolve_sol_domain.ts