diff --git a/packages/tendermint-rpc/src/index.ts b/packages/tendermint-rpc/src/index.ts
index 5530c322..547db460 100644
--- a/packages/tendermint-rpc/src/index.ts
+++ b/packages/tendermint-rpc/src/index.ts
@@ -4,6 +4,22 @@ export {
   rawEd25519PubkeyToRawAddress,
   rawSecp256k1PubkeyToRawAddress,
 } from "./addresses";
+export {
+  DateTime,
+  ReadonlyDateWithNanoseconds,
+  fromRfc3339WithNanoseconds,
+  fromSeconds,
+  toRfc3339WithNanoseconds,
+  toSeconds,
+} from "./dates";
+export { HttpClient, WebsocketClient } from "./rpcclients"; // TODO: Why do we export those outside of this package?
+export {
+  BlockIdFlag,
+  CommitSignature,
+  ValidatorEd25519Pubkey,
+  ValidatorSecp256k1Pubkey,
+  ValidatorPubkey,
+} from "./types";
 export {
   adaptor33,
   adaptor34,
@@ -75,22 +91,6 @@ export {
   TxSearchRequest,
   ValidatorsRequest,
   ValidatorsParams,
-} from "./legacy";
-export {
-  DateTime,
-  ReadonlyDateWithNanoseconds,
-  fromRfc3339WithNanoseconds,
-  fromSeconds,
-  toRfc3339WithNanoseconds,
-  toSeconds,
-} from "./dates";
-export { HttpClient, WebsocketClient } from "./rpcclients"; // TODO: Why do we export those outside of this package?
-export {
-  BlockIdFlag,
-  CommitSignature,
-  ValidatorEd25519Pubkey,
-  ValidatorSecp256k1Pubkey,
-  ValidatorPubkey,
-} from "./types";
+} from "./tendermint33";
 export * as tendermint34 from "./tendermint34";
 export { Tendermint34Client } from "./tendermint34";
diff --git a/packages/tendermint-rpc/src/legacy/adaptor.ts b/packages/tendermint-rpc/src/tendermint33/adaptor.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/adaptor.ts
rename to packages/tendermint-rpc/src/tendermint33/adaptor.ts
diff --git a/packages/tendermint-rpc/src/legacy/adaptors/index.ts b/packages/tendermint-rpc/src/tendermint33/adaptors/index.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/adaptors/index.ts
rename to packages/tendermint-rpc/src/tendermint33/adaptors/index.ts
diff --git a/packages/tendermint-rpc/src/legacy/adaptors/v0-33/index.ts b/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/index.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/adaptors/v0-33/index.ts
rename to packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/index.ts
diff --git a/packages/tendermint-rpc/src/legacy/adaptors/v0-33/requests.ts b/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/requests.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/adaptors/v0-33/requests.ts
rename to packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/requests.ts
diff --git a/packages/tendermint-rpc/src/legacy/adaptors/v0-33/responses.ts b/packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/responses.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/adaptors/v0-33/responses.ts
rename to packages/tendermint-rpc/src/tendermint33/adaptors/v0-33/responses.ts
diff --git a/packages/tendermint-rpc/src/legacy/client.spec.ts b/packages/tendermint-rpc/src/tendermint33/client.spec.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/client.spec.ts
rename to packages/tendermint-rpc/src/tendermint33/client.spec.ts
diff --git a/packages/tendermint-rpc/src/legacy/client.ts b/packages/tendermint-rpc/src/tendermint33/client.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/client.ts
rename to packages/tendermint-rpc/src/tendermint33/client.ts
diff --git a/packages/tendermint-rpc/src/legacy/encodings.spec.ts b/packages/tendermint-rpc/src/tendermint33/encodings.spec.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/encodings.spec.ts
rename to packages/tendermint-rpc/src/tendermint33/encodings.spec.ts
diff --git a/packages/tendermint-rpc/src/legacy/encodings.ts b/packages/tendermint-rpc/src/tendermint33/encodings.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/encodings.ts
rename to packages/tendermint-rpc/src/tendermint33/encodings.ts
diff --git a/packages/tendermint-rpc/src/legacy/hasher.spec.ts b/packages/tendermint-rpc/src/tendermint33/hasher.spec.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/hasher.spec.ts
rename to packages/tendermint-rpc/src/tendermint33/hasher.spec.ts
diff --git a/packages/tendermint-rpc/src/legacy/hasher.ts b/packages/tendermint-rpc/src/tendermint33/hasher.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/hasher.ts
rename to packages/tendermint-rpc/src/tendermint33/hasher.ts
diff --git a/packages/tendermint-rpc/src/legacy/index.ts b/packages/tendermint-rpc/src/tendermint33/index.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/index.ts
rename to packages/tendermint-rpc/src/tendermint33/index.ts
diff --git a/packages/tendermint-rpc/src/legacy/requests.spec.ts b/packages/tendermint-rpc/src/tendermint33/requests.spec.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/requests.spec.ts
rename to packages/tendermint-rpc/src/tendermint33/requests.spec.ts
diff --git a/packages/tendermint-rpc/src/legacy/requests.ts b/packages/tendermint-rpc/src/tendermint33/requests.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/requests.ts
rename to packages/tendermint-rpc/src/tendermint33/requests.ts
diff --git a/packages/tendermint-rpc/src/legacy/responses.ts b/packages/tendermint-rpc/src/tendermint33/responses.ts
similarity index 100%
rename from packages/tendermint-rpc/src/legacy/responses.ts
rename to packages/tendermint-rpc/src/tendermint33/responses.ts