diff --git a/src/Makefile.am b/src/Makefile.am
index cc206dab9..bad46f11a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -176,9 +176,9 @@ BITCOIN_CORE_H = \
   pubkey.h \
   random.h \
   reverselock.h \
-  rpcclient.h \
-  rpcprotocol.h \
-  rpcserver.h \
+  rpc/client.h \
+  rpc/protocol.h \
+  rpc/server.h \
   scheduler.h \
   script/interpreter.h \
   script/script.h \
@@ -260,12 +260,12 @@ libbitcoin_server_a_SOURCES = \
   policy/fees.cpp \
   pow.cpp \
   rest.cpp \
-  rpcblockchain.cpp \
-  rpcmining.cpp \
-  rpcmisc.cpp \
-  rpcnet.cpp \
-  rpcrawtransaction.cpp \
-  rpcserver.cpp \
+  rpc/blockchain.cpp \
+  rpc/mining.cpp \
+  rpc/misc.cpp \
+  rpc/net.cpp \
+  rpc/rawtransaction.cpp \
+  rpc/server.cpp \
   script/sigcache.cpp \
   timedata.cpp \
   torcontrol.cpp \
@@ -399,7 +399,7 @@ libbitcoin_util_a_SOURCES = \
   compat/glibcxx_sanity.cpp \
   compat/strnlen.cpp \
   random.cpp \
-  rpcprotocol.cpp \
+  rpc/protocol.cpp \
   support/cleanse.cpp \
   sync.cpp \
   uint256.cpp \
@@ -418,7 +418,7 @@ endif
 libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_cli_a_SOURCES = \
-  rpcclient.cpp \
+  rpc/client.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index ffd86a1c9..1de5ee43f 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -5,8 +5,8 @@
 
 #include "chainparamsbase.h"
 #include "clientversion.h"
-#include "rpcclient.h"
-#include "rpcprotocol.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include "util.h"
 #include "utilstrencodings.h"
 
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 30e3fd986..7e7f54934 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -4,7 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "clientversion.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "init.h"
 #include "main.h"
 #include "noui.h"
@@ -12,7 +12,6 @@
 #include "util.h"
 #include "httpserver.h"
 #include "httprpc.h"
-#include "rpcserver.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/gtest/test_rpc.cpp b/src/gtest/test_rpc.cpp
index a3fc201cd..3733379a8 100644
--- a/src/gtest/test_rpc.cpp
+++ b/src/gtest/test_rpc.cpp
@@ -5,7 +5,7 @@
 #include "chainparams.h"
 #include "clientversion.h"
 #include "primitives/block.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "streams.h"
 #include "utilstrencodings.h"
 
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index ade815788..10002683f 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -3,8 +3,8 @@
 #include "chainparams.h"
 #include "httpserver.h"
 #include "key_io.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
 #include "util.h"
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index 59ba7c3bc..2ee8d178f 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -8,7 +8,7 @@
 #include "compat.h"
 #include "util.h"
 #include "netbase.h"
-#include "rpcprotocol.h" // For HTTP status codes
+#include "rpc/protocol.h" // For HTTP status codes
 #include "sync.h"
 #include "ui_interface.h"
 
diff --git a/src/init.cpp b/src/init.cpp
index 7f38fb872..f433b3f12 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -25,7 +25,7 @@
 #include "metrics.h"
 #include "miner.h"
 #include "net.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "script/standard.h"
 #include "scheduler.h"
 #include "txdb.h"
diff --git a/src/rest.cpp b/src/rest.cpp
index c0d8f5320..8ae903501 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -7,7 +7,7 @@
 #include "primitives/transaction.h"
 #include "main.h"
 #include "httpserver.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "streams.h"
 #include "sync.h"
 #include "txmempool.h"
diff --git a/src/rpcblockchain.cpp b/src/rpc/blockchain.cpp
similarity index 99%
rename from src/rpcblockchain.cpp
rename to src/rpc/blockchain.cpp
index 30feb5024..f783b4d38 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -10,7 +10,8 @@
 #include "consensus/validation.h"
 #include "main.h"
 #include "primitives/transaction.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
+#include "streams.h"
 #include "sync.h"
 #include "util.h"
 
diff --git a/src/rpcclient.cpp b/src/rpc/client.cpp
similarity index 99%
rename from src/rpcclient.cpp
rename to src/rpc/client.cpp
index 94efd7184..3fc68ee6f 100644
--- a/src/rpcclient.cpp
+++ b/src/rpc/client.cpp
@@ -3,9 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcclient.h"
-
-#include "rpcprotocol.h"
+#include "rpc/client.h"
+#include "rpc/protocol.h"
 #include "util.h"
 
 #include <set>
diff --git a/src/rpcclient.h b/src/rpc/client.h
similarity index 100%
rename from src/rpcclient.h
rename to src/rpc/client.h
diff --git a/src/rpcmining.cpp b/src/rpc/mining.cpp
similarity index 99%
rename from src/rpcmining.cpp
rename to src/rpc/mining.cpp
index 4e50fb067..2cc3f89b4 100644
--- a/src/rpcmining.cpp
+++ b/src/rpc/mining.cpp
@@ -17,7 +17,8 @@
 #include "miner.h"
 #include "net.h"
 #include "pow.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
+#include "txmempool.h"
 #include "util.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
diff --git a/src/rpcmisc.cpp b/src/rpc/misc.cpp
similarity index 99%
rename from src/rpcmisc.cpp
rename to src/rpc/misc.cpp
index 7f1a41a8c..0e697b625 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpc/misc.cpp
@@ -9,7 +9,7 @@
 #include "main.h"
 #include "net.h"
 #include "netbase.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"
 #ifdef ENABLE_WALLET
diff --git a/src/rpcnet.cpp b/src/rpc/net.cpp
similarity index 99%
rename from src/rpcnet.cpp
rename to src/rpc/net.cpp
index d49ea527a..346782776 100644
--- a/src/rpcnet.cpp
+++ b/src/rpc/net.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcserver.h"
+#include "rpc/server.h"
 
 #include "clientversion.h"
 #include "main.h"
diff --git a/src/rpcprotocol.cpp b/src/rpc/protocol.cpp
similarity index 99%
rename from src/rpcprotocol.cpp
rename to src/rpc/protocol.cpp
index ac26bbdaa..7713a54b3 100644
--- a/src/rpcprotocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
 
 #include "random.h"
 #include "tinyformat.h"
diff --git a/src/rpcprotocol.h b/src/rpc/protocol.h
similarity index 100%
rename from src/rpcprotocol.h
rename to src/rpc/protocol.h
diff --git a/src/rpcrawtransaction.cpp b/src/rpc/rawtransaction.cpp
similarity index 99%
rename from src/rpcrawtransaction.cpp
rename to src/rpc/rawtransaction.cpp
index 5b04ba272..1f2ce3263 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -13,7 +13,7 @@
 #include "merkleblock.h"
 #include "net.h"
 #include "primitives/transaction.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "script/script.h"
 #include "script/script_error.h"
 #include "script/sign.h"
diff --git a/src/rpcserver.cpp b/src/rpc/server.cpp
similarity index 99%
rename from src/rpcserver.cpp
rename to src/rpc/server.cpp
index 50794527f..33fd5c0ad 100644
--- a/src/rpcserver.cpp
+++ b/src/rpc/server.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcserver.h"
+#include "rpc/server.h"
 
 #include "init.h"
 #include "key_io.h"
diff --git a/src/rpcserver.h b/src/rpc/server.h
similarity index 99%
rename from src/rpcserver.h
rename to src/rpc/server.h
index dcf1399bb..877294793 100644
--- a/src/rpcserver.h
+++ b/src/rpc/server.h
@@ -7,7 +7,7 @@
 #define BITCOIN_RPCSERVER_H
 
 #include "amount.h"
-#include "rpcprotocol.h"
+#include "rpc/protocol.h"
 #include "uint256.h"
 
 #include <list>
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index ab3841c48..a0b49b4dd 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -13,8 +13,8 @@
 #include "data/alertTests.raw.h"
 
 #include "main.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
 #include "serialize.h"
 #include "streams.h"
 #include "util.h"
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 03b4bcfe5..fccb92367 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
 
 #include "key_io.h"
 #include "netbase.h"
@@ -248,7 +248,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
     adr = find_value(o1, "address");
     banned_until = find_value(o1, "banned_until");
     BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/255.255.255.0");
-    int64_t now = GetTime();    
+    int64_t now = GetTime();
     BOOST_CHECK(banned_until.get_int64() > now);
     BOOST_CHECK(banned_until.get_int64()-now <= 200);
 
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
index 8925c36fb..49f436487 100644
--- a/src/test/rpc_wallet_tests.cpp
+++ b/src/test/rpc_wallet_tests.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcserver.h"
-#include "rpcclient.h"
+#include "rpc/server.h"
+#include "rpc/client.h"
 
 #include "key_io.h"
 #include "main.h"
@@ -13,14 +13,12 @@
 
 #include "zcash/Address.hpp"
 
-#include "rpcserver.h"
 #include "asyncrpcqueue.h"
 #include "asyncrpcoperation.h"
 #include "wallet/asyncrpcoperation_mergetoaddress.h"
 #include "wallet/asyncrpcoperation_sendmany.h"
 #include "wallet/asyncrpcoperation_shieldcoinbase.h"
 
-#include "rpcprotocol.h"
 #include "init.h"
 
 #include <array>
diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
index 80afff196..a89c38bd9 100644
--- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp
+++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
@@ -13,8 +13,8 @@
 #include "miner.h"
 #include "net.h"
 #include "netbase.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
 #include "script/interpreter.h"
 #include "sodium.h"
 #include "timedata.h"
diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp
index 38be63830..60b193f7e 100644
--- a/src/wallet/asyncrpcoperation_sendmany.cpp
+++ b/src/wallet/asyncrpcoperation_sendmany.cpp
@@ -12,7 +12,8 @@
 #include "main.h"
 #include "net.h"
 #include "netbase.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"
 #include "utilmoneystr.h"
@@ -20,7 +21,6 @@
 #include "walletdb.h"
 #include "script/interpreter.h"
 #include "utiltime.h"
-#include "rpcprotocol.h"
 #include "zcash/IncrementalMerkleTree.hpp"
 #include "sodium.h"
 #include "miner.h"
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
index 0ed4f789d..5f05f4435 100644
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
@@ -11,7 +11,8 @@
 #include "main.h"
 #include "net.h"
 #include "netbase.h"
-#include "rpcserver.h"
+#include "rpc/protocol.h"
+#include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"
 #include "utilmoneystr.h"
@@ -19,7 +20,6 @@
 #include "walletdb.h"
 #include "script/interpreter.h"
 #include "utiltime.h"
-#include "rpcprotocol.h"
 #include "zcash/IncrementalMerkleTree.hpp"
 #include "sodium.h"
 #include "miner.h"
diff --git a/src/wallet/rpcdisclosure.cpp b/src/wallet/rpcdisclosure.cpp
index c8ec5e4ff..dd3acab7e 100644
--- a/src/wallet/rpcdisclosure.cpp
+++ b/src/wallet/rpcdisclosure.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "init.h"
 #include "key_io.h"
 #include "main.h"
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index c84c41e46..6ddecbad4 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -2,8 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "chain.h"
 #include "key_io.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "init.h"
 #include "main.h"
 #include "script/script.h"
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 0e89a866f..0b4ce7c9b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -11,7 +11,7 @@
 #include "main.h"
 #include "net.h"
 #include "netbase.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "timedata.h"
 #include "util.h"
 #include "utilmoneystr.h"
diff --git a/src/zcbenchmarks.cpp b/src/zcbenchmarks.cpp
index 4f2585466..c370672da 100644
--- a/src/zcbenchmarks.cpp
+++ b/src/zcbenchmarks.cpp
@@ -18,7 +18,7 @@
 #include "main.h"
 #include "miner.h"
 #include "pow.h"
-#include "rpcserver.h"
+#include "rpc/server.h"
 #include "script/sign.h"
 #include "sodium.h"
 #include "streams.h"