diff --git a/packages/proto-signing/src/index.ts b/packages/proto-signing/src/index.ts
index c52b350f..28e7bc70 100644
--- a/packages/proto-signing/src/index.ts
+++ b/packages/proto-signing/src/index.ts
@@ -1,3 +1,3 @@
-export { BaseAccount } from "./accounts";
 export { decodeAny } from "./any";
 export { Coin } from "./msgs";
+export { cosmosField } from "./decorator";
diff --git a/packages/proto-signing/types/index.d.ts b/packages/proto-signing/types/index.d.ts
index c52b350f..28e7bc70 100644
--- a/packages/proto-signing/types/index.d.ts
+++ b/packages/proto-signing/types/index.d.ts
@@ -1,3 +1,3 @@
-export { BaseAccount } from "./accounts";
 export { decodeAny } from "./any";
 export { Coin } from "./msgs";
+export { cosmosField } from "./decorator";
diff --git a/packages/proto-signing/src/accounts.ts b/packages/stargate/src/query/accounts.ts
similarity index 88%
rename from packages/proto-signing/src/accounts.ts
rename to packages/stargate/src/query/accounts.ts
index c13d6728..8c48497b 100644
--- a/packages/proto-signing/src/accounts.ts
+++ b/packages/stargate/src/query/accounts.ts
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { cosmosField } from "@cosmjs/proto-signing";
 import { Message } from "protobufjs";
 
-import { cosmosField } from "./decorator";
-
 export class BaseAccount extends Message {
   @cosmosField.bytes(1)
   public readonly address?: Uint8Array;
diff --git a/packages/stargate/src/stargateclient.ts b/packages/stargate/src/stargateclient.ts
index 9b582ca3..96be91f0 100644
--- a/packages/stargate/src/stargateclient.ts
+++ b/packages/stargate/src/stargateclient.ts
@@ -7,6 +7,8 @@ import { Client as TendermintClient } from "@cosmjs/tendermint-rpc";
 import { assertDefined } from "@cosmjs/utils";
 import Long from "long";
 
+import { BaseAccount } from "./query/accounts";
+
 export interface GetSequenceResult {
   readonly accountNumber: number;
   readonly sequence: number;
@@ -37,7 +39,7 @@ export class StargateClient {
     const { typeUrl, value } = proto.decodeAny(responseData);
     switch (typeUrl) {
       case "/cosmos.auth.BaseAccount": {
-        const { account_number, sequence } = proto.BaseAccount.decode(value);
+        const { account_number, sequence } = BaseAccount.decode(value);
         assertDefined(account_number);
         assertDefined(sequence);
         return {
diff --git a/packages/stargate/tsconfig.json b/packages/stargate/tsconfig.json
index 167e8c02..c605e918 100644
--- a/packages/stargate/tsconfig.json
+++ b/packages/stargate/tsconfig.json
@@ -4,6 +4,7 @@
     "baseUrl": ".",
     "outDir": "build",
     "declarationDir": "build/types",
+    "experimentalDecorators": true,
     "rootDir": "src"
   },
   "include": [
diff --git a/packages/proto-signing/types/accounts.d.ts b/packages/stargate/types/query/accounts.d.ts
similarity index 100%
rename from packages/proto-signing/types/accounts.d.ts
rename to packages/stargate/types/query/accounts.d.ts