diff --git a/rpc/client/event_test.go b/rpc/tendermint/client/event_test.go
similarity index 100%
rename from rpc/client/event_test.go
rename to rpc/tendermint/client/event_test.go
diff --git a/rpc/client/helpers.go b/rpc/tendermint/client/helpers.go
similarity index 100%
rename from rpc/client/helpers.go
rename to rpc/tendermint/client/helpers.go
diff --git a/rpc/client/helpers_test.go b/rpc/tendermint/client/helpers_test.go
similarity index 100%
rename from rpc/client/helpers_test.go
rename to rpc/tendermint/client/helpers_test.go
diff --git a/rpc/client/httpclient.go b/rpc/tendermint/client/httpclient.go
similarity index 100%
rename from rpc/client/httpclient.go
rename to rpc/tendermint/client/httpclient.go
diff --git a/rpc/client/interface.go b/rpc/tendermint/client/interface.go
similarity index 100%
rename from rpc/client/interface.go
rename to rpc/tendermint/client/interface.go
diff --git a/rpc/client/localclient.go b/rpc/tendermint/client/localclient.go
similarity index 100%
rename from rpc/client/localclient.go
rename to rpc/tendermint/client/localclient.go
diff --git a/rpc/client/main_test.go b/rpc/tendermint/client/main_test.go
similarity index 100%
rename from rpc/client/main_test.go
rename to rpc/tendermint/client/main_test.go
diff --git a/rpc/client/mock/abci.go b/rpc/tendermint/client/mock/abci.go
similarity index 100%
rename from rpc/client/mock/abci.go
rename to rpc/tendermint/client/mock/abci.go
diff --git a/rpc/client/mock/abci_test.go b/rpc/tendermint/client/mock/abci_test.go
similarity index 100%
rename from rpc/client/mock/abci_test.go
rename to rpc/tendermint/client/mock/abci_test.go
diff --git a/rpc/client/mock/client.go b/rpc/tendermint/client/mock/client.go
similarity index 100%
rename from rpc/client/mock/client.go
rename to rpc/tendermint/client/mock/client.go
diff --git a/rpc/client/mock/status.go b/rpc/tendermint/client/mock/status.go
similarity index 100%
rename from rpc/client/mock/status.go
rename to rpc/tendermint/client/mock/status.go
diff --git a/rpc/client/mock/status_test.go b/rpc/tendermint/client/mock/status_test.go
similarity index 100%
rename from rpc/client/mock/status_test.go
rename to rpc/tendermint/client/mock/status_test.go
diff --git a/rpc/client/rpc_test.go b/rpc/tendermint/client/rpc_test.go
similarity index 100%
rename from rpc/client/rpc_test.go
rename to rpc/tendermint/client/rpc_test.go
diff --git a/rpc/core/abci.go b/rpc/tendermint/core/abci.go
similarity index 100%
rename from rpc/core/abci.go
rename to rpc/tendermint/core/abci.go
diff --git a/rpc/core/blocks.go b/rpc/tendermint/core/blocks.go
similarity index 100%
rename from rpc/core/blocks.go
rename to rpc/tendermint/core/blocks.go
diff --git a/rpc/core/consensus.go b/rpc/tendermint/core/consensus.go
similarity index 100%
rename from rpc/core/consensus.go
rename to rpc/tendermint/core/consensus.go
diff --git a/rpc/core/dev.go b/rpc/tendermint/core/dev.go
similarity index 100%
rename from rpc/core/dev.go
rename to rpc/tendermint/core/dev.go
diff --git a/rpc/core/events.go b/rpc/tendermint/core/events.go
similarity index 100%
rename from rpc/core/events.go
rename to rpc/tendermint/core/events.go
diff --git a/rpc/core/log.go b/rpc/tendermint/core/log.go
similarity index 100%
rename from rpc/core/log.go
rename to rpc/tendermint/core/log.go
diff --git a/rpc/core/mempool.go b/rpc/tendermint/core/mempool.go
similarity index 100%
rename from rpc/core/mempool.go
rename to rpc/tendermint/core/mempool.go
diff --git a/rpc/core/net.go b/rpc/tendermint/core/net.go
similarity index 100%
rename from rpc/core/net.go
rename to rpc/tendermint/core/net.go
diff --git a/rpc/core/pipe.go b/rpc/tendermint/core/pipe.go
similarity index 100%
rename from rpc/core/pipe.go
rename to rpc/tendermint/core/pipe.go
diff --git a/rpc/core/routes.go b/rpc/tendermint/core/routes.go
similarity index 100%
rename from rpc/core/routes.go
rename to rpc/tendermint/core/routes.go
diff --git a/rpc/core/status.go b/rpc/tendermint/core/status.go
similarity index 100%
rename from rpc/core/status.go
rename to rpc/tendermint/core/status.go
diff --git a/rpc/core/tx.go b/rpc/tendermint/core/tx.go
similarity index 100%
rename from rpc/core/tx.go
rename to rpc/tendermint/core/tx.go
diff --git a/rpc/core/types/responses.go b/rpc/tendermint/core/types/responses.go
similarity index 100%
rename from rpc/core/types/responses.go
rename to rpc/tendermint/core/types/responses.go
diff --git a/rpc/core/types/responses_test.go b/rpc/tendermint/core/types/responses_test.go
similarity index 100%
rename from rpc/core/types/responses_test.go
rename to rpc/tendermint/core/types/responses_test.go
diff --git a/rpc/core/version.go b/rpc/tendermint/core/version.go
similarity index 100%
rename from rpc/core/version.go
rename to rpc/tendermint/core/version.go
diff --git a/rpc/grpc/api.go b/rpc/tendermint/grpc/api.go
similarity index 100%
rename from rpc/grpc/api.go
rename to rpc/tendermint/grpc/api.go
diff --git a/rpc/grpc/client_server.go b/rpc/tendermint/grpc/client_server.go
similarity index 100%
rename from rpc/grpc/client_server.go
rename to rpc/tendermint/grpc/client_server.go
diff --git a/rpc/grpc/compile.sh b/rpc/tendermint/grpc/compile.sh
similarity index 100%
rename from rpc/grpc/compile.sh
rename to rpc/tendermint/grpc/compile.sh
diff --git a/rpc/grpc/types.pb.go b/rpc/tendermint/grpc/types.pb.go
similarity index 100%
rename from rpc/grpc/types.pb.go
rename to rpc/tendermint/grpc/types.pb.go
diff --git a/rpc/grpc/types.proto b/rpc/tendermint/grpc/types.proto
similarity index 100%
rename from rpc/grpc/types.proto
rename to rpc/tendermint/grpc/types.proto
diff --git a/rpc/test/client_test.go b/rpc/tendermint/test/client_test.go
similarity index 100%
rename from rpc/test/client_test.go
rename to rpc/tendermint/test/client_test.go
diff --git a/rpc/test/grpc_test.go b/rpc/tendermint/test/grpc_test.go
similarity index 100%
rename from rpc/test/grpc_test.go
rename to rpc/tendermint/test/grpc_test.go
diff --git a/rpc/test/helpers.go b/rpc/tendermint/test/helpers.go
similarity index 100%
rename from rpc/test/helpers.go
rename to rpc/tendermint/test/helpers.go
diff --git a/rpc/test/main_test.go b/rpc/tendermint/test/main_test.go
similarity index 100%
rename from rpc/test/main_test.go
rename to rpc/tendermint/test/main_test.go