diff --git a/abci/client/client.go b/abci/client/client.go
index b6d34e422..b1e4aaded 100644
--- a/abci/client/client.go
+++ b/abci/client/client.go
@@ -64,6 +64,14 @@ type Client interface {
 	ApplySnapshotChunkSync(context.Context, types.RequestApplySnapshotChunk) (*types.ResponseApplySnapshotChunk, error)
 }
 
+//go:generate ../scripts/mockery_generate.sh ClientCreator
+
+// ClientCreator creates new ABCI clients.
+type ClientCreator interface {
+	// NewABCIClient returns a new ABCI client.
+	NewABCIClient() (Client, error)
+}
+
 //----------------------------------------
 
 // NewClient returns a new ABCI client of the specified transport type.
diff --git a/abci/types/client.go b/abci/types/client.go
new file mode 100644
index 000000000..ab1254f4c
--- /dev/null
+++ b/abci/types/client.go
@@ -0,0 +1 @@
+package types
diff --git a/internal/blocksync/v0/reactor_test.go b/internal/blocksync/v0/reactor_test.go
index a1ddc02cd..03fe75a32 100644
--- a/internal/blocksync/v0/reactor_test.go
+++ b/internal/blocksync/v0/reactor_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/tendermint/tendermint/internal/test/factory"
 	"github.com/tendermint/tendermint/libs/log"
 	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	sf "github.com/tendermint/tendermint/state/test/factory"
 	"github.com/tendermint/tendermint/store"
diff --git a/internal/blocksync/v2/reactor_test.go b/internal/blocksync/v2/reactor_test.go
index 4120b3942..5b04f0830 100644
--- a/internal/blocksync/v2/reactor_test.go
+++ b/internal/blocksync/v2/reactor_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/libs/service"
 	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	sf "github.com/tendermint/tendermint/state/test/factory"
 	tmstore "github.com/tendermint/tendermint/store"
diff --git a/internal/consensus/replay.go b/internal/consensus/replay.go
index 9b22f4631..2660797c8 100644
--- a/internal/consensus/replay.go
+++ b/internal/consensus/replay.go
@@ -11,8 +11,8 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/merkle"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/internal/consensus/replay_file.go b/internal/consensus/replay_file.go
index 51cb090d7..0cd10e9c8 100644
--- a/internal/consensus/replay_file.go
+++ b/internal/consensus/replay_file.go
@@ -16,7 +16,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	tmos "github.com/tendermint/tendermint/libs/os"
 	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
diff --git a/internal/consensus/replay_stubs.go b/internal/consensus/replay_stubs.go
index c79340a0c..ba0f7d409 100644
--- a/internal/consensus/replay_stubs.go
+++ b/internal/consensus/replay_stubs.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/internal/libs/clist"
 	mempl "github.com/tendermint/tendermint/internal/mempool"
 	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/internal/consensus/replay_test.go b/internal/consensus/replay_test.go
index 4d1c9c6b2..147c6de74 100644
--- a/internal/consensus/replay_test.go
+++ b/internal/consensus/replay_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/tendermint/tendermint/privval"
 	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	sf "github.com/tendermint/tendermint/state/test/factory"
 	"github.com/tendermint/tendermint/store"
diff --git a/internal/consensus/wal_generator.go b/internal/consensus/wal_generator.go
index 81c2125ca..8e66351d7 100644
--- a/internal/consensus/wal_generator.go
+++ b/internal/consensus/wal_generator.go
@@ -17,7 +17,7 @@ import (
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
diff --git a/internal/mempool/v0/bench_test.go b/internal/mempool/v0/bench_test.go
index 45123c9f6..f5e0e9386 100644
--- a/internal/mempool/v0/bench_test.go
+++ b/internal/mempool/v0/bench_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/tendermint/tendermint/abci/example/kvstore"
 	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 )
 
 func BenchmarkReap(b *testing.B) {
diff --git a/internal/mempool/v0/cache_test.go b/internal/mempool/v0/cache_test.go
index fbb719231..de80c8303 100644
--- a/internal/mempool/v0/cache_test.go
+++ b/internal/mempool/v0/cache_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/abci/example/kvstore"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/internal/mempool"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/internal/mempool/v0/clist_mempool.go b/internal/mempool/v0/clist_mempool.go
index 167fe0410..ba6352dfd 100644
--- a/internal/mempool/v0/clist_mempool.go
+++ b/internal/mempool/v0/clist_mempool.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tendermint/tendermint/internal/mempool"
 	"github.com/tendermint/tendermint/libs/log"
 	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/internal/mempool/v0/clist_mempool_test.go b/internal/mempool/v0/clist_mempool_test.go
index 6f3e6ebc0..d04161324 100644
--- a/internal/mempool/v0/clist_mempool_test.go
+++ b/internal/mempool/v0/clist_mempool_test.go
@@ -15,15 +15,16 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	abcicli "github.com/tendermint/tendermint/abci/client"
 	"github.com/tendermint/tendermint/abci/example/kvstore"
 	abciserver "github.com/tendermint/tendermint/abci/server"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/internal/mempool"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/libs/log"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	"github.com/tendermint/tendermint/libs/service"
-	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
@@ -31,11 +32,11 @@ import (
 // test.
 type cleanupFunc func()
 
-func newMempoolWithApp(cc proxy.ClientCreator) (*CListMempool, cleanupFunc) {
+func newMempoolWithApp(cc abcicli.ClientCreator) (*CListMempool, cleanupFunc) {
 	return newMempoolWithAppAndConfig(cc, cfg.ResetTestRoot("mempool_test"))
 }
 
-func newMempoolWithAppAndConfig(cc proxy.ClientCreator, config *cfg.Config) (*CListMempool, cleanupFunc) {
+func newMempoolWithAppAndConfig(cc abcicli.ClientCreator, config *cfg.Config) (*CListMempool, cleanupFunc) {
 	appConnMem, _ := cc.NewABCIClient()
 	appConnMem.SetLogger(log.TestingLogger().With("module", "abci-client", "connection", "mempool"))
 	err := appConnMem.Start()
@@ -597,7 +598,7 @@ func newRemoteApp(
 	addr string,
 	app abci.Application,
 ) (
-	clientCreator proxy.ClientCreator,
+	clientCreator abcicli.ClientCreator,
 	server service.Service,
 ) {
 	clientCreator = proxy.NewRemoteClientCreator(addr, "socket", true)
diff --git a/internal/mempool/v0/reactor_test.go b/internal/mempool/v0/reactor_test.go
index 91729b37c..e59bcdd5b 100644
--- a/internal/mempool/v0/reactor_test.go
+++ b/internal/mempool/v0/reactor_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	protomem "github.com/tendermint/tendermint/proto/tendermint/mempool"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/internal/mempool/v1/mempool.go b/internal/mempool/v1/mempool.go
index 46e7f5fcc..740868088 100644
--- a/internal/mempool/v1/mempool.go
+++ b/internal/mempool/v1/mempool.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tendermint/tendermint/internal/mempool"
 	"github.com/tendermint/tendermint/libs/log"
 	tmmath "github.com/tendermint/tendermint/libs/math"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/internal/mempool/v1/mempool_test.go b/internal/mempool/v1/mempool_test.go
index df26be726..6cb247818 100644
--- a/internal/mempool/v1/mempool_test.go
+++ b/internal/mempool/v1/mempool_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/internal/mempool"
 	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/proxy/app_conn.go b/internal/proxy/app_conn.go
similarity index 100%
rename from proxy/app_conn.go
rename to internal/proxy/app_conn.go
diff --git a/proxy/app_conn_test.go b/internal/proxy/app_conn_test.go
similarity index 100%
rename from proxy/app_conn_test.go
rename to internal/proxy/app_conn_test.go
diff --git a/proxy/client.go b/internal/proxy/client.go
similarity index 85%
rename from proxy/client.go
rename to internal/proxy/client.go
index 929933e01..5563b4c98 100644
--- a/proxy/client.go
+++ b/internal/proxy/client.go
@@ -10,14 +10,6 @@ import (
 	tmsync "github.com/tendermint/tendermint/internal/libs/sync"
 )
 
-//go:generate ../scripts/mockery_generate.sh ClientCreator
-
-// ClientCreator creates new ABCI clients.
-type ClientCreator interface {
-	// NewABCIClient returns a new ABCI client.
-	NewABCIClient() (abcicli.Client, error)
-}
-
 //----------------------------------------------------
 // local proxy uses a mutex on an in-proc app
 
@@ -28,7 +20,7 @@ type localClientCreator struct {
 
 // NewLocalClientCreator returns a ClientCreator for the given app,
 // which will be running locally.
-func NewLocalClientCreator(app types.Application) ClientCreator {
+func NewLocalClientCreator(app types.Application) abcicli.ClientCreator {
 	return &localClientCreator{
 		mtx: new(tmsync.RWMutex),
 		app: app,
@@ -51,7 +43,7 @@ type remoteClientCreator struct {
 // NewRemoteClientCreator returns a ClientCreator for the given address (e.g.
 // "192.168.0.1") and transport (e.g. "tcp"). Set mustConnect to true if you
 // want the client to connect before reporting success.
-func NewRemoteClientCreator(addr, transport string, mustConnect bool) ClientCreator {
+func NewRemoteClientCreator(addr, transport string, mustConnect bool) abcicli.ClientCreator {
 	return &remoteClientCreator{
 		addr:        addr,
 		transport:   transport,
@@ -74,7 +66,7 @@ func (r *remoteClientCreator) NewABCIClient() (abcicli.Client, error) {
 //
 // The Closer is a noop except for persistent_kvstore applications,
 // which will clean up the store.
-func DefaultClientCreator(addr, transport, dbDir string) (ClientCreator, io.Closer) {
+func DefaultClientCreator(addr, transport, dbDir string) (abcicli.ClientCreator, io.Closer) {
 	switch addr {
 	case "kvstore":
 		return NewLocalClientCreator(kvstore.NewApplication()), noopCloser{}
diff --git a/proxy/mocks/app_conn_consensus.go b/internal/proxy/mocks/app_conn_consensus.go
similarity index 100%
rename from proxy/mocks/app_conn_consensus.go
rename to internal/proxy/mocks/app_conn_consensus.go
diff --git a/proxy/mocks/app_conn_mempool.go b/internal/proxy/mocks/app_conn_mempool.go
similarity index 100%
rename from proxy/mocks/app_conn_mempool.go
rename to internal/proxy/mocks/app_conn_mempool.go
diff --git a/proxy/mocks/app_conn_query.go b/internal/proxy/mocks/app_conn_query.go
similarity index 100%
rename from proxy/mocks/app_conn_query.go
rename to internal/proxy/mocks/app_conn_query.go
diff --git a/proxy/mocks/app_conn_snapshot.go b/internal/proxy/mocks/app_conn_snapshot.go
similarity index 100%
rename from proxy/mocks/app_conn_snapshot.go
rename to internal/proxy/mocks/app_conn_snapshot.go
diff --git a/proxy/mocks/client_creator.go b/internal/proxy/mocks/client_creator.go
similarity index 100%
rename from proxy/mocks/client_creator.go
rename to internal/proxy/mocks/client_creator.go
diff --git a/proxy/multi_app_conn.go b/internal/proxy/multi_app_conn.go
similarity index 96%
rename from proxy/multi_app_conn.go
rename to internal/proxy/multi_app_conn.go
index 369b685ba..11517c365 100644
--- a/proxy/multi_app_conn.go
+++ b/internal/proxy/multi_app_conn.go
@@ -33,7 +33,7 @@ type AppConns interface {
 }
 
 // NewAppConns calls NewMultiAppConn.
-func NewAppConns(clientCreator ClientCreator) AppConns {
+func NewAppConns(clientCreator abcicli.ClientCreator) AppConns {
 	return NewMultiAppConn(clientCreator)
 }
 
@@ -55,11 +55,11 @@ type multiAppConn struct {
 	queryConnClient     abcicli.Client
 	snapshotConnClient  abcicli.Client
 
-	clientCreator ClientCreator
+	clientCreator abcicli.ClientCreator
 }
 
 // NewMultiAppConn makes all necessary abci connections to the application.
-func NewMultiAppConn(clientCreator ClientCreator) AppConns {
+func NewMultiAppConn(clientCreator abcicli.ClientCreator) AppConns {
 	multiAppConn := &multiAppConn{
 		clientCreator: clientCreator,
 	}
diff --git a/proxy/multi_app_conn_test.go b/internal/proxy/multi_app_conn_test.go
similarity index 97%
rename from proxy/multi_app_conn_test.go
rename to internal/proxy/multi_app_conn_test.go
index 34b0d0830..4ca5aedea 100644
--- a/proxy/multi_app_conn_test.go
+++ b/internal/proxy/multi_app_conn_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	abcimocks "github.com/tendermint/tendermint/abci/client/mocks"
-	"github.com/tendermint/tendermint/proxy/mocks"
+	"github.com/tendermint/tendermint/internal/proxy/mocks"
 )
 
 func TestAppConns_Start_Stop(t *testing.T) {
diff --git a/proxy/version.go b/internal/proxy/version.go
similarity index 100%
rename from proxy/version.go
rename to internal/proxy/version.go
diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go
index 6c0d26812..362558575 100644
--- a/internal/statesync/reactor.go
+++ b/internal/statesync/reactor.go
@@ -19,7 +19,7 @@ import (
 	"github.com/tendermint/tendermint/light"
 	"github.com/tendermint/tendermint/light/provider"
 	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
diff --git a/internal/statesync/reactor_test.go b/internal/statesync/reactor_test.go
index 6373ed6ab..e24ee368e 100644
--- a/internal/statesync/reactor_test.go
+++ b/internal/statesync/reactor_test.go
@@ -22,8 +22,8 @@ import (
 	"github.com/tendermint/tendermint/light/provider"
 	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/proxy"
-	proxymocks "github.com/tendermint/tendermint/proxy/mocks"
+	"github.com/tendermint/tendermint/internal/proxy"
+	proxymocks "github.com/tendermint/tendermint/internal/proxy/mocks"
 	smmocks "github.com/tendermint/tendermint/state/mocks"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
diff --git a/internal/statesync/syncer.go b/internal/statesync/syncer.go
index 559e98a8f..2160177cc 100644
--- a/internal/statesync/syncer.go
+++ b/internal/statesync/syncer.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/light"
 	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 )
diff --git a/internal/statesync/syncer_test.go b/internal/statesync/syncer_test.go
index c1d6b462a..b47ab6a64 100644
--- a/internal/statesync/syncer_test.go
+++ b/internal/statesync/syncer_test.go
@@ -15,8 +15,8 @@ import (
 	tmsync "github.com/tendermint/tendermint/internal/libs/sync"
 	"github.com/tendermint/tendermint/internal/statesync/mocks"
 	ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync"
-	"github.com/tendermint/tendermint/proxy"
-	proxymocks "github.com/tendermint/tendermint/proxy/mocks"
+	"github.com/tendermint/tendermint/internal/proxy"
+	proxymocks "github.com/tendermint/tendermint/internal/proxy/mocks"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/types"
 	"github.com/tendermint/tendermint/version"
diff --git a/node/node.go b/node/node.go
index efa69a724..c3a625188 100644
--- a/node/node.go
+++ b/node/node.go
@@ -14,6 +14,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/rs/cors"
+	abcicli "github.com/tendermint/tendermint/abci/client"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/crypto"
@@ -21,6 +22,7 @@ import (
 	"github.com/tendermint/tendermint/internal/mempool"
 	"github.com/tendermint/tendermint/internal/p2p"
 	"github.com/tendermint/tendermint/internal/p2p/pex"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/internal/statesync"
 	"github.com/tendermint/tendermint/libs/log"
 	tmnet "github.com/tendermint/tendermint/libs/net"
@@ -30,7 +32,6 @@ import (
 	tmtime "github.com/tendermint/tendermint/libs/time"
 	"github.com/tendermint/tendermint/privval"
 	tmgrpc "github.com/tendermint/tendermint/privval/grpc"
-	"github.com/tendermint/tendermint/proxy"
 	rpccore "github.com/tendermint/tendermint/rpc/core"
 	grpccore "github.com/tendermint/tendermint/rpc/grpc"
 	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
@@ -119,7 +120,7 @@ func newDefaultNode(config *cfg.Config, logger log.Logger) (service.Service, err
 func makeNode(config *cfg.Config,
 	privValidator types.PrivValidator,
 	nodeKey types.NodeKey,
-	clientCreator proxy.ClientCreator,
+	clientCreator abcicli.ClientCreator,
 	genesisDocProvider genesisDocProvider,
 	dbProvider cfg.DBProvider,
 	logger log.Logger) (service.Service, error) {
diff --git a/node/node_test.go b/node/node_test.go
index 6925008a6..be57fbd9a 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -30,7 +30,7 @@ import (
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 	tmtime "github.com/tendermint/tendermint/libs/time"
 	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/state/indexer"
 	"github.com/tendermint/tendermint/store"
diff --git a/node/public.go b/node/public.go
index 99a8226d0..20fc10cfc 100644
--- a/node/public.go
+++ b/node/public.go
@@ -4,11 +4,11 @@ package node
 import (
 	"fmt"
 
+	abcicli "github.com/tendermint/tendermint/abci/client"
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/libs/service"
 	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
@@ -28,7 +28,7 @@ func NewDefault(conf *config.Config, logger log.Logger) (service.Service, error)
 // value of the final argument.
 func New(conf *config.Config,
 	logger log.Logger,
-	cf proxy.ClientCreator,
+	cf abcicli.ClientCreator,
 	gen *types.GenesisDoc,
 ) (service.Service, error) {
 	nodeKey, err := types.LoadOrGenNodeKey(conf.NodeKeyFile())
diff --git a/node/setup.go b/node/setup.go
index 1a7c1b3b2..c24c29480 100644
--- a/node/setup.go
+++ b/node/setup.go
@@ -12,6 +12,7 @@ import (
 
 	dbm "github.com/tendermint/tm-db"
 
+	abcicli "github.com/tendermint/tendermint/abci/client"
 	abci "github.com/tendermint/tendermint/abci/types"
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/crypto"
@@ -24,12 +25,12 @@ import (
 	mempoolv1 "github.com/tendermint/tendermint/internal/mempool/v1"
 	"github.com/tendermint/tendermint/internal/p2p"
 	"github.com/tendermint/tendermint/internal/p2p/pex"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/internal/statesync"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/libs/service"
 	tmstrings "github.com/tendermint/tendermint/libs/strings"
 	protop2p "github.com/tendermint/tendermint/proto/tendermint/p2p"
-	"github.com/tendermint/tendermint/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/state/indexer"
 	"github.com/tendermint/tendermint/state/indexer/sink"
@@ -50,7 +51,7 @@ func initDBs(config *cfg.Config, dbProvider cfg.DBProvider) (blockStore *store.B
 	return
 }
 
-func createAndStartProxyAppConns(clientCreator proxy.ClientCreator, logger log.Logger) (proxy.AppConns, error) {
+func createAndStartProxyAppConns(clientCreator abcicli.ClientCreator, logger log.Logger) (proxy.AppConns, error) {
 	proxyApp := proxy.NewAppConns(clientCreator)
 	proxyApp.SetLogger(logger.With("module", "proxy"))
 	if err := proxyApp.Start(); err != nil {
diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go
index 0737deec0..5f335f6cc 100644
--- a/rpc/client/mock/abci.go
+++ b/rpc/client/mock/abci.go
@@ -5,7 +5,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/rpc/client"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
diff --git a/rpc/core/abci.go b/rpc/core/abci.go
index ce705ba90..32cf1a2ca 100644
--- a/rpc/core/abci.go
+++ b/rpc/core/abci.go
@@ -3,7 +3,7 @@ package core
 import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/bytes"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"
 )
diff --git a/rpc/core/env.go b/rpc/core/env.go
index 7069bc4d4..cb71def05 100644
--- a/rpc/core/env.go
+++ b/rpc/core/env.go
@@ -12,7 +12,7 @@ import (
 	"github.com/tendermint/tendermint/internal/p2p"
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/state/indexer"
diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go
index 259450540..1c1acad5e 100644
--- a/rpc/test/helpers.go
+++ b/rpc/test/helpers.go
@@ -12,7 +12,7 @@ import (
 	tmnet "github.com/tendermint/tendermint/libs/net"
 	"github.com/tendermint/tendermint/libs/service"
 	nm "github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	core_grpc "github.com/tendermint/tendermint/rpc/grpc"
 	rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client"
diff --git a/state/execution.go b/state/execution.go
index 05d5bdd52..24a2d05c9 100644
--- a/state/execution.go
+++ b/state/execution.go
@@ -12,7 +12,7 @@ import (
 	mempl "github.com/tendermint/tendermint/internal/mempool"
 	"github.com/tendermint/tendermint/libs/log"
 	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/state/execution_test.go b/state/execution_test.go
index 8e0ec563a..ae455f2c8 100644
--- a/state/execution_test.go
+++ b/state/execution_test.go
@@ -17,7 +17,7 @@ import (
 	mmock "github.com/tendermint/tendermint/internal/mempool/mock"
 	"github.com/tendermint/tendermint/libs/log"
 	tmtime "github.com/tendermint/tendermint/libs/time"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/state/mocks"
 	sf "github.com/tendermint/tendermint/state/test/factory"
diff --git a/state/helpers_test.go b/state/helpers_test.go
index 6d575e147..775b2c9b3 100644
--- a/state/helpers_test.go
+++ b/state/helpers_test.go
@@ -16,7 +16,7 @@ import (
 	tmtime "github.com/tendermint/tendermint/libs/time"
 	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	sm "github.com/tendermint/tendermint/state"
 	sf "github.com/tendermint/tendermint/state/test/factory"
 	"github.com/tendermint/tendermint/types"
diff --git a/test/e2e/app/main.go b/test/e2e/app/main.go
index fd464220d..3f10e4f63 100644
--- a/test/e2e/app/main.go
+++ b/test/e2e/app/main.go
@@ -28,7 +28,7 @@ import (
 	"github.com/tendermint/tendermint/privval"
 	grpcprivval "github.com/tendermint/tendermint/privval/grpc"
 	privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 	rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server"
 	e2e "github.com/tendermint/tendermint/test/e2e/pkg"
 )
diff --git a/test/fuzz/mempool/v0/checktx.go b/test/fuzz/mempool/v0/checktx.go
index a90ec2290..e795c3606 100644
--- a/test/fuzz/mempool/v0/checktx.go
+++ b/test/fuzz/mempool/v0/checktx.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/internal/mempool"
 	mempoolv0 "github.com/tendermint/tendermint/internal/mempool/v0"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 )
 
 var mp mempool.Mempool
diff --git a/test/fuzz/mempool/v1/checktx.go b/test/fuzz/mempool/v1/checktx.go
index 6194f3bcb..913cdf774 100644
--- a/test/fuzz/mempool/v1/checktx.go
+++ b/test/fuzz/mempool/v1/checktx.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/internal/mempool"
 	mempoolv1 "github.com/tendermint/tendermint/internal/mempool/v0"
-	"github.com/tendermint/tendermint/proxy"
+	"github.com/tendermint/tendermint/internal/proxy"
 )
 
 var mp mempool.Mempool