diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
index 2960852d..c1a39ed2 100644
--- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
@@ -28,7 +28,7 @@ import { assert, sleep } from "@cosmjs/utils";
 import { CodeInfoResponse } from "cosmjs-types/cosmwasm/wasm/v1/query";
 import { ContractCodeHistoryOperationType } from "cosmjs-types/cosmwasm/wasm/v1/types";
 
-import { JsonObject, setupWasmExtension, WasmExtension } from "./queries";
+import { JsonObject, setupWasmExtension, WasmExtension } from "./modules";
 
 export interface Code {
   readonly id: number;
diff --git a/packages/cosmwasm-stargate/src/index.ts b/packages/cosmwasm-stargate/src/index.ts
index ec6c4d82..5f401986 100644
--- a/packages/cosmwasm-stargate/src/index.ts
+++ b/packages/cosmwasm-stargate/src/index.ts
@@ -15,7 +15,7 @@ export {
   MsgUpdateAdminEncodeObject,
 } from "./encodeobjects";
 export { fromBinary, toBinary } from "./encoding";
-export { JsonObject, setupWasmExtension, WasmExtension } from "./queries";
+export { JsonObject, setupWasmExtension, WasmExtension } from "./modules";
 export {
   ChangeAdminResult,
   ExecuteResult,
diff --git a/packages/cosmwasm-stargate/src/queries/index.ts b/packages/cosmwasm-stargate/src/modules/index.ts
similarity index 80%
rename from packages/cosmwasm-stargate/src/queries/index.ts
rename to packages/cosmwasm-stargate/src/modules/index.ts
index 2d007f6d..226838dc 100644
--- a/packages/cosmwasm-stargate/src/queries/index.ts
+++ b/packages/cosmwasm-stargate/src/modules/index.ts
@@ -1 +1 @@
-export { JsonObject, setupWasmExtension, WasmExtension } from "./wasm";
+export { JsonObject, setupWasmExtension, WasmExtension } from "./wasm/queries";
diff --git a/packages/cosmwasm-stargate/src/queries/wasm.spec.ts b/packages/cosmwasm-stargate/src/modules/wasm/queries.spec.ts
similarity index 99%
rename from packages/cosmwasm-stargate/src/queries/wasm.spec.ts
rename to packages/cosmwasm-stargate/src/modules/wasm/queries.spec.ts
index ef7c716b..d374c951 100644
--- a/packages/cosmwasm-stargate/src/queries/wasm.spec.ts
+++ b/packages/cosmwasm-stargate/src/modules/wasm/queries.spec.ts
@@ -20,8 +20,8 @@ import {
   MsgExecuteContractEncodeObject,
   MsgInstantiateContractEncodeObject,
   MsgStoreCodeEncodeObject,
-} from "../encodeobjects";
-import { SigningCosmWasmClient } from "../signingcosmwasmclient";
+} from "../../encodeobjects";
+import { SigningCosmWasmClient } from "../../signingcosmwasmclient";
 import {
   alice,
   bech32AddressMatcher,
@@ -33,7 +33,7 @@ import {
   pendingWithoutWasmd,
   wasmd,
   wasmdEnabled,
-} from "../testutils.spec";
+} from "../../testutils.spec";
 
 const registry = new Registry([
   ["/cosmwasm.wasm.v1.MsgExecuteContract", MsgExecuteContract],
diff --git a/packages/cosmwasm-stargate/src/queries/wasm.ts b/packages/cosmwasm-stargate/src/modules/wasm/queries.ts
similarity index 100%
rename from packages/cosmwasm-stargate/src/queries/wasm.ts
rename to packages/cosmwasm-stargate/src/modules/wasm/queries.ts
diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts
index 8713397e..ca5f4790 100644
--- a/packages/cosmwasm-stargate/src/testutils.spec.ts
+++ b/packages/cosmwasm-stargate/src/testutils.spec.ts
@@ -22,7 +22,7 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing";
 import { AuthInfo, SignDoc, TxBody } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
-import { setupWasmExtension, WasmExtension } from "./queries";
+import { setupWasmExtension, WasmExtension } from "./modules";
 import { SigningCosmWasmClientOptions } from "./signingcosmwasmclient";
 import hackatom from "./testdata/contract.json";