diff --git a/blockchain/msgs.go b/internal/blocksync/msgs.go
similarity index 100%
rename from blockchain/msgs.go
rename to internal/blocksync/msgs.go
diff --git a/blockchain/msgs_test.go b/internal/blocksync/msgs_test.go
similarity index 100%
rename from blockchain/msgs_test.go
rename to internal/blocksync/msgs_test.go
diff --git a/blockchain/v0/pool.go b/internal/blocksync/v0/pool.go
similarity index 100%
rename from blockchain/v0/pool.go
rename to internal/blocksync/v0/pool.go
diff --git a/blockchain/v0/pool_test.go b/internal/blocksync/v0/pool_test.go
similarity index 100%
rename from blockchain/v0/pool_test.go
rename to internal/blocksync/v0/pool_test.go
diff --git a/blockchain/v0/reactor.go b/internal/blocksync/v0/reactor.go
similarity index 100%
rename from blockchain/v0/reactor.go
rename to internal/blocksync/v0/reactor.go
diff --git a/blockchain/v0/reactor_test.go b/internal/blocksync/v0/reactor_test.go
similarity index 100%
rename from blockchain/v0/reactor_test.go
rename to internal/blocksync/v0/reactor_test.go
diff --git a/blockchain/v1/peer.go b/internal/blocksync/v1/peer.go
similarity index 100%
rename from blockchain/v1/peer.go
rename to internal/blocksync/v1/peer.go
diff --git a/blockchain/v1/peer_test.go b/internal/blocksync/v1/peer_test.go
similarity index 100%
rename from blockchain/v1/peer_test.go
rename to internal/blocksync/v1/peer_test.go
diff --git a/blockchain/v1/pool.go b/internal/blocksync/v1/pool.go
similarity index 100%
rename from blockchain/v1/pool.go
rename to internal/blocksync/v1/pool.go
diff --git a/blockchain/v1/pool_test.go b/internal/blocksync/v1/pool_test.go
similarity index 100%
rename from blockchain/v1/pool_test.go
rename to internal/blocksync/v1/pool_test.go
diff --git a/blockchain/v1/reactor.go b/internal/blocksync/v1/reactor.go
similarity index 100%
rename from blockchain/v1/reactor.go
rename to internal/blocksync/v1/reactor.go
diff --git a/blockchain/v1/reactor_fsm.go b/internal/blocksync/v1/reactor_fsm.go
similarity index 100%
rename from blockchain/v1/reactor_fsm.go
rename to internal/blocksync/v1/reactor_fsm.go
diff --git a/blockchain/v1/reactor_fsm_test.go b/internal/blocksync/v1/reactor_fsm_test.go
similarity index 100%
rename from blockchain/v1/reactor_fsm_test.go
rename to internal/blocksync/v1/reactor_fsm_test.go
diff --git a/blockchain/v1/reactor_test.go b/internal/blocksync/v1/reactor_test.go
similarity index 100%
rename from blockchain/v1/reactor_test.go
rename to internal/blocksync/v1/reactor_test.go
diff --git a/blockchain/v2/io.go b/internal/blocksync/v2/io.go
similarity index 100%
rename from blockchain/v2/io.go
rename to internal/blocksync/v2/io.go
diff --git a/blockchain/v2/metrics.go b/internal/blocksync/v2/metrics.go
similarity index 100%
rename from blockchain/v2/metrics.go
rename to internal/blocksync/v2/metrics.go
diff --git a/blockchain/v2/processor.go b/internal/blocksync/v2/processor.go
similarity index 100%
rename from blockchain/v2/processor.go
rename to internal/blocksync/v2/processor.go
diff --git a/blockchain/v2/processor_context.go b/internal/blocksync/v2/processor_context.go
similarity index 100%
rename from blockchain/v2/processor_context.go
rename to internal/blocksync/v2/processor_context.go
diff --git a/blockchain/v2/processor_test.go b/internal/blocksync/v2/processor_test.go
similarity index 100%
rename from blockchain/v2/processor_test.go
rename to internal/blocksync/v2/processor_test.go
diff --git a/blockchain/v2/reactor.go b/internal/blocksync/v2/reactor.go
similarity index 100%
rename from blockchain/v2/reactor.go
rename to internal/blocksync/v2/reactor.go
diff --git a/blockchain/v2/reactor_test.go b/internal/blocksync/v2/reactor_test.go
similarity index 100%
rename from blockchain/v2/reactor_test.go
rename to internal/blocksync/v2/reactor_test.go
diff --git a/blockchain/v2/routine.go b/internal/blocksync/v2/routine.go
similarity index 100%
rename from blockchain/v2/routine.go
rename to internal/blocksync/v2/routine.go
diff --git a/blockchain/v2/routine_test.go b/internal/blocksync/v2/routine_test.go
similarity index 100%
rename from blockchain/v2/routine_test.go
rename to internal/blocksync/v2/routine_test.go
diff --git a/blockchain/v2/scheduler.go b/internal/blocksync/v2/scheduler.go
similarity index 100%
rename from blockchain/v2/scheduler.go
rename to internal/blocksync/v2/scheduler.go
diff --git a/blockchain/v2/scheduler_test.go b/internal/blocksync/v2/scheduler_test.go
similarity index 100%
rename from blockchain/v2/scheduler_test.go
rename to internal/blocksync/v2/scheduler_test.go
diff --git a/blockchain/v2/types.go b/internal/blocksync/v2/types.go
similarity index 100%
rename from blockchain/v2/types.go
rename to internal/blocksync/v2/types.go
diff --git a/consensus/README.md b/internal/consensus/README.md
similarity index 100%
rename from consensus/README.md
rename to internal/consensus/README.md
diff --git a/consensus/byzantine_test.go b/internal/consensus/byzantine_test.go
similarity index 100%
rename from consensus/byzantine_test.go
rename to internal/consensus/byzantine_test.go
diff --git a/consensus/common_test.go b/internal/consensus/common_test.go
similarity index 100%
rename from consensus/common_test.go
rename to internal/consensus/common_test.go
diff --git a/consensus/invalid_test.go b/internal/consensus/invalid_test.go
similarity index 100%
rename from consensus/invalid_test.go
rename to internal/consensus/invalid_test.go
diff --git a/consensus/mempool_test.go b/internal/consensus/mempool_test.go
similarity index 100%
rename from consensus/mempool_test.go
rename to internal/consensus/mempool_test.go
diff --git a/consensus/metrics.go b/internal/consensus/metrics.go
similarity index 100%
rename from consensus/metrics.go
rename to internal/consensus/metrics.go
diff --git a/consensus/msgs.go b/internal/consensus/msgs.go
similarity index 100%
rename from consensus/msgs.go
rename to internal/consensus/msgs.go
diff --git a/consensus/msgs_test.go b/internal/consensus/msgs_test.go
similarity index 100%
rename from consensus/msgs_test.go
rename to internal/consensus/msgs_test.go
diff --git a/consensus/reactor.go b/internal/consensus/reactor.go
similarity index 100%
rename from consensus/reactor.go
rename to internal/consensus/reactor.go
diff --git a/consensus/reactor_test.go b/internal/consensus/reactor_test.go
similarity index 100%
rename from consensus/reactor_test.go
rename to internal/consensus/reactor_test.go
diff --git a/consensus/replay.go b/internal/consensus/replay.go
similarity index 100%
rename from consensus/replay.go
rename to internal/consensus/replay.go
diff --git a/consensus/replay_file.go b/internal/consensus/replay_file.go
similarity index 100%
rename from consensus/replay_file.go
rename to internal/consensus/replay_file.go
diff --git a/consensus/replay_stubs.go b/internal/consensus/replay_stubs.go
similarity index 100%
rename from consensus/replay_stubs.go
rename to internal/consensus/replay_stubs.go
diff --git a/consensus/replay_test.go b/internal/consensus/replay_test.go
similarity index 100%
rename from consensus/replay_test.go
rename to internal/consensus/replay_test.go
diff --git a/consensus/state.go b/internal/consensus/state.go
similarity index 100%
rename from consensus/state.go
rename to internal/consensus/state.go
diff --git a/consensus/state_test.go b/internal/consensus/state_test.go
similarity index 100%
rename from consensus/state_test.go
rename to internal/consensus/state_test.go
diff --git a/consensus/ticker.go b/internal/consensus/ticker.go
similarity index 100%
rename from consensus/ticker.go
rename to internal/consensus/ticker.go
diff --git a/consensus/types/height_vote_set.go b/internal/consensus/types/height_vote_set.go
similarity index 100%
rename from consensus/types/height_vote_set.go
rename to internal/consensus/types/height_vote_set.go
diff --git a/consensus/types/height_vote_set_test.go b/internal/consensus/types/height_vote_set_test.go
similarity index 100%
rename from consensus/types/height_vote_set_test.go
rename to internal/consensus/types/height_vote_set_test.go
diff --git a/consensus/types/peer_round_state.go b/internal/consensus/types/peer_round_state.go
similarity index 100%
rename from consensus/types/peer_round_state.go
rename to internal/consensus/types/peer_round_state.go
diff --git a/consensus/types/round_state.go b/internal/consensus/types/round_state.go
similarity index 100%
rename from consensus/types/round_state.go
rename to internal/consensus/types/round_state.go
diff --git a/consensus/wal.go b/internal/consensus/wal.go
similarity index 100%
rename from consensus/wal.go
rename to internal/consensus/wal.go
diff --git a/consensus/wal_fuzz.go b/internal/consensus/wal_fuzz.go
similarity index 100%
rename from consensus/wal_fuzz.go
rename to internal/consensus/wal_fuzz.go
diff --git a/consensus/wal_generator.go b/internal/consensus/wal_generator.go
similarity index 100%
rename from consensus/wal_generator.go
rename to internal/consensus/wal_generator.go
diff --git a/consensus/wal_test.go b/internal/consensus/wal_test.go
similarity index 100%
rename from consensus/wal_test.go
rename to internal/consensus/wal_test.go
diff --git a/rpc/client/event_test.go b/internal/rpc/client/event_test.go
similarity index 100%
rename from rpc/client/event_test.go
rename to internal/rpc/client/event_test.go
diff --git a/rpc/client/evidence_test.go b/internal/rpc/client/evidence_test.go
similarity index 100%
rename from rpc/client/evidence_test.go
rename to internal/rpc/client/evidence_test.go
diff --git a/rpc/client/examples_test.go b/internal/rpc/client/examples_test.go
similarity index 100%
rename from rpc/client/examples_test.go
rename to internal/rpc/client/examples_test.go
diff --git a/rpc/client/helpers.go b/internal/rpc/client/helpers.go
similarity index 100%
rename from rpc/client/helpers.go
rename to internal/rpc/client/helpers.go
diff --git a/rpc/client/helpers_test.go b/internal/rpc/client/helpers_test.go
similarity index 100%
rename from rpc/client/helpers_test.go
rename to internal/rpc/client/helpers_test.go
diff --git a/rpc/client/http/http.go b/internal/rpc/client/http/http.go
similarity index 100%
rename from rpc/client/http/http.go
rename to internal/rpc/client/http/http.go
diff --git a/rpc/client/interface.go b/internal/rpc/client/interface.go
similarity index 100%
rename from rpc/client/interface.go
rename to internal/rpc/client/interface.go
diff --git a/rpc/client/local/local.go b/internal/rpc/client/local/local.go
similarity index 100%
rename from rpc/client/local/local.go
rename to internal/rpc/client/local/local.go
diff --git a/rpc/client/main_test.go b/internal/rpc/client/main_test.go
similarity index 100%
rename from rpc/client/main_test.go
rename to internal/rpc/client/main_test.go
diff --git a/rpc/client/mock/abci.go b/internal/rpc/client/mock/abci.go
similarity index 100%
rename from rpc/client/mock/abci.go
rename to internal/rpc/client/mock/abci.go
diff --git a/rpc/client/mock/abci_test.go b/internal/rpc/client/mock/abci_test.go
similarity index 100%
rename from rpc/client/mock/abci_test.go
rename to internal/rpc/client/mock/abci_test.go
diff --git a/rpc/client/mock/client.go b/internal/rpc/client/mock/client.go
similarity index 100%
rename from rpc/client/mock/client.go
rename to internal/rpc/client/mock/client.go
diff --git a/rpc/client/mock/status.go b/internal/rpc/client/mock/status.go
similarity index 100%
rename from rpc/client/mock/status.go
rename to internal/rpc/client/mock/status.go
diff --git a/rpc/client/mock/status_test.go b/internal/rpc/client/mock/status_test.go
similarity index 100%
rename from rpc/client/mock/status_test.go
rename to internal/rpc/client/mock/status_test.go
diff --git a/rpc/client/mocks/client.go b/internal/rpc/client/mocks/client.go
similarity index 100%
rename from rpc/client/mocks/client.go
rename to internal/rpc/client/mocks/client.go
diff --git a/rpc/client/rpc_test.go b/internal/rpc/client/rpc_test.go
similarity index 100%
rename from rpc/client/rpc_test.go
rename to internal/rpc/client/rpc_test.go
diff --git a/rpc/client/types.go b/internal/rpc/client/types.go
similarity index 100%
rename from rpc/client/types.go
rename to internal/rpc/client/types.go
diff --git a/rpc/core/CONTRIBUTING.md b/internal/rpc/core/CONTRIBUTING.md
similarity index 100%
rename from rpc/core/CONTRIBUTING.md
rename to internal/rpc/core/CONTRIBUTING.md
diff --git a/rpc/core/README.md b/internal/rpc/core/README.md
similarity index 100%
rename from rpc/core/README.md
rename to internal/rpc/core/README.md
diff --git a/rpc/core/abci.go b/internal/rpc/core/abci.go
similarity index 100%
rename from rpc/core/abci.go
rename to internal/rpc/core/abci.go
diff --git a/rpc/core/blocks.go b/internal/rpc/core/blocks.go
similarity index 100%
rename from rpc/core/blocks.go
rename to internal/rpc/core/blocks.go
diff --git a/rpc/core/blocks_test.go b/internal/rpc/core/blocks_test.go
similarity index 100%
rename from rpc/core/blocks_test.go
rename to internal/rpc/core/blocks_test.go
diff --git a/rpc/core/consensus.go b/internal/rpc/core/consensus.go
similarity index 100%
rename from rpc/core/consensus.go
rename to internal/rpc/core/consensus.go
diff --git a/rpc/core/dev.go b/internal/rpc/core/dev.go
similarity index 100%
rename from rpc/core/dev.go
rename to internal/rpc/core/dev.go
diff --git a/rpc/core/doc.go b/internal/rpc/core/doc.go
similarity index 100%
rename from rpc/core/doc.go
rename to internal/rpc/core/doc.go
diff --git a/rpc/core/doc_template.txt b/internal/rpc/core/doc_template.txt
similarity index 100%
rename from rpc/core/doc_template.txt
rename to internal/rpc/core/doc_template.txt
diff --git a/rpc/core/env.go b/internal/rpc/core/env.go
similarity index 100%
rename from rpc/core/env.go
rename to internal/rpc/core/env.go
diff --git a/rpc/core/env_test.go b/internal/rpc/core/env_test.go
similarity index 100%
rename from rpc/core/env_test.go
rename to internal/rpc/core/env_test.go
diff --git a/rpc/core/events.go b/internal/rpc/core/events.go
similarity index 100%
rename from rpc/core/events.go
rename to internal/rpc/core/events.go
diff --git a/rpc/core/evidence.go b/internal/rpc/core/evidence.go
similarity index 100%
rename from rpc/core/evidence.go
rename to internal/rpc/core/evidence.go
diff --git a/rpc/core/health.go b/internal/rpc/core/health.go
similarity index 100%
rename from rpc/core/health.go
rename to internal/rpc/core/health.go
diff --git a/rpc/core/mempool.go b/internal/rpc/core/mempool.go
similarity index 100%
rename from rpc/core/mempool.go
rename to internal/rpc/core/mempool.go
diff --git a/rpc/core/net.go b/internal/rpc/core/net.go
similarity index 100%
rename from rpc/core/net.go
rename to internal/rpc/core/net.go
diff --git a/rpc/core/net_test.go b/internal/rpc/core/net_test.go
similarity index 100%
rename from rpc/core/net_test.go
rename to internal/rpc/core/net_test.go
diff --git a/rpc/core/routes.go b/internal/rpc/core/routes.go
similarity index 100%
rename from rpc/core/routes.go
rename to internal/rpc/core/routes.go
diff --git a/rpc/core/status.go b/internal/rpc/core/status.go
similarity index 100%
rename from rpc/core/status.go
rename to internal/rpc/core/status.go
diff --git a/rpc/core/tx.go b/internal/rpc/core/tx.go
similarity index 100%
rename from rpc/core/tx.go
rename to internal/rpc/core/tx.go
diff --git a/rpc/core/types/responses.go b/internal/rpc/core/types/responses.go
similarity index 100%
rename from rpc/core/types/responses.go
rename to internal/rpc/core/types/responses.go
diff --git a/rpc/core/types/responses_test.go b/internal/rpc/core/types/responses_test.go
similarity index 100%
rename from rpc/core/types/responses_test.go
rename to internal/rpc/core/types/responses_test.go
diff --git a/rpc/grpc/api.go b/internal/rpc/grpc/api.go
similarity index 100%
rename from rpc/grpc/api.go
rename to internal/rpc/grpc/api.go
diff --git a/rpc/grpc/client_server.go b/internal/rpc/grpc/client_server.go
similarity index 100%
rename from rpc/grpc/client_server.go
rename to internal/rpc/grpc/client_server.go
diff --git a/rpc/grpc/grpc_test.go b/internal/rpc/grpc/grpc_test.go
similarity index 100%
rename from rpc/grpc/grpc_test.go
rename to internal/rpc/grpc/grpc_test.go
diff --git a/rpc/grpc/types.pb.go b/internal/rpc/grpc/types.pb.go
similarity index 100%
rename from rpc/grpc/types.pb.go
rename to internal/rpc/grpc/types.pb.go
diff --git a/rpc/jsonrpc/client/args_test.go b/internal/rpc/jsonrpc/client/args_test.go
similarity index 100%
rename from rpc/jsonrpc/client/args_test.go
rename to internal/rpc/jsonrpc/client/args_test.go
diff --git a/rpc/jsonrpc/client/decode.go b/internal/rpc/jsonrpc/client/decode.go
similarity index 100%
rename from rpc/jsonrpc/client/decode.go
rename to internal/rpc/jsonrpc/client/decode.go
diff --git a/rpc/jsonrpc/client/encode.go b/internal/rpc/jsonrpc/client/encode.go
similarity index 100%
rename from rpc/jsonrpc/client/encode.go
rename to internal/rpc/jsonrpc/client/encode.go
diff --git a/rpc/jsonrpc/client/http_json_client.go b/internal/rpc/jsonrpc/client/http_json_client.go
similarity index 100%
rename from rpc/jsonrpc/client/http_json_client.go
rename to internal/rpc/jsonrpc/client/http_json_client.go
diff --git a/rpc/jsonrpc/client/http_json_client_test.go b/internal/rpc/jsonrpc/client/http_json_client_test.go
similarity index 100%
rename from rpc/jsonrpc/client/http_json_client_test.go
rename to internal/rpc/jsonrpc/client/http_json_client_test.go
diff --git a/rpc/jsonrpc/client/http_uri_client.go b/internal/rpc/jsonrpc/client/http_uri_client.go
similarity index 100%
rename from rpc/jsonrpc/client/http_uri_client.go
rename to internal/rpc/jsonrpc/client/http_uri_client.go
diff --git a/rpc/jsonrpc/client/integration_test.go b/internal/rpc/jsonrpc/client/integration_test.go
similarity index 100%
rename from rpc/jsonrpc/client/integration_test.go
rename to internal/rpc/jsonrpc/client/integration_test.go
diff --git a/rpc/jsonrpc/client/ws_client.go b/internal/rpc/jsonrpc/client/ws_client.go
similarity index 100%
rename from rpc/jsonrpc/client/ws_client.go
rename to internal/rpc/jsonrpc/client/ws_client.go
diff --git a/rpc/jsonrpc/client/ws_client_test.go b/internal/rpc/jsonrpc/client/ws_client_test.go
similarity index 100%
rename from rpc/jsonrpc/client/ws_client_test.go
rename to internal/rpc/jsonrpc/client/ws_client_test.go
diff --git a/rpc/jsonrpc/doc.go b/internal/rpc/jsonrpc/doc.go
similarity index 100%
rename from rpc/jsonrpc/doc.go
rename to internal/rpc/jsonrpc/doc.go
diff --git a/rpc/jsonrpc/jsonrpc_test.go b/internal/rpc/jsonrpc/jsonrpc_test.go
similarity index 100%
rename from rpc/jsonrpc/jsonrpc_test.go
rename to internal/rpc/jsonrpc/jsonrpc_test.go
diff --git a/rpc/jsonrpc/server/http_json_handler.go b/internal/rpc/jsonrpc/server/http_json_handler.go
similarity index 100%
rename from rpc/jsonrpc/server/http_json_handler.go
rename to internal/rpc/jsonrpc/server/http_json_handler.go
diff --git a/rpc/jsonrpc/server/http_json_handler_test.go b/internal/rpc/jsonrpc/server/http_json_handler_test.go
similarity index 100%
rename from rpc/jsonrpc/server/http_json_handler_test.go
rename to internal/rpc/jsonrpc/server/http_json_handler_test.go
diff --git a/rpc/jsonrpc/server/http_server.go b/internal/rpc/jsonrpc/server/http_server.go
similarity index 100%
rename from rpc/jsonrpc/server/http_server.go
rename to internal/rpc/jsonrpc/server/http_server.go
diff --git a/rpc/jsonrpc/server/http_server_test.go b/internal/rpc/jsonrpc/server/http_server_test.go
similarity index 100%
rename from rpc/jsonrpc/server/http_server_test.go
rename to internal/rpc/jsonrpc/server/http_server_test.go
diff --git a/rpc/jsonrpc/server/http_uri_handler.go b/internal/rpc/jsonrpc/server/http_uri_handler.go
similarity index 100%
rename from rpc/jsonrpc/server/http_uri_handler.go
rename to internal/rpc/jsonrpc/server/http_uri_handler.go
diff --git a/rpc/jsonrpc/server/parse_test.go b/internal/rpc/jsonrpc/server/parse_test.go
similarity index 100%
rename from rpc/jsonrpc/server/parse_test.go
rename to internal/rpc/jsonrpc/server/parse_test.go
diff --git a/rpc/jsonrpc/server/rpc_func.go b/internal/rpc/jsonrpc/server/rpc_func.go
similarity index 100%
rename from rpc/jsonrpc/server/rpc_func.go
rename to internal/rpc/jsonrpc/server/rpc_func.go
diff --git a/rpc/jsonrpc/server/test.crt b/internal/rpc/jsonrpc/server/test.crt
similarity index 100%
rename from rpc/jsonrpc/server/test.crt
rename to internal/rpc/jsonrpc/server/test.crt
diff --git a/rpc/jsonrpc/server/test.key b/internal/rpc/jsonrpc/server/test.key
similarity index 100%
rename from rpc/jsonrpc/server/test.key
rename to internal/rpc/jsonrpc/server/test.key
diff --git a/rpc/jsonrpc/server/ws_handler.go b/internal/rpc/jsonrpc/server/ws_handler.go
similarity index 100%
rename from rpc/jsonrpc/server/ws_handler.go
rename to internal/rpc/jsonrpc/server/ws_handler.go
diff --git a/rpc/jsonrpc/server/ws_handler_test.go b/internal/rpc/jsonrpc/server/ws_handler_test.go
similarity index 100%
rename from rpc/jsonrpc/server/ws_handler_test.go
rename to internal/rpc/jsonrpc/server/ws_handler_test.go
diff --git a/rpc/jsonrpc/test/data.json b/internal/rpc/jsonrpc/test/data.json
similarity index 100%
rename from rpc/jsonrpc/test/data.json
rename to internal/rpc/jsonrpc/test/data.json
diff --git a/rpc/jsonrpc/test/integration_test.sh b/internal/rpc/jsonrpc/test/integration_test.sh
similarity index 100%
rename from rpc/jsonrpc/test/integration_test.sh
rename to internal/rpc/jsonrpc/test/integration_test.sh
diff --git a/rpc/jsonrpc/test/main.go b/internal/rpc/jsonrpc/test/main.go
similarity index 100%
rename from rpc/jsonrpc/test/main.go
rename to internal/rpc/jsonrpc/test/main.go
diff --git a/rpc/jsonrpc/types/types.go b/internal/rpc/jsonrpc/types/types.go
similarity index 100%
rename from rpc/jsonrpc/types/types.go
rename to internal/rpc/jsonrpc/types/types.go
diff --git a/rpc/jsonrpc/types/types_test.go b/internal/rpc/jsonrpc/types/types_test.go
similarity index 100%
rename from rpc/jsonrpc/types/types_test.go
rename to internal/rpc/jsonrpc/types/types_test.go
diff --git a/rpc/openapi/index.html b/internal/rpc/openapi/index.html
similarity index 100%
rename from rpc/openapi/index.html
rename to internal/rpc/openapi/index.html
diff --git a/rpc/openapi/openapi.yaml b/internal/rpc/openapi/openapi.yaml
similarity index 100%
rename from rpc/openapi/openapi.yaml
rename to internal/rpc/openapi/openapi.yaml
diff --git a/rpc/test/helpers.go b/internal/rpc/test/helpers.go
similarity index 100%
rename from rpc/test/helpers.go
rename to internal/rpc/test/helpers.go
diff --git a/state/errors.go b/internal/state/errors.go
similarity index 100%
rename from state/errors.go
rename to internal/state/errors.go
diff --git a/state/execution.go b/internal/state/execution.go
similarity index 100%
rename from state/execution.go
rename to internal/state/execution.go
diff --git a/state/execution_test.go b/internal/state/execution_test.go
similarity index 100%
rename from state/execution_test.go
rename to internal/state/execution_test.go
diff --git a/state/export_test.go b/internal/state/export_test.go
similarity index 100%
rename from state/export_test.go
rename to internal/state/export_test.go
diff --git a/state/helpers_test.go b/internal/state/helpers_test.go
similarity index 100%
rename from state/helpers_test.go
rename to internal/state/helpers_test.go
diff --git a/state/indexer/block.go b/internal/state/indexer/block.go
similarity index 100%
rename from state/indexer/block.go
rename to internal/state/indexer/block.go
diff --git a/state/indexer/block/kv/kv.go b/internal/state/indexer/block/kv/kv.go
similarity index 100%
rename from state/indexer/block/kv/kv.go
rename to internal/state/indexer/block/kv/kv.go
diff --git a/state/indexer/block/kv/kv_test.go b/internal/state/indexer/block/kv/kv_test.go
similarity index 100%
rename from state/indexer/block/kv/kv_test.go
rename to internal/state/indexer/block/kv/kv_test.go
diff --git a/state/indexer/block/kv/util.go b/internal/state/indexer/block/kv/util.go
similarity index 100%
rename from state/indexer/block/kv/util.go
rename to internal/state/indexer/block/kv/util.go
diff --git a/state/indexer/block/null/null.go b/internal/state/indexer/block/null/null.go
similarity index 100%
rename from state/indexer/block/null/null.go
rename to internal/state/indexer/block/null/null.go
diff --git a/state/indexer/query_range.go b/internal/state/indexer/query_range.go
similarity index 100%
rename from state/indexer/query_range.go
rename to internal/state/indexer/query_range.go
diff --git a/state/indexer/sink/psql/backport.go b/internal/state/indexer/sink/psql/backport.go
similarity index 100%
rename from state/indexer/sink/psql/backport.go
rename to internal/state/indexer/sink/psql/backport.go
diff --git a/state/indexer/sink/psql/backport_test.go b/internal/state/indexer/sink/psql/backport_test.go
similarity index 100%
rename from state/indexer/sink/psql/backport_test.go
rename to internal/state/indexer/sink/psql/backport_test.go
diff --git a/state/indexer/sink/psql/psql.go b/internal/state/indexer/sink/psql/psql.go
similarity index 100%
rename from state/indexer/sink/psql/psql.go
rename to internal/state/indexer/sink/psql/psql.go
diff --git a/state/indexer/sink/psql/psql_test.go b/internal/state/indexer/sink/psql/psql_test.go
similarity index 100%
rename from state/indexer/sink/psql/psql_test.go
rename to internal/state/indexer/sink/psql/psql_test.go
diff --git a/state/indexer/sink/psql/schema.sql b/internal/state/indexer/sink/psql/schema.sql
similarity index 100%
rename from state/indexer/sink/psql/schema.sql
rename to internal/state/indexer/sink/psql/schema.sql
diff --git a/state/metrics.go b/internal/state/metrics.go
similarity index 100%
rename from state/metrics.go
rename to internal/state/metrics.go
diff --git a/state/mocks/block_store.go b/internal/state/mocks/block_store.go
similarity index 100%
rename from state/mocks/block_store.go
rename to internal/state/mocks/block_store.go
diff --git a/state/mocks/evidence_pool.go b/internal/state/mocks/evidence_pool.go
similarity index 100%
rename from state/mocks/evidence_pool.go
rename to internal/state/mocks/evidence_pool.go
diff --git a/state/mocks/store.go b/internal/state/mocks/store.go
similarity index 100%
rename from state/mocks/store.go
rename to internal/state/mocks/store.go
diff --git a/state/rollback.go b/internal/state/rollback.go
similarity index 100%
rename from state/rollback.go
rename to internal/state/rollback.go
diff --git a/state/rollback_test.go b/internal/state/rollback_test.go
similarity index 100%
rename from state/rollback_test.go
rename to internal/state/rollback_test.go
diff --git a/state/services.go b/internal/state/services.go
similarity index 100%
rename from state/services.go
rename to internal/state/services.go
diff --git a/state/state.go b/internal/state/state.go
similarity index 100%
rename from state/state.go
rename to internal/state/state.go
diff --git a/state/state_test.go b/internal/state/state_test.go
similarity index 100%
rename from state/state_test.go
rename to internal/state/state_test.go
diff --git a/state/store.go b/internal/state/store.go
similarity index 100%
rename from state/store.go
rename to internal/state/store.go
diff --git a/state/store_test.go b/internal/state/store_test.go
similarity index 100%
rename from state/store_test.go
rename to internal/state/store_test.go
diff --git a/state/tx_filter.go b/internal/state/tx_filter.go
similarity index 100%
rename from state/tx_filter.go
rename to internal/state/tx_filter.go
diff --git a/state/tx_filter_test.go b/internal/state/tx_filter_test.go
similarity index 100%
rename from state/tx_filter_test.go
rename to internal/state/tx_filter_test.go
diff --git a/state/txindex/indexer.go b/internal/state/txindex/indexer.go
similarity index 100%
rename from state/txindex/indexer.go
rename to internal/state/txindex/indexer.go
diff --git a/state/txindex/indexer_service.go b/internal/state/txindex/indexer_service.go
similarity index 100%
rename from state/txindex/indexer_service.go
rename to internal/state/txindex/indexer_service.go
diff --git a/state/txindex/indexer_service_test.go b/internal/state/txindex/indexer_service_test.go
similarity index 100%
rename from state/txindex/indexer_service_test.go
rename to internal/state/txindex/indexer_service_test.go
diff --git a/state/txindex/kv/kv.go b/internal/state/txindex/kv/kv.go
similarity index 100%
rename from state/txindex/kv/kv.go
rename to internal/state/txindex/kv/kv.go
diff --git a/state/txindex/kv/kv_bench_test.go b/internal/state/txindex/kv/kv_bench_test.go
similarity index 100%
rename from state/txindex/kv/kv_bench_test.go
rename to internal/state/txindex/kv/kv_bench_test.go
diff --git a/state/txindex/kv/kv_test.go b/internal/state/txindex/kv/kv_test.go
similarity index 100%
rename from state/txindex/kv/kv_test.go
rename to internal/state/txindex/kv/kv_test.go
diff --git a/state/txindex/kv/utils.go b/internal/state/txindex/kv/utils.go
similarity index 100%
rename from state/txindex/kv/utils.go
rename to internal/state/txindex/kv/utils.go
diff --git a/state/txindex/kv/utils_test.go b/internal/state/txindex/kv/utils_test.go
similarity index 100%
rename from state/txindex/kv/utils_test.go
rename to internal/state/txindex/kv/utils_test.go
diff --git a/state/txindex/null/null.go b/internal/state/txindex/null/null.go
similarity index 100%
rename from state/txindex/null/null.go
rename to internal/state/txindex/null/null.go
diff --git a/state/validation.go b/internal/state/validation.go
similarity index 100%
rename from state/validation.go
rename to internal/state/validation.go
diff --git a/state/validation_test.go b/internal/state/validation_test.go
similarity index 100%
rename from state/validation_test.go
rename to internal/state/validation_test.go