diff --git a/src/Makefile.am b/src/Makefile.am
index 7a878a430..f6d436e74 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -283,12 +283,12 @@ BITCOIN_CORE_H = \
   uint256.h \
   uint252.h \
   undo.h \
-  util.h \
+  util/system.h \
   util/match.h \
-  utilmoneystr.h \
-  utilstrencodings.h \
+  util/moneystr.h \
+  util/strencodings.h \
   utiltest.h \
-  utiltime.h \
+  util/time.h \
   validationinterface.h \
   version.h \
   wallet/asyncrpcoperation_common.h \
@@ -492,10 +492,10 @@ libbitcoin_util_a_SOURCES = \
   support/cleanse.cpp \
   sync.cpp \
   uint256.cpp \
-  util.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
+  util/system.cpp \
+  util/moneystr.cpp \
+  util/strencodings.cpp \
+  util/time.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
@@ -635,7 +635,7 @@ libzcash_script_la_SOURCES = \
   script/interpreter.cpp \
   script/script.cpp \
   uint256.cpp \
-  utilstrencodings.cpp
+  util/strencodings.cpp
 
 if GLIBC_BACK_COMPAT
   libzcash_script_la_SOURCES += compat/glibc_compat.cpp
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index d68002933..763a62693 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -13,7 +13,7 @@
 #include "random.h"
 #include "streams.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/filesystem.hpp>
 
diff --git a/src/addrman.h b/src/addrman.h
index 8b287edbd..894b2b287 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -10,7 +10,7 @@
 #include "random.h"
 #include "sync.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <map>
 #include <set>
diff --git a/src/alert.cpp b/src/alert.cpp
index 68ba7589f..781fb819b 100644
--- a/src/alert.cpp
+++ b/src/alert.cpp
@@ -11,7 +11,7 @@
 #include "pubkey.h"
 #include "timedata.h"
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdint.h>
 #include <algorithm>
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
index 6c2f8dbea..e117a5200 100644
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -6,7 +6,7 @@
 #include "arith_uint256.h"
 
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "crypto/common.h"
 
 #include <stdio.h>
diff --git a/src/asyncrpcqueue.cpp b/src/asyncrpcqueue.cpp
index ddee22df3..776dc7fed 100644
--- a/src/asyncrpcqueue.cpp
+++ b/src/asyncrpcqueue.cpp
@@ -3,7 +3,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "asyncrpcqueue.h"
-#include "util.h"
+#include "util/system.h"
 
 static std::atomic<size_t> workerCounter(0);
 
diff --git a/src/bench/Examples.cpp b/src/bench/Examples.cpp
index ee9c60482..802847020 100644
--- a/src/bench/Examples.cpp
+++ b/src/bench/Examples.cpp
@@ -5,7 +5,7 @@
 
 #include "bench.h"
 #include "main.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 // Sanity test: this should loop ten times, and
 // min/max/average should be close to 100ms.
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
index 5a118c2bb..5ac830746 100644
--- a/src/bench/bench_bitcoin.cpp
+++ b/src/bench/bench_bitcoin.cpp
@@ -8,7 +8,7 @@
 #include "fs.h"
 #include "key.h"
 #include "main.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "librustzcash.h"
 
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index c44e23620..ba42692c7 100644
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "bench.h"
-#include "util.h"
+#include "util/system.h"
 #include "main.h"
 #include "checkqueue.h"
 #include "prevector.h"
diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
index 298316c4e..7b32c9513 100644
--- a/src/bench/crypto_hash.cpp
+++ b/src/bench/crypto_hash.cpp
@@ -8,7 +8,7 @@
 #include "bench.h"
 #include "bloom.h"
 #include "random.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "crypto/ripemd160.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"
diff --git a/src/bench/verification.cpp b/src/bench/verification.cpp
index 1b5300a40..d79bf7b04 100644
--- a/src/bench/verification.cpp
+++ b/src/bench/verification.cpp
@@ -11,7 +11,7 @@
 #include "script/sign.h"
 #include "streams.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 
 #include "librustzcash.h"
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index e7db3fb36..93b1d9505 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -9,8 +9,8 @@
 #include "fs.h"
 #include "rpc/client.h"
 #include "rpc/protocol.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index a59825d2b..acf004533 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -15,9 +15,9 @@
 #include "script/script.h"
 #include "script/sign.h"
 #include <univalue.h>
-#include "util.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index c8bb23b30..739584e75 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -12,7 +12,7 @@
 #include "main.h"
 #include "noui.h"
 #include "scheduler.h"
-#include "util.h"
+#include "util/system.h"
 #include "httpserver.h"
 #include "httprpc.h"
 
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 91166d93f..e169d116b 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -9,8 +9,8 @@
 #include "crypto/equihash.h"
 
 #include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <assert.h>
 #include <optional>
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index ce3eeb106..b3281a773 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -7,7 +7,7 @@
 #include "chainparamsbase.h"
 
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <assert.h>
 
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 5fd7fedbf..9aed34ac8 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -8,7 +8,7 @@
 #include <key_io.h>
 #include <script/standard.h>
 #include "upgrades.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/match.h"
 
 namespace Consensus {
diff --git a/src/core_read.cpp b/src/core_read.cpp
index 8dbcda719..41d811329 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -11,8 +11,8 @@
 #include "serialize.h"
 #include "streams.h"
 #include <univalue.h>
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "version.h"
 
 #include <boost/algorithm/string/classification.hpp>
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 651715ad1..c0d8a070c 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -12,9 +12,9 @@
 #include "serialize.h"
 #include "streams.h"
 #include <univalue.h>
-#include "util.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 
 #include <boost/assign/list_of.hpp>
 
diff --git a/src/crypto/equihash.cpp b/src/crypto/equihash.cpp
index 4ecac489c..0f5ce6162 100644
--- a/src/crypto/equihash.cpp
+++ b/src/crypto/equihash.cpp
@@ -18,7 +18,7 @@
 
 #include "compat/endian.h"
 #include "crypto/equihash.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <optional>
 
diff --git a/src/crypto/equihash.h b/src/crypto/equihash.h
index 4eda1a390..cce37de24 100644
--- a/src/crypto/equihash.h
+++ b/src/crypto/equihash.h
@@ -30,7 +30,7 @@ void EhIndexToArray(const eh_index i, unsigned char* array);
 #ifdef ENABLE_MINING
 
 #include "crypto/sha256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <cstring>
 #include <exception>
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 52e7277ef..8375fc4bc 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -6,7 +6,7 @@
 #include "dbwrapper.h"
 
 #include "fs.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <leveldb/cache.h>
 #include <leveldb/env.h>
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index b0aab28c7..d6911ce58 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -10,7 +10,7 @@
 #include "fs.h"
 #include "serialize.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 
 #include <leveldb/db.h>
diff --git a/src/deprecation.cpp b/src/deprecation.cpp
index 46f350c92..2c81d0703 100644
--- a/src/deprecation.cpp
+++ b/src/deprecation.cpp
@@ -8,7 +8,7 @@
 #include "clientversion.h"
 #include "init.h"
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 #include "chainparams.h"
 
 // Flags that enable deprecated functionality.
diff --git a/src/experimental_features.cpp b/src/experimental_features.cpp
index dd2edd504..d434d6a47 100644
--- a/src/experimental_features.cpp
+++ b/src/experimental_features.cpp
@@ -4,7 +4,7 @@
 
 #include "experimental_features.h"
 
-#include "util.h"
+#include "util/system.h"
 
 bool fExperimentalDeveloperEncryptWallet = false;
 bool fExperimentalDeveloperSetPoolSizeZero = false;
diff --git a/src/gtest/json_test_vectors.h b/src/gtest/json_test_vectors.h
index a2a2545de..e2c8bce59 100644
--- a/src/gtest/json_test_vectors.h
+++ b/src/gtest/json_test_vectors.h
@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 #include "serialize.h"
 #include "streams.h"
diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp
index f77e8c1c6..c4d3eaaeb 100644
--- a/src/gtest/main.cpp
+++ b/src/gtest/main.cpp
@@ -3,7 +3,7 @@
 #include "key.h"
 #include "pubkey.h"
 #include "random.h"
-#include "util.h"
+#include "util/system.h"
 #include "utiltest.h"
 
 #include "librustzcash.h"
diff --git a/src/gtest/test_coins.cpp b/src/gtest/test_coins.cpp
index c06651cc3..d211aa19a 100644
--- a/src/gtest/test_coins.cpp
+++ b/src/gtest/test_coins.cpp
@@ -7,7 +7,7 @@
 #include "gtest/utils.h"
 #include "script/standard.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 #include "consensus/validation.h"
 #include "main.h"
diff --git a/src/gtest/test_consensus.cpp b/src/gtest/test_consensus.cpp
index 4ea3cffa6..4d45b990c 100644
--- a/src/gtest/test_consensus.cpp
+++ b/src/gtest/test_consensus.cpp
@@ -4,7 +4,7 @@
 #include <rust/ed25519.h>
 
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 void TestLibsodiumEd25519SignatureVerification(
     const std::string &scope,
diff --git a/src/gtest/test_deprecation.cpp b/src/gtest/test_deprecation.cpp
index 27048b6a4..fe8e1e25f 100644
--- a/src/gtest/test_deprecation.cpp
+++ b/src/gtest/test_deprecation.cpp
@@ -7,8 +7,8 @@
 #include "fs.h"
 #include "init.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <fstream>
 
diff --git a/src/gtest/test_equihash.cpp b/src/gtest/test_equihash.cpp
index d4dde48f7..81f6c861f 100644
--- a/src/gtest/test_equihash.cpp
+++ b/src/gtest/test_equihash.cpp
@@ -7,7 +7,7 @@
 
 #include "crypto/equihash.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 void TestExpandAndCompress(const std::string &scope, size_t bit_len, size_t byte_pad,
                            std::vector<unsigned char> compact,
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index c69fb8ebc..728b52bf9 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -1,12 +1,12 @@
 #include <gtest/gtest.h>
 
 #include "main.h"
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 #include "chainparams.h"
 #include "consensus/funding.h"
 #include "fs.h"
 #include "key_io.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
 #include "amount.h"
@@ -14,7 +14,7 @@
 #include <string>
 #include <set>
 #include <vector>
-#include "util.h"
+#include "util/system.h"
 #include "utiltest.h"
 
 // To run tests:
diff --git a/src/gtest/test_joinsplit.cpp b/src/gtest/test_joinsplit.cpp
index e5538abac..984380fde 100644
--- a/src/gtest/test_joinsplit.cpp
+++ b/src/gtest/test_joinsplit.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 
 #include "zcash/prf.h"
-#include "util.h"
+#include "util/system.h"
 #include "streams.h"
 #include "version.h"
 #include "serialize.h"
diff --git a/src/gtest/test_mempool.cpp b/src/gtest/test_mempool.cpp
index 19067b378..97531dbb1 100644
--- a/src/gtest/test_mempool.cpp
+++ b/src/gtest/test_mempool.cpp
@@ -8,7 +8,7 @@
 #include "primitives/transaction.h"
 #include "txmempool.h"
 #include "policy/fees.h"
-#include "util.h"
+#include "util/system.h"
 
 // Implementation is in test_checktransaction.cpp
 extern CMutableTransaction GetValidTransaction(uint32_t consensusBranchId=SPROUT_BRANCH_ID);
diff --git a/src/gtest/test_mempoollimit.cpp b/src/gtest/test_mempoollimit.cpp
index b674189be..a2d5ecd35 100644
--- a/src/gtest/test_mempoollimit.cpp
+++ b/src/gtest/test_mempoollimit.cpp
@@ -8,7 +8,7 @@
 #include "arith_uint256.h"
 #include "mempool_limit.h"
 #include "gtest/utils.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "utiltest.h"
 #include "transaction_builder.h"
 
diff --git a/src/gtest/test_merkletree.cpp b/src/gtest/test_merkletree.cpp
index 1898d8c0f..6401b0c82 100644
--- a/src/gtest/test_merkletree.cpp
+++ b/src/gtest/test_merkletree.cpp
@@ -17,7 +17,7 @@
 
 #include <stdexcept>
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 #include "serialize.h"
 #include "streams.h"
diff --git a/src/gtest/test_metrics.cpp b/src/gtest/test_metrics.cpp
index adeb857d0..4021665fa 100644
--- a/src/gtest/test_metrics.cpp
+++ b/src/gtest/test_metrics.cpp
@@ -2,7 +2,7 @@
 
 #include "metrics.h"
 #include "utiltest.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 
 TEST(Metrics, AtomicTimer) {
diff --git a/src/gtest/test_miner.cpp b/src/gtest/test_miner.cpp
index 61d454407..17e610feb 100644
--- a/src/gtest/test_miner.cpp
+++ b/src/gtest/test_miner.cpp
@@ -5,7 +5,7 @@
 #include "chainparams.h"
 #include "key.h"
 #include "miner.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <variant>
 
diff --git a/src/gtest/test_rpc.cpp b/src/gtest/test_rpc.cpp
index bf2f0f090..33aa76fad 100644
--- a/src/gtest/test_rpc.cpp
+++ b/src/gtest/test_rpc.cpp
@@ -8,7 +8,7 @@
 #include "primitives/block.h"
 #include "rpc/server.h"
 #include "streams.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 extern UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false);
 
diff --git a/src/gtest/test_timedata.cpp b/src/gtest/test_timedata.cpp
index 16d92da1f..cc16d5b57 100644
--- a/src/gtest/test_timedata.cpp
+++ b/src/gtest/test_timedata.cpp
@@ -8,7 +8,7 @@
 #include "timedata.h"
 #include "random.h"
 #include "netbase.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 using ::testing::StrictMock;
 
diff --git a/src/gtest/test_txid.cpp b/src/gtest/test_txid.cpp
index b839d8a03..520a785d3 100644
--- a/src/gtest/test_txid.cpp
+++ b/src/gtest/test_txid.cpp
@@ -4,8 +4,8 @@
 #include "serialize.h"
 #include "streams.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 /*
  Test that removing #1144 succeeded by verifying the hash of a transaction is over the entire serialized form.
diff --git a/src/gtest/utils.h b/src/gtest/utils.h
index 147ec99ab..bb4fe2818 100644
--- a/src/gtest/utils.h
+++ b/src/gtest/utils.h
@@ -2,7 +2,7 @@
 #define BITCOIN_GTEST_UTILS_H
 
 #include "random.h"
-#include "util.h"
+#include "util/system.h"
 #include "key_io.h"
 
 int GenZero(int n);
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index ac83b1692..eb03e36df 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -7,8 +7,8 @@
 #include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "ui_interface.h"
 #include "crypto/hmac_sha256.h"
 #include <stdio.h>
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index cdc954e6e..fefc28685 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -7,7 +7,7 @@
 
 #include "chainparamsbase.h"
 #include "compat.h"
-#include "util.h"
+#include "util/system.h"
 #include "netbase.h"
 #include "rpc/protocol.h" // For HTTP status codes
 #include "sync.h"
diff --git a/src/init.cpp b/src/init.cpp
index 39eb438e2..e6e4944ee 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -38,8 +38,8 @@
 #include "txdb.h"
 #include "torcontrol.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 7d098a262..707c81c2d 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -8,7 +8,7 @@
 #include <base58.h>
 #include <bech32.h>
 #include <script/script.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <rust/address.h>
 
diff --git a/src/keystore.cpp b/src/keystore.cpp
index c8edd3eee..a80226956 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -8,7 +8,7 @@
 
 #include "key.h"
 #include "pubkey.h"
-#include "util.h"
+#include "util/system.h"
 
 
 bool CKeyStore::AddKey(const CKey &key) {
diff --git a/src/logging.cpp b/src/logging.cpp
index dd7baa476..449664c15 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -8,7 +8,7 @@
 
 #include "fs.h"
 #include "serialize.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <set>
 
diff --git a/src/main.cpp b/src/main.cpp
index c73fc7063..65bc46ae9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,8 +29,8 @@
 #include "txmempool.h"
 #include "ui_interface.h"
 #include "undo.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 #include "wallet/asyncrpcoperation_sendmany.h"
 #include "wallet/asyncrpcoperation_shieldcoinbase.h"
diff --git a/src/mempool_limit.cpp b/src/mempool_limit.cpp
index 8d91d22cb..847fe0b40 100644
--- a/src/mempool_limit.cpp
+++ b/src/mempool_limit.cpp
@@ -9,7 +9,7 @@
 #include "random.h"
 #include "serialize.h"
 #include "timedata.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "version.h"
 
 const TxWeight ZERO_WEIGHT = TxWeight(0, 0);
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index bf90141a8..9ff9d19b2 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -8,7 +8,7 @@
 
 #include "hash.h"
 #include "consensus/consensus.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter)
 {
diff --git a/src/metrics.cpp b/src/metrics.cpp
index 231f5e457..ce644a21e 100644
--- a/src/metrics.cpp
+++ b/src/metrics.cpp
@@ -9,10 +9,10 @@
 #include "main.h"
 #include "timedata.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utiltime.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/time.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 
 #include <boost/range/irange.hpp>
 #include <boost/thread.hpp>
diff --git a/src/miner.cpp b/src/miner.cpp
index 63af3d34b..e4c757fd3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -31,8 +31,8 @@
 #include "timedata.h"
 #include "transaction_builder.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 
 #include <librustzcash.h>
diff --git a/src/net.h b/src/net.h
index 9b9c43742..874c10fa6 100644
--- a/src/net.h
+++ b/src/net.h
@@ -18,7 +18,7 @@
 #include "streams.h"
 #include "sync.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "chainparams.h"
 
 #include <atomic>
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 544648a20..41e74716a 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -14,8 +14,8 @@
 #include "sync.h"
 #include "uint256.h"
 #include "random.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #ifdef HAVE_GETADDRINFO_A
 #include <netdb.h>
diff --git a/src/noui.cpp b/src/noui.cpp
index 686f6f366..277ba7db9 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -7,7 +7,7 @@
 #include "noui.h"
 
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <cstdio>
 #include <stdint.h>
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index da182b08e..4b2908529 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -9,7 +9,7 @@
 #include "primitives/transaction.h"
 #include "streams.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 
 void TxConfirmStats::Initialize(std::vector<double>& defaultBuckets,
                                 unsigned int maxConfirms, double _decay, std::string _dataTypeString)
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 8c1872922..967801e78 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -9,8 +9,8 @@
 
 #include "main.h"
 #include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 
     /**
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 1ec13c23b..7b433f3e3 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -8,7 +8,7 @@
 
 #include "hash.h"
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "crypto/common.h"
 
 #include <rust/constants.h>
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index fb05ffe0d..56ea2d6f2 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -8,7 +8,7 @@
 
 #include "hash.h"
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <rust/transaction.h>
 
diff --git a/src/protocol.cpp b/src/protocol.cpp
index f257ba4f8..920205345 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -6,8 +6,8 @@
 
 #include "protocol.h"
 
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #ifndef WIN32
 # include <arpa/inet.h>
diff --git a/src/random.cpp b/src/random.cpp
index 6479469d6..bb83334ca 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -11,7 +11,7 @@
 #include "compat.h" // for Windows API
 #endif
 #include "logging.h"  // for LogPrint()
-#include "utiltime.h" // for GetTime()
+#include "util/time.h" // for GetTime()
 
 #include <limits>
 
diff --git a/src/rest.cpp b/src/rest.cpp
index 23a06f4c3..29db4a6ba 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -13,7 +13,7 @@
 #include "streams.h"
 #include "sync.h"
 #include "txmempool.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 
 #include <boost/algorithm/string.hpp>
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 4e2736ba2..3952fe6b2 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -17,7 +17,7 @@
 #include "rpc/server.h"
 #include "streams.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdint.h>
 
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 3b59780ff..7e0af3ac0 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -6,7 +6,7 @@
 
 #include "rpc/client.h"
 #include "rpc/protocol.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <set>
 #include <stdint.h>
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 8d000e0ae..083be8bc2 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -22,7 +22,7 @@
 #include "pow.h"
 #include "rpc/server.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index ed7a0129c..9cb592413 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -13,7 +13,7 @@
 #include "netbase.h"
 #include "rpc/server.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index c174a93c3..e00e15493 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -12,7 +12,7 @@
 #include "protocol.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 #include "deprecation.h"
 
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
index 900e7a1e9..eff78a457 100644
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -8,9 +8,9 @@
 
 #include "random.h"
 #include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/strencodings.h"
+#include "util/time.h"
 #include "version.h"
 
 #include <stdint.h>
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 56416b320..62867c03d 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -12,8 +12,8 @@
 #include "random.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "asyncrpcqueue.h"
 
 #include <memory>
diff --git a/src/script/script.cpp b/src/script/script.cpp
index b9c162085..a030e0c72 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -7,7 +7,7 @@
 #include "script.h"
 
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 using namespace std;
 
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
index 0bd45b21c..93d38aa0c 100644
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -10,7 +10,7 @@
 #include "pubkey.h"
 #include "random.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/thread.hpp>
 #include <boost/unordered_set.hpp>
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index bbfb50d0b..7ab966065 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -8,8 +8,8 @@
 
 #include "pubkey.h"
 #include "script/script.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 
 using namespace std;
diff --git a/src/sendalert.cpp b/src/sendalert.cpp
index 462a2077b..8c5286c1b 100644
--- a/src/sendalert.cpp
+++ b/src/sendalert.cpp
@@ -43,8 +43,8 @@ the bad alert.
 #include "alert.h"
 #include "init.h"
 
-#include "util.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/time.h"
 #include "key.h"
 #include "clientversion.h"
 #include "chainparams.h"
diff --git a/src/sync.cpp b/src/sync.cpp
index 2ed52254f..a0019e3c8 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -6,7 +6,7 @@
 #include "sync.h"
 
 #include "logging.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index c67b3aa75..f3b9b242d 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -16,7 +16,7 @@
 #include "pow.h"
 #include "script/sign.h"
 #include "serialize.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
index 15991dc02..10d44e65d 100644
--- a/src/test/alert_tests.cpp
+++ b/src/test/alert_tests.cpp
@@ -18,7 +18,7 @@
 #include "rpc/server.h"
 #include "serialize.h"
 #include "streams.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "utiltest.h"
 #include "warnings.h"
 
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index 8155813f8..0a60c151a 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "util.h"
+#include "util/system.h"
 
 #include "support/allocators/secure.h"
 #include "test/test_bitcoin.h"
diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp
index 3827466f0..06920efa7 100644
--- a/src/test/base32_tests.cpp
+++ b/src/test/base32_tests.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index 7ca7885d1..0fc8e93bb 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -15,8 +15,8 @@
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <univalue.h>
 
diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp
index 1bc7a2282..179e3ea2d 100644
--- a/src/test/base64_tests.cpp
+++ b/src/test/base64_tests.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/bech32_tests.cpp b/src/test/bech32_tests.cpp
index 8d81644c1..2a48ce082 100644
--- a/src/test/bech32_tests.cpp
+++ b/src/test/bech32_tests.cpp
@@ -4,7 +4,7 @@
 
 #include "bech32.h"
 #include "test/test_bitcoin.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index ac9659c88..4019c6e31 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -8,8 +8,8 @@
 #include "key.h"
 #include "key_io.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <string>
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index 31961b3b9..e889f739e 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -13,8 +13,8 @@
 #include "serialize.h"
 #include "streams.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
index 77de7fb3a..45046ba81 100644
--- a/src/test/checkblock_tests.cpp
+++ b/src/test/checkblock_tests.cpp
@@ -9,7 +9,7 @@
 #include "main.h"
 #include "proof_verifier.h"
 #include "test/test_bitcoin.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "zcash/Proof.hpp"
 
 #include <cstdio>
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index f619b2e72..fef5231a0 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "util.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/time.h"
 
 #include "test/test_bitcoin.h"
 #include "checkqueue.h"
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 946a0946a..d4fe4c145 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -7,7 +7,7 @@
 #include "test_random.h"
 #include "script/standard.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 #include "consensus/validation.h"
 #include "main.h"
diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp
index 6e9a1c318..b1b9c40b1 100644
--- a/src/test/compress_tests.cpp
+++ b/src/test/compress_tests.cpp
@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "compressor.h"
-#include "util.h"
+#include "util/system.h"
 #include "test/test_bitcoin.h"
 
 #include <stdint.h>
diff --git a/src/test/convertbits_tests.cpp b/src/test/convertbits_tests.cpp
index 2f59f81a0..3b8511d87 100644
--- a/src/test/convertbits_tests.cpp
+++ b/src/test/convertbits_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 #include <zcash/NoteEncryption.hpp>
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
index 274fbe9cd..316aff608 100644
--- a/src/test/crypto_tests.cpp
+++ b/src/test/crypto_tests.cpp
@@ -12,7 +12,7 @@
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
 #include "test_random.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>
diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp
index 12c011749..809f1c045 100644
--- a/src/test/getarg_tests.cpp
+++ b/src/test/getarg_tests.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "util.h"
+#include "util/system.h"
 #include "test/test_bitcoin.h"
 
 #include <string>
diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp
index d81dfd358..64c6094aa 100644
--- a/src/test/hash_tests.cpp
+++ b/src/test/hash_tests.cpp
@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "hash.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
index a94117e65..4f11bcb53 100644
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -9,8 +9,8 @@
 #include "key_io.h"
 #include "script/script.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "utiltest.h"
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index b91cbe1fd..735ec05bc 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -6,7 +6,7 @@
 #include "consensus/upgrades.h"
 #include "main.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 6c9b76dea..f3e9acc47 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -9,7 +9,7 @@
 #include "miner.h"
 #include "pubkey.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "crypto/equihash.h"
 //#include "pow/tromp/equi_miner.h"
 
diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp
index 20de7eddf..f1f1b21a5 100644
--- a/src/test/policyestimator_tests.cpp
+++ b/src/test/policyestimator_tests.cpp
@@ -6,7 +6,7 @@
 #include "policy/fees.h"
 #include "txmempool.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp
index 53f0fc2e1..b1fcdb851 100644
--- a/src/test/pow_tests.cpp
+++ b/src/test/pow_tests.cpp
@@ -5,7 +5,7 @@
 
 #include "main.h"
 #include "pow.h"
-#include "util.h"
+#include "util/system.h"
 #include "utiltest.h"
 #include "test/test_bitcoin.h"
 
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 43d1aac6f..aa02c078d 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -10,7 +10,7 @@
 #include "key_io.h"
 #include "main.h"
 #include "netbase.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index cf7904f8e..281ce1d37 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -14,7 +14,7 @@
 #include "script/script.h"
 #include "script/script_error.h"
 #include "script/sign.h"
-#include "util.h"
+#include "util/system.h"
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"
 
diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp
index a63cafa91..e4aef9697 100644
--- a/src/test/serialize_tests.cpp
+++ b/src/test/serialize_tests.cpp
@@ -7,7 +7,7 @@
 #include "streams.h"
 #include "hash.h"
 #include "test/test_bitcoin.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <array>
 #include <optional>
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 9a66063d3..0d6f20c02 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -13,7 +13,7 @@
 #include "serialize.h"
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 
 #include <iostream>
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
index dec4f63fe..f8e5a93ff 100644
--- a/src/test/skiplist_tests.cpp
+++ b/src/test/skiplist_tests.cpp
@@ -5,7 +5,7 @@
 
 #include "main.h"
 #include "test_random.h"
-#include "util.h"
+#include "util/system.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 3b42ac558..9cee12b2f 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -12,7 +12,7 @@
 #include "random.h"
 #include "script/standard.h"
 #include "test/test_bitcoin.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 98cba67fa..934d6a4a2 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -3,14 +3,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "util.h"
+#include "util/system.h"
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
 #include "test_random.h"
 #include "sync.h"
-#include "utilstrencodings.h"
-#include "utilmoneystr.h"
+#include "util/strencodings.h"
+#include "util/moneystr.h"
 #include "test/test_bitcoin.h"
 
 #include <stdint.h>
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 545aa616a..b3159babe 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -8,8 +8,8 @@
 #include "netbase.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "warnings.h"
 
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index cbfa0d640..b2addf099 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -4,9 +4,9 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "torcontrol.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "net.h"
-#include "util.h"
+#include "util/system.h"
 #include "crypto/hmac_sha256.h"
 
 #include <vector>
diff --git a/src/transaction_builder.cpp b/src/transaction_builder.cpp
index eb154aa99..9a9fc3c98 100644
--- a/src/transaction_builder.cpp
+++ b/src/transaction_builder.cpp
@@ -9,7 +9,7 @@
 #include "pubkey.h"
 #include "rpc/protocol.h"
 #include "script/sign.h"
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 #include "zcash/Note.hpp"
 
 #include <librustzcash.h>
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 901c80ef1..c646dece1 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -13,8 +13,8 @@
 #include "policy/fees.h"
 #include "streams.h"
 #include "timedata.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 #include "version.h"
 
diff --git a/src/uint256.cpp b/src/uint256.cpp
index f21ababbb..3c99c1d5f 100644
--- a/src/uint256.cpp
+++ b/src/uint256.cpp
@@ -6,7 +6,7 @@
 
 #include "uint256.h"
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/utilmoneystr.cpp b/src/util/moneystr.cpp
similarity index 97%
rename from src/utilmoneystr.cpp
rename to src/util/moneystr.cpp
index dd341e400..98a4461bf 100644
--- a/src/utilmoneystr.cpp
+++ b/src/util/moneystr.cpp
@@ -4,11 +4,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 
 #include "primitives/transaction.h"
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 using namespace std;
 
diff --git a/src/utilmoneystr.h b/src/util/moneystr.h
similarity index 84%
rename from src/utilmoneystr.h
rename to src/util/moneystr.h
index 40e3b9296..e071134ec 100644
--- a/src/utilmoneystr.h
+++ b/src/util/moneystr.h
@@ -7,8 +7,8 @@
 /**
  * Money parsing/formatting utilities.
  */
-#ifndef BITCOIN_UTILMONEYSTR_H
-#define BITCOIN_UTILMONEYSTR_H
+#ifndef BITCOIN_UTIL_MONEYSTR_H
+#define BITCOIN_UTIL_MONEYSTR_H
 
 #include <stdint.h>
 #include <string>
@@ -19,4 +19,4 @@ std::string FormatMoney(const CAmount& n);
 bool ParseMoney(const std::string& str, CAmount& nRet);
 bool ParseMoney(const char* pszIn, CAmount& nRet);
 
-#endif // BITCOIN_UTILMONEYSTR_H
+#endif // BITCOIN_UTIL_MONEYSTR_H
diff --git a/src/utilstrencodings.cpp b/src/util/strencodings.cpp
similarity index 99%
rename from src/utilstrencodings.cpp
rename to src/util/strencodings.cpp
index 01891e964..e4131478b 100644
--- a/src/utilstrencodings.cpp
+++ b/src/util/strencodings.cpp
@@ -4,7 +4,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include "tinyformat.h"
 
diff --git a/src/utilstrencodings.h b/src/util/strencodings.h
similarity index 98%
rename from src/utilstrencodings.h
rename to src/util/strencodings.h
index 4faa4ea2a..af565c91c 100644
--- a/src/utilstrencodings.h
+++ b/src/util/strencodings.h
@@ -7,8 +7,8 @@
 /**
  * Utilities for converting data from/to strings.
  */
-#ifndef BITCOIN_UTILSTRENCODINGS_H
-#define BITCOIN_UTILSTRENCODINGS_H
+#ifndef BITCOIN_UTIL_STRENCODINGS_H
+#define BITCOIN_UTIL_STRENCODINGS_H
 
 #include <stdint.h>
 #include <string>
@@ -174,4 +174,4 @@ std::optional<std::vector<uint8_t>> ParseArbitraryInt(const std::string& s);
  */
 std::string ArbitraryIntStr(std::vector<uint8_t> i);
 
-#endif // BITCOIN_UTILSTRENCODINGS_H
+#endif // BITCOIN_UTIL_STRENCODINGS_H
diff --git a/src/util.cpp b/src/util/system.cpp
similarity index 99%
rename from src/util.cpp
rename to src/util/system.cpp
index edccd0ff1..d0b300148 100644
--- a/src/util.cpp
+++ b/src/util/system.cpp
@@ -8,15 +8,15 @@
 #include "config/bitcoin-config.h"
 #endif
 
-#include "util.h"
+#include "util/system.h"
 
 #include "chainparamsbase.h"
 #include "fs.h"
 #include "random.h"
 #include "serialize.h"
 #include "sync.h"
-#include "utilstrencodings.h"
-#include "utiltime.h"
+#include "util/strencodings.h"
+#include "util/time.h"
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/util.h b/src/util/system.h
similarity index 98%
rename from src/util.h
rename to src/util/system.h
index fadf85504..83f9d44c5 100644
--- a/src/util.h
+++ b/src/util/system.h
@@ -8,8 +8,8 @@
  * Server/client environment: argument handling, config file parsing,
  * thread wrappers
  */
-#ifndef BITCOIN_UTIL_H
-#define BITCOIN_UTIL_H
+#ifndef BITCOIN_UTIL_SYSTEM_H
+#define BITCOIN_UTIL_SYSTEM_H
 
 #if defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"
@@ -19,7 +19,7 @@
 #include "fs.h"
 #include "logging.h"
 #include "tinyformat.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 #include <atomic>
 #include <exception>
@@ -216,4 +216,4 @@ template <typename Callable> void TraceThread(const char* name,  Callable func)
     }
 }
 
-#endif // BITCOIN_UTIL_H
+#endif // BITCOIN_UTIL_SYSTEM_H
diff --git a/src/utiltime.cpp b/src/util/time.cpp
similarity index 98%
rename from src/utiltime.cpp
rename to src/util/time.cpp
index d843108eb..68794829d 100644
--- a/src/utiltime.cpp
+++ b/src/util/time.cpp
@@ -8,7 +8,7 @@
 #include "config/bitcoin-config.h"
 #endif
 
-#include "utiltime.h"
+#include "util/time.h"
 
 #include <chrono>
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/utiltime.h b/src/util/time.h
similarity index 86%
rename from src/utiltime.h
rename to src/util/time.h
index 007d41708..a563da702 100644
--- a/src/utiltime.h
+++ b/src/util/time.h
@@ -4,8 +4,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#ifndef BITCOIN_UTILTIME_H
-#define BITCOIN_UTILTIME_H
+#ifndef BITCOIN_UTIL_TIME_H
+#define BITCOIN_UTIL_TIME_H
 
 #include <stdint.h>
 #include <string>
@@ -18,4 +18,4 @@ void MilliSleep(int64_t n);
 
 std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime);
 
-#endif // BITCOIN_UTILTIME_H
+#endif // BITCOIN_UTIL_TIME_H
diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
index 304372067..49cafe976 100644
--- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp
+++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
@@ -21,10 +21,10 @@
 #include "script/interpreter.h"
 #include "timedata.h"
 #include "transaction_builder.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/match.h"
-#include "utilmoneystr.h"
-#include "utiltime.h"
+#include "util/moneystr.h"
+#include "util/time.h"
 #include "wallet.h"
 #include "walletdb.h"
 #include "wallet/paymentdisclosuredb.h"
diff --git a/src/wallet/asyncrpcoperation_saplingmigration.cpp b/src/wallet/asyncrpcoperation_saplingmigration.cpp
index b2dadb5da..8d3b94c64 100644
--- a/src/wallet/asyncrpcoperation_saplingmigration.cpp
+++ b/src/wallet/asyncrpcoperation_saplingmigration.cpp
@@ -7,8 +7,8 @@
 #include "sync.h"
 #include "tinyformat.h"
 #include "transaction_builder.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "wallet.h"
 
 #include <optional>
diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp
index 2ab58b6ed..22781b119 100644
--- a/src/wallet/asyncrpcoperation_sendmany.cpp
+++ b/src/wallet/asyncrpcoperation_sendmany.cpp
@@ -20,13 +20,13 @@
 #include "rpc/server.h"
 #include "transaction_builder.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/match.h"
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 #include "wallet.h"
 #include "walletdb.h"
 #include "script/interpreter.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "zcash/IncrementalMerkleTree.hpp"
 #include "miner.h"
 #include "wallet/paymentdisclosuredb.h"
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
index 2a257c94e..7fee0b8f9 100644
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
@@ -20,12 +20,12 @@
 #include "rpc/server.h"
 #include "transaction_builder.h"
 #include "timedata.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "wallet.h"
 #include "walletdb.h"
 #include "script/interpreter.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "util/match.h"
 #include "zcash/IncrementalMerkleTree.hpp"
 #include "miner.h"
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
index ab883e486..e67573956 100644
--- a/src/wallet/crypter.cpp
+++ b/src/wallet/crypter.cpp
@@ -10,7 +10,7 @@
 #include "script/script.h"
 #include "script/standard.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <string>
 #include <vector>
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
index 2a1f6589a..6fb160074 100644
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -10,8 +10,8 @@
 #include "fs.h"
 #include "hash.h"
 #include "protocol.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <stdint.h>
 
diff --git a/src/wallet/gtest/test_paymentdisclosure.cpp b/src/wallet/gtest/test_paymentdisclosure.cpp
index c60546a97..dad3efbd8 100644
--- a/src/wallet/gtest/test_paymentdisclosure.cpp
+++ b/src/wallet/gtest/test_paymentdisclosure.cpp
@@ -3,9 +3,9 @@
 #include "fs.h"
 #include "main.h"
 #include "random.h"
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 #include "chainparams.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
 #include "amount.h"
@@ -16,7 +16,7 @@
 #include <set>
 #include <vector>
 #include <iostream>
-#include "util.h"
+#include "util/system.h"
 
 #include "wallet/paymentdisclosure.h"
 #include "wallet/paymentdisclosuredb.h"
diff --git a/src/wallet/gtest/test_wallet_zkeys.cpp b/src/wallet/gtest/test_wallet_zkeys.cpp
index 5a2ce53da..34ee9b15c 100644
--- a/src/wallet/gtest/test_wallet_zkeys.cpp
+++ b/src/wallet/gtest/test_wallet_zkeys.cpp
@@ -5,7 +5,7 @@
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"
-#include "util.h"
+#include "util/system.h"
 
 /**
  * This test covers Sapling methods on CWallet
diff --git a/src/wallet/paymentdisclosure.cpp b/src/wallet/paymentdisclosure.cpp
index 541d036fc..cc2603acc 100644
--- a/src/wallet/paymentdisclosure.cpp
+++ b/src/wallet/paymentdisclosure.cpp
@@ -5,7 +5,7 @@
 #include "wallet/paymentdisclosure.h"
 
 #include "key_io.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <rust/ed25519.h>
 
diff --git a/src/wallet/paymentdisclosuredb.cpp b/src/wallet/paymentdisclosuredb.cpp
index ca6045613..05c0d6276 100644
--- a/src/wallet/paymentdisclosuredb.cpp
+++ b/src/wallet/paymentdisclosuredb.cpp
@@ -5,7 +5,7 @@
 #include "wallet/paymentdisclosuredb.h"
 
 #include "fs.h"
-#include "util.h"
+#include "util/system.h"
 #include "dbwrapper.h"
 
 using namespace std;
diff --git a/src/wallet/rpcdisclosure.cpp b/src/wallet/rpcdisclosure.cpp
index 5c3cfaa2b..a70dc5901 100644
--- a/src/wallet/rpcdisclosure.cpp
+++ b/src/wallet/rpcdisclosure.cpp
@@ -10,8 +10,8 @@
 #include "script/script.h"
 #include "script/standard.h"
 #include "sync.h"
-#include "util.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/time.h"
 #include "wallet.h"
 #include "wallet/paymentdisclosure.h"
 #include "wallet/paymentdisclosuredb.h"
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 69e1f804d..35f4635ca 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -13,9 +13,9 @@
 #include "script/script.h"
 #include "script/standard.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/match.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "wallet.h"
 
 #include <fstream>
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8ae1c410a..d15e43df0 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -20,10 +20,10 @@
 #include "timedata.h"
 #include "tinyformat.h"
 #include "transaction_builder.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/match.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 #include "wallet.h"
 #include "walletdb.h"
 #include "primitives/transaction.h"
@@ -33,7 +33,7 @@
 #include "zcash/Address.hpp"
 #include "zcash/address/zip32.h"
 
-#include "utiltime.h"
+#include "util/time.h"
 #include "asyncrpcoperation.h"
 #include "asyncrpcqueue.h"
 #include "wallet/asyncrpcoperation_mergetoaddress.h"
diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp
index 45790f262..d908f9f1d 100644
--- a/src/wallet/test/crypto_tests.cpp
+++ b/src/wallet/test/crypto_tests.cpp
@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "test/test_random.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 #include "wallet/crypter.h"
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 2ce443df5..268473e8f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -25,7 +25,7 @@
 #include "script/script.h"
 #include "script/sign.h"
 #include "timedata.h"
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 #include "util/match.h"
 #include "zcash/Address.hpp"
 #include "zcash/JoinSplit.hpp"
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 5a6be9dd6..9ba986c12 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -18,8 +18,8 @@
 #include "tinyformat.h"
 #include "transaction_builder.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "validationinterface.h"
 #include "script/ismine.h"
 #include "wallet/crypter.h"
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 93e40ca48..9bf56152e 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -15,8 +15,8 @@
 #include "serialize.h"
 #include "script/standard.h"
 #include "sync.h"
-#include "util.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/time.h"
 #include "wallet/wallet.h"
 #include "zcash/Proof.hpp"
 
diff --git a/src/warnings.cpp b/src/warnings.cpp
index 6485a5667..618359669 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -6,7 +6,7 @@
 
 #include "sync.h"
 #include "clientversion.h"
-#include "util.h"
+#include "util/system.h"
 #include "warnings.h"
 #include "alert.h"
 #include "uint256.h"
diff --git a/src/zcash/Address.cpp b/src/zcash/Address.cpp
index bef337ea7..ab21b913e 100644
--- a/src/zcash/Address.cpp
+++ b/src/zcash/Address.cpp
@@ -1,6 +1,6 @@
 #include "Address.hpp"
 #include "zcash/address/unified.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/zcash/address/unified.cpp b/src/zcash/address/unified.cpp
index 2875521ca..b5dbc22b8 100644
--- a/src/zcash/address/unified.cpp
+++ b/src/zcash/address/unified.cpp
@@ -6,7 +6,7 @@
 #include "zcash/Address.hpp"
 #include "unified.h"
 #include "util/match.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <rust/unified_keys.h>
 
diff --git a/src/zcash/address/zip32.h b/src/zcash/address/zip32.h
index f71c956f6..10380ede2 100644
--- a/src/zcash/address/zip32.h
+++ b/src/zcash/address/zip32.h
@@ -9,7 +9,7 @@
 #include "key.h"
 #include "support/allocators/secure.h"
 #include "uint256.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "zcash/address/sapling.hpp"
 #include <librustzcash.h>
 #include <rust/zip339.h>
diff --git a/src/zcbenchmarks.cpp b/src/zcbenchmarks.cpp
index 0c85e00d7..e9f6ef88c 100644
--- a/src/zcbenchmarks.cpp
+++ b/src/zcbenchmarks.cpp
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "coins.h"
-#include "util.h"
+#include "util/system.h"
 #include "init.h"
 #include "primitives/transaction.h"
 #include "base58.h"
diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp
index ad8589693..f345131ce 100644
--- a/src/zmq/zmqabstractnotifier.cpp
+++ b/src/zmq/zmqabstractnotifier.cpp
@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "zmqabstractnotifier.h"
-#include "util.h"
+#include "util/system.h"
 
 
 CZMQAbstractNotifier::~CZMQAbstractNotifier()
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index 500994bb3..953e8b478 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -9,7 +9,7 @@
 #include "version.h"
 #include "main.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 
 void zmqError(const char *str)
 {
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index a039b0d07..7b2dd8248 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -6,7 +6,7 @@
 #include "chainparams.h"
 #include "zmqpublishnotifier.h"
 #include "main.h"
-#include "util.h"
+#include "util/system.h"
 
 static std::multimap<std::string, CZMQAbstractPublishNotifier*> mapPublishNotifiers;
 
diff --git a/test/lint/lint-locale-dependence.sh b/test/lint/lint-locale-dependence.sh
index 6265d425c..44b99dcf3 100755
--- a/test/lint/lint-locale-dependence.sh
+++ b/test/lint/lint-locale-dependence.sh
@@ -23,18 +23,18 @@ KNOWN_VIOLATIONS=(
     "src/torcontrol.cpp:.*strtol"
     "src/uint256.cpp:.*isspace"
     "src/uint256.cpp:.*tolower"
-    "src/util.cpp:.*atoi"
-    "src/util.cpp:.*fprintf"
-    "src/util.cpp:.*tolower"
-    "src/utilmoneystr.cpp:.*isdigit"
-    "src/utilmoneystr.cpp:.*isspace"
-    "src/utilstrencodings.cpp:.*atoi"
-    "src/utilstrencodings.cpp:.*isspace"
-    "src/utilstrencodings.cpp:.*strtol"
-    "src/utilstrencodings.cpp:.*strtoll"
-    "src/utilstrencodings.cpp:.*strtoul"
-    "src/utilstrencodings.cpp:.*strtoull"
-    "src/utilstrencodings.h:.*atoi"
+    "src/util/system.cpp:.*atoi"
+    "src/util/system.cpp:.*fprintf"
+    "src/util/system.cpp:.*tolower"
+    "src/util/moneystr.cpp:.*isdigit"
+    "src/util/moneystr.cpp:.*isspace"
+    "src/util/strencodings.cpp:.*atoi"
+    "src/util/strencodings.cpp:.*isspace"
+    "src/util/strencodings.cpp:.*strtol"
+    "src/util/strencodings.cpp:.*strtoll"
+    "src/util/strencodings.cpp:.*strtoul"
+    "src/util/strencodings.cpp:.*strtoull"
+    "src/util/strencodings.h:.*atoi"
 )
 
 REGEXP_IGNORE_EXTERNAL_DEPENDENCIES="^src/(crypto/ctaes/|leveldb/|secp256k1/|tinyformat.h|univalue/)"