diff --git a/packages/stargate/src/index.ts b/packages/stargate/src/index.ts
index 883f04ea..69442f56 100644
--- a/packages/stargate/src/index.ts
+++ b/packages/stargate/src/index.ts
@@ -56,13 +56,9 @@ export {
 } from "./encodeobjects";
 export { calculateFee, GasPrice } from "./fee";
 export * as logs from "./logs";
-export { makeMultisignedTx } from "./multisignature";
 export {
   AuthExtension,
   BankExtension,
-  createPagination,
-  createProtobufRpcClient,
-  decodeCosmosSdkDecFromProto,
   DistributionExtension,
   GovExtension,
   GovParamsType,
@@ -70,8 +66,6 @@ export {
   IbcExtension,
   MintExtension,
   MintParams,
-  ProtobufRpcClient,
-  QueryClient,
   setupAuthExtension,
   setupBankExtension,
   setupDistributionExtension,
@@ -82,7 +76,15 @@ export {
   setupTxExtension,
   StakingExtension,
   TxExtension,
-} from "./queries";
+} from "./modules";
+export { makeMultisignedTx } from "./multisignature";
+export {
+  createPagination,
+  createProtobufRpcClient,
+  decodeCosmosSdkDecFromProto,
+  ProtobufRpcClient,
+  QueryClient,
+} from "./queryclient";
 export {
   isSearchByHeightQuery,
   isSearchBySentFromOrToQuery,
diff --git a/packages/stargate/src/queries/auth.spec.ts b/packages/stargate/src/modules/auth/queries.spec.ts
similarity index 93%
rename from packages/stargate/src/queries/auth.spec.ts
rename to packages/stargate/src/modules/auth/queries.spec.ts
index d744bb49..05e8ea44 100644
--- a/packages/stargate/src/queries/auth.spec.ts
+++ b/packages/stargate/src/modules/auth/queries.spec.ts
@@ -6,9 +6,9 @@ import { BaseAccount } from "cosmjs-types/cosmos/auth/v1beta1/auth";
 import { Any } from "cosmjs-types/google/protobuf/any";
 import Long from "long";
 
-import { nonExistentAddress, pendingWithoutSimapp, simapp, unused, validator } from "../testutils.spec";
-import { AuthExtension, setupAuthExtension } from "./auth";
-import { QueryClient } from "./queryclient";
+import { QueryClient } from "../../queryclient";
+import { nonExistentAddress, pendingWithoutSimapp, simapp, unused, validator } from "../../testutils.spec";
+import { AuthExtension, setupAuthExtension } from "./queries";
 
 async function makeClientWithAuth(
   rpcUrl: string,
diff --git a/packages/stargate/src/queries/auth.ts b/packages/stargate/src/modules/auth/queries.ts
similarity index 91%
rename from packages/stargate/src/queries/auth.ts
rename to packages/stargate/src/modules/auth/queries.ts
index 958f5a43..348f7d8f 100644
--- a/packages/stargate/src/queries/auth.ts
+++ b/packages/stargate/src/modules/auth/queries.ts
@@ -1,8 +1,7 @@
 import { QueryClientImpl } from "cosmjs-types/cosmos/auth/v1beta1/query";
 import { Any } from "cosmjs-types/google/protobuf/any";
 
-import { QueryClient } from "./queryclient";
-import { createProtobufRpcClient } from "./utils";
+import { createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 export interface AuthExtension {
   readonly auth: {
diff --git a/packages/stargate/src/queries/bank.spec.ts b/packages/stargate/src/modules/bank/queries.spec.ts
similarity index 97%
rename from packages/stargate/src/queries/bank.spec.ts
rename to packages/stargate/src/modules/bank/queries.spec.ts
index 724f35d7..bfd4d1ad 100644
--- a/packages/stargate/src/queries/bank.spec.ts
+++ b/packages/stargate/src/modules/bank/queries.spec.ts
@@ -1,14 +1,14 @@
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 
+import { QueryClient } from "../../queryclient";
 import {
   nonExistentAddress,
   nonNegativeIntegerMatcher,
   pendingWithoutSimapp,
   simapp,
   unused,
-} from "../testutils.spec";
-import { BankExtension, setupBankExtension } from "./bank";
-import { QueryClient } from "./queryclient";
+} from "../../testutils.spec";
+import { BankExtension, setupBankExtension } from "./queries";
 
 async function makeClientWithBank(
   rpcUrl: string,
diff --git a/packages/stargate/src/queries/bank.ts b/packages/stargate/src/modules/bank/queries.ts
similarity index 95%
rename from packages/stargate/src/queries/bank.ts
rename to packages/stargate/src/modules/bank/queries.ts
index 399a0b4e..9c596789 100644
--- a/packages/stargate/src/queries/bank.ts
+++ b/packages/stargate/src/modules/bank/queries.ts
@@ -4,8 +4,7 @@ import { Metadata } from "cosmjs-types/cosmos/bank/v1beta1/bank";
 import { QueryClientImpl } from "cosmjs-types/cosmos/bank/v1beta1/query";
 import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin";
 
-import { QueryClient } from "./queryclient";
-import { createProtobufRpcClient } from "./utils";
+import { createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 export interface BankExtension {
   readonly bank: {
diff --git a/packages/stargate/src/queries/distribution.spec.ts b/packages/stargate/src/modules/distribution/queries.spec.ts
similarity index 95%
rename from packages/stargate/src/queries/distribution.spec.ts
rename to packages/stargate/src/modules/distribution/queries.spec.ts
index bb33473e..6c732fae 100644
--- a/packages/stargate/src/queries/distribution.spec.ts
+++ b/packages/stargate/src/modules/distribution/queries.spec.ts
@@ -4,9 +4,10 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
-import { MsgDelegateEncodeObject } from "../encodeobjects";
-import { SigningStargateClient } from "../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../stargateclient";
+import { MsgDelegateEncodeObject } from "../../encodeobjects";
+import { QueryClient } from "../../queryclient";
+import { SigningStargateClient } from "../../signingstargateclient";
+import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,
@@ -14,9 +15,8 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../testutils.spec";
-import { DistributionExtension, setupDistributionExtension } from "./distribution";
-import { QueryClient } from "./queryclient";
+} from "../../testutils.spec";
+import { DistributionExtension, setupDistributionExtension } from "./queries";
 
 async function makeClientWithDistribution(
   rpcUrl: string,
diff --git a/packages/stargate/src/queries/distribution.ts b/packages/stargate/src/modules/distribution/queries.ts
similarity index 97%
rename from packages/stargate/src/queries/distribution.ts
rename to packages/stargate/src/modules/distribution/queries.ts
index ea91d4b8..d9271b5f 100644
--- a/packages/stargate/src/queries/distribution.ts
+++ b/packages/stargate/src/modules/distribution/queries.ts
@@ -13,8 +13,7 @@ import {
 } from "cosmjs-types/cosmos/distribution/v1beta1/query";
 import Long from "long";
 
-import { QueryClient } from "./queryclient";
-import { createPagination, createProtobufRpcClient } from "./utils";
+import { createPagination, createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 export interface DistributionExtension {
   readonly distribution: {
diff --git a/packages/stargate/src/queries/gov.spec.ts b/packages/stargate/src/modules/gov/queries.spec.ts
similarity index 97%
rename from packages/stargate/src/queries/gov.spec.ts
rename to packages/stargate/src/modules/gov/queries.spec.ts
index cae143ff..a6881d35 100644
--- a/packages/stargate/src/queries/gov.spec.ts
+++ b/packages/stargate/src/modules/gov/queries.spec.ts
@@ -17,9 +17,10 @@ import {
   MsgDelegateEncodeObject,
   MsgSubmitProposalEncodeObject,
   MsgVoteEncodeObject,
-} from "../encodeobjects";
-import { SigningStargateClient } from "../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../stargateclient";
+} from "../../encodeobjects";
+import { longify, QueryClient } from "../../queryclient";
+import { SigningStargateClient } from "../../signingstargateclient";
+import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,
@@ -29,10 +30,8 @@ import {
   simapp42Enabled,
   simappEnabled,
   validator,
-} from "../testutils.spec";
-import { GovExtension, setupGovExtension } from "./gov";
-import { QueryClient } from "./queryclient";
-import { longify } from "./utils";
+} from "../../testutils.spec";
+import { GovExtension, setupGovExtension } from "./queries";
 
 async function makeClientWithGov(rpcUrl: string): Promise<[QueryClient & GovExtension, Tendermint34Client]> {
   const tmClient = await Tendermint34Client.connect(rpcUrl);
diff --git a/packages/stargate/src/queries/gov.ts b/packages/stargate/src/modules/gov/queries.ts
similarity index 96%
rename from packages/stargate/src/queries/gov.ts
rename to packages/stargate/src/modules/gov/queries.ts
index e8c81aae..4c365066 100644
--- a/packages/stargate/src/queries/gov.ts
+++ b/packages/stargate/src/modules/gov/queries.ts
@@ -13,8 +13,7 @@ import {
 } from "cosmjs-types/cosmos/gov/v1beta1/query";
 import Long from "long";
 
-import { QueryClient } from "./queryclient";
-import { createPagination, createProtobufRpcClient, longify } from "./utils";
+import { createPagination, createProtobufRpcClient, longify, QueryClient } from "../../queryclient";
 
 export type GovParamsType = "deposit" | "tallying" | "voting";
 
diff --git a/packages/stargate/src/queries/ibctestdata.spec.ts b/packages/stargate/src/modules/ibc/ibctestdata.spec.ts
similarity index 100%
rename from packages/stargate/src/queries/ibctestdata.spec.ts
rename to packages/stargate/src/modules/ibc/ibctestdata.spec.ts
diff --git a/packages/stargate/src/queries/ibc.spec.ts b/packages/stargate/src/modules/ibc/queries.spec.ts
similarity index 99%
rename from packages/stargate/src/queries/ibc.spec.ts
rename to packages/stargate/src/modules/ibc/queries.spec.ts
index 5d425f6a..19ed3587 100644
--- a/packages/stargate/src/queries/ibc.spec.ts
+++ b/packages/stargate/src/modules/ibc/queries.spec.ts
@@ -1,10 +1,10 @@
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import Long from "long";
 
-import { pendingWithoutSimapp42, simapp } from "../testutils.spec";
-import { IbcExtension, setupIbcExtension } from "./ibc";
+import { QueryClient } from "../../queryclient";
+import { pendingWithoutSimapp42, simapp } from "../../testutils.spec";
 import * as ibcTest from "./ibctestdata.spec";
-import { QueryClient } from "./queryclient";
+import { IbcExtension, setupIbcExtension } from "./queries";
 
 async function makeClientWithIbc(rpcUrl: string): Promise<[QueryClient & IbcExtension, Tendermint34Client]> {
   const tmClient = await Tendermint34Client.connect(rpcUrl);
diff --git a/packages/stargate/src/queries/ibc.ts b/packages/stargate/src/modules/ibc/queries.ts
similarity index 99%
rename from packages/stargate/src/queries/ibc.ts
rename to packages/stargate/src/modules/ibc/queries.ts
index 520b4412..26b0d228 100644
--- a/packages/stargate/src/queries/ibc.ts
+++ b/packages/stargate/src/modules/ibc/queries.ts
@@ -50,8 +50,7 @@ import {
 } from "cosmjs-types/ibc/lightclients/tendermint/v1/tendermint";
 import Long from "long";
 
-import { QueryClient } from "./queryclient";
-import { createPagination, createProtobufRpcClient } from "./utils";
+import { createPagination, createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 function decodeTendermintClientStateAny(clientState: Any | undefined): TendermintClientState {
   if (clientState?.typeUrl !== "/ibc.lightclients.tendermint.v1.ClientState") {
diff --git a/packages/stargate/src/modules/index.ts b/packages/stargate/src/modules/index.ts
new file mode 100644
index 00000000..94006c83
--- /dev/null
+++ b/packages/stargate/src/modules/index.ts
@@ -0,0 +1,9 @@
+export { AuthExtension, setupAuthExtension } from "./auth/queries";
+export { BankExtension, setupBankExtension } from "./bank/queries";
+export { DistributionExtension, setupDistributionExtension } from "./distribution/queries";
+export { GovExtension, GovParamsType, GovProposalId, setupGovExtension } from "./gov/queries";
+export { IbcExtension, setupIbcExtension } from "./ibc/queries";
+export { MintExtension, MintParams, setupMintExtension } from "./mint/queries";
+export { setupSlashingExtension, SlashingExtension } from "./slashing/queries";
+export { setupStakingExtension, StakingExtension } from "./staking/queries";
+export { setupTxExtension, TxExtension } from "./tx/queries";
diff --git a/packages/stargate/src/queries/mint.spec.ts b/packages/stargate/src/modules/mint/queries.spec.ts
similarity index 91%
rename from packages/stargate/src/queries/mint.spec.ts
rename to packages/stargate/src/modules/mint/queries.spec.ts
index ba9abfed..0e028876 100644
--- a/packages/stargate/src/queries/mint.spec.ts
+++ b/packages/stargate/src/modules/mint/queries.spec.ts
@@ -1,8 +1,8 @@
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 
-import { QueryClient } from "../";
-import { pendingWithoutSimapp, simapp } from "../testutils.spec";
-import { MintExtension, setupMintExtension } from "./mint";
+import { QueryClient } from "../../queryclient";
+import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
+import { MintExtension, setupMintExtension } from "./queries";
 
 async function makeClientWithMint(
   rpcUrl: string,
diff --git a/packages/stargate/src/queries/mint.ts b/packages/stargate/src/modules/mint/queries.ts
similarity index 93%
rename from packages/stargate/src/queries/mint.ts
rename to packages/stargate/src/modules/mint/queries.ts
index 6928f060..8d7b28e1 100644
--- a/packages/stargate/src/queries/mint.ts
+++ b/packages/stargate/src/modules/mint/queries.ts
@@ -3,9 +3,7 @@ import { assert } from "@cosmjs/utils";
 import { Params } from "cosmjs-types/cosmos/mint/v1beta1/mint";
 import { QueryClientImpl } from "cosmjs-types/cosmos/mint/v1beta1/query";
 
-import { createProtobufRpcClient } from "../";
-import { QueryClient } from "./queryclient";
-import { decodeCosmosSdkDecFromProto } from "./utils";
+import { createProtobufRpcClient, decodeCosmosSdkDecFromProto, QueryClient } from "../../queryclient";
 
 /**
  * Like Params from "cosmjs-types/cosmos/mint/v1beta1/mint"
diff --git a/packages/stargate/src/queries/slashing.spec.ts b/packages/stargate/src/modules/slashing/queries.spec.ts
similarity index 86%
rename from packages/stargate/src/queries/slashing.spec.ts
rename to packages/stargate/src/modules/slashing/queries.spec.ts
index 7d4b5867..ab4b2ff9 100644
--- a/packages/stargate/src/queries/slashing.spec.ts
+++ b/packages/stargate/src/modules/slashing/queries.spec.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 
-import { pendingWithoutSimapp, simapp } from "../testutils.spec";
-import { QueryClient } from "./queryclient";
-import { setupSlashingExtension, SlashingExtension } from "./slashing";
+import { QueryClient } from "../../queryclient";
+import { pendingWithoutSimapp, simapp } from "../../testutils.spec";
+import { setupSlashingExtension, SlashingExtension } from "./queries";
 
 async function makeClientWithSlashing(
   rpcUrl: string,
diff --git a/packages/stargate/src/queries/slashing.ts b/packages/stargate/src/modules/slashing/queries.ts
similarity index 91%
rename from packages/stargate/src/queries/slashing.ts
rename to packages/stargate/src/modules/slashing/queries.ts
index 496c20f7..c4b07616 100644
--- a/packages/stargate/src/queries/slashing.ts
+++ b/packages/stargate/src/modules/slashing/queries.ts
@@ -6,8 +6,7 @@ import {
 } from "cosmjs-types/cosmos/slashing/v1beta1/query";
 import { QueryClientImpl } from "cosmjs-types/cosmos/slashing/v1beta1/query";
 
-import { QueryClient } from "./queryclient";
-import { createPagination, createProtobufRpcClient } from "./utils";
+import { createPagination, createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 export interface SlashingExtension {
   readonly slashing: {
diff --git a/packages/stargate/src/queries/staking.spec.ts b/packages/stargate/src/modules/staking/queries.spec.ts
similarity index 96%
rename from packages/stargate/src/queries/staking.spec.ts
rename to packages/stargate/src/modules/staking/queries.spec.ts
index ba5ad2d8..3f68c94f 100644
--- a/packages/stargate/src/queries/staking.spec.ts
+++ b/packages/stargate/src/modules/staking/queries.spec.ts
@@ -4,9 +4,10 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
-import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "../encodeobjects";
-import { SigningStargateClient } from "../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../stargateclient";
+import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "../../encodeobjects";
+import { QueryClient } from "../../queryclient";
+import { SigningStargateClient } from "../../signingstargateclient";
+import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,
@@ -14,9 +15,8 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../testutils.spec";
-import { QueryClient } from "./queryclient";
-import { setupStakingExtension, StakingExtension } from "./staking";
+} from "../../testutils.spec";
+import { setupStakingExtension, StakingExtension } from "./queries";
 
 async function makeClientWithStaking(
   rpcUrl: string,
diff --git a/packages/stargate/src/queries/staking.ts b/packages/stargate/src/modules/staking/queries.ts
similarity index 98%
rename from packages/stargate/src/queries/staking.ts
rename to packages/stargate/src/modules/staking/queries.ts
index 592f2b85..94484cdd 100644
--- a/packages/stargate/src/queries/staking.ts
+++ b/packages/stargate/src/modules/staking/queries.ts
@@ -19,8 +19,7 @@ import {
 import { BondStatus } from "cosmjs-types/cosmos/staking/v1beta1/staking";
 import Long from "long";
 
-import { QueryClient } from "./queryclient";
-import { createPagination, createProtobufRpcClient } from "./utils";
+import { createPagination, createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 export type BondStatusString = Exclude<keyof typeof BondStatus, "BOND_STATUS_UNSPECIFIED">;
 
diff --git a/packages/stargate/src/queries/tx.spec.ts b/packages/stargate/src/modules/tx/queries.spec.ts
similarity index 92%
rename from packages/stargate/src/queries/tx.spec.ts
rename to packages/stargate/src/modules/tx/queries.spec.ts
index 19e09a51..ad16e077 100644
--- a/packages/stargate/src/queries/tx.spec.ts
+++ b/packages/stargate/src/modules/tx/queries.spec.ts
@@ -4,8 +4,9 @@ import { assertDefined, sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import Long from "long";
 
-import { defaultRegistryTypes, SigningStargateClient } from "../signingstargateclient";
-import { assertIsDeliverTxSuccess, StargateClient } from "../stargateclient";
+import { longify, QueryClient } from "../../queryclient";
+import { defaultRegistryTypes, SigningStargateClient } from "../../signingstargateclient";
+import { assertIsDeliverTxSuccess, StargateClient } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,
@@ -14,10 +15,8 @@ import {
   simapp,
   simappEnabled,
   validator,
-} from "../testutils.spec";
-import { QueryClient } from "./queryclient";
-import { setupTxExtension, TxExtension } from "./tx";
-import { longify } from "./utils";
+} from "../../testutils.spec";
+import { setupTxExtension, TxExtension } from "./queries";
 
 async function makeClientWithTx(rpcUrl: string): Promise<[QueryClient & TxExtension, Tendermint34Client]> {
   const tmClient = await Tendermint34Client.connect(rpcUrl);
diff --git a/packages/stargate/src/queries/tx.ts b/packages/stargate/src/modules/tx/queries.ts
similarity index 96%
rename from packages/stargate/src/queries/tx.ts
rename to packages/stargate/src/modules/tx/queries.ts
index ca591d3b..4e6177a6 100644
--- a/packages/stargate/src/queries/tx.ts
+++ b/packages/stargate/src/modules/tx/queries.ts
@@ -12,8 +12,7 @@ import { AuthInfo, Fee, Tx, TxBody } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { Any } from "cosmjs-types/google/protobuf/any";
 import Long from "long";
 
-import { QueryClient } from "./queryclient";
-import { createProtobufRpcClient } from "./utils";
+import { createProtobufRpcClient, QueryClient } from "../../queryclient";
 
 export interface TxExtension {
   readonly tx: {
diff --git a/packages/stargate/src/queries/index.ts b/packages/stargate/src/queries/index.ts
deleted file mode 100644
index aec76d76..00000000
--- a/packages/stargate/src/queries/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Base symbols
-
-export { QueryClient } from "./queryclient";
-
-// Extensions
-
-export { AuthExtension, setupAuthExtension } from "./auth";
-export { BankExtension, setupBankExtension } from "./bank";
-export { DistributionExtension, setupDistributionExtension } from "./distribution";
-export { GovExtension, GovParamsType, GovProposalId, setupGovExtension } from "./gov";
-export { IbcExtension, setupIbcExtension } from "./ibc";
-export { MintExtension, MintParams, setupMintExtension } from "./mint";
-export { setupSlashingExtension, SlashingExtension } from "./slashing";
-export { setupStakingExtension, StakingExtension } from "./staking";
-export { setupTxExtension, TxExtension } from "./tx";
-export {
-  createPagination,
-  createProtobufRpcClient,
-  decodeCosmosSdkDecFromProto,
-  ProtobufRpcClient,
-} from "./utils";
diff --git a/packages/stargate/src/queryclient/index.ts b/packages/stargate/src/queryclient/index.ts
new file mode 100644
index 00000000..64d20b59
--- /dev/null
+++ b/packages/stargate/src/queryclient/index.ts
@@ -0,0 +1,8 @@
+export { QueryClient } from "./queryclient";
+export {
+  createPagination,
+  createProtobufRpcClient,
+  decodeCosmosSdkDecFromProto,
+  longify,
+  ProtobufRpcClient,
+} from "./utils";
diff --git a/packages/stargate/src/queries/queryclient.spec.ts b/packages/stargate/src/queryclient/queryclient.spec.ts
similarity index 100%
rename from packages/stargate/src/queries/queryclient.spec.ts
rename to packages/stargate/src/queryclient/queryclient.spec.ts
diff --git a/packages/stargate/src/queries/queryclient.ts b/packages/stargate/src/queryclient/queryclient.ts
similarity index 100%
rename from packages/stargate/src/queries/queryclient.ts
rename to packages/stargate/src/queryclient/queryclient.ts
diff --git a/packages/stargate/src/queries/utils.spec.ts b/packages/stargate/src/queryclient/utils.spec.ts
similarity index 100%
rename from packages/stargate/src/queries/utils.spec.ts
rename to packages/stargate/src/queryclient/utils.spec.ts
diff --git a/packages/stargate/src/queries/utils.ts b/packages/stargate/src/queryclient/utils.ts
similarity index 100%
rename from packages/stargate/src/queries/utils.ts
rename to packages/stargate/src/queryclient/utils.ts
diff --git a/packages/stargate/src/stargateclient.ts b/packages/stargate/src/stargateclient.ts
index a5a77108..07c465a4 100644
--- a/packages/stargate/src/stargateclient.ts
+++ b/packages/stargate/src/stargateclient.ts
@@ -10,14 +10,14 @@ import { Account, accountFromAny } from "./accounts";
 import {
   AuthExtension,
   BankExtension,
-  QueryClient,
   setupAuthExtension,
   setupBankExtension,
   setupStakingExtension,
   setupTxExtension,
   StakingExtension,
   TxExtension,
-} from "./queries";
+} from "./modules";
+import { QueryClient } from "./queryclient";
 import {
   isSearchByHeightQuery,
   isSearchBySentFromOrToQuery,