diff --git a/abi/main.cpp b/abi/main.cpp
index 27c5eea1b..df7fa8811 100644
--- a/abi/main.cpp
+++ b/abi/main.cpp
@@ -26,7 +26,7 @@
 #include "../test/JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethereum/Client.h>
 using namespace std;
 using namespace dev;
diff --git a/alethzero/DappLoader.cpp b/alethzero/DappLoader.cpp
index a91beb2f7..b2249ae5b 100644
--- a/alethzero/DappLoader.cpp
+++ b/alethzero/DappLoader.cpp
@@ -29,7 +29,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/CryptoPP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/CommonJS.h>
 #include <libethereum/Client.h>
 #include <libwebthree/WebThree.h>
diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp
index 9486f9f01..b59e9ce1f 100644
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@@ -44,7 +44,7 @@
 #include <libserpent/funcs.h>
 #include <libserpent/util.h>
 #endif
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethcore/CommonJS.h>
 #include <libethcore/EthashAux.h>
 #include <libethcore/ICAP.h>
diff --git a/alethzero/NatspecHandler.cpp b/alethzero/NatspecHandler.cpp
index a7cad6853..d00abc44f 100644
--- a/alethzero/NatspecHandler.cpp
+++ b/alethzero/NatspecHandler.cpp
@@ -27,7 +27,7 @@
 #include <libdevcore/CommonData.h>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethereum/Defaults.h>
 
 using namespace dev;
diff --git a/eth/main.cpp b/eth/main.cpp
index 1cf918346..33d049843 100644
--- a/eth/main.cpp
+++ b/eth/main.cpp
@@ -29,7 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libethcore/ProofOfWork.h>
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
index 040bd945c..8e480a3ff 100644
--- a/ethminer/MinerAux.h
+++ b/ethminer/MinerAux.h
@@ -31,11 +31,11 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libethcore/Exceptions.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/EthashAux.h>
 #include <libethcore/Farm.h>
diff --git a/ethminer/main.cpp b/ethminer/main.cpp
index 5b82db471..4deba38d1 100644
--- a/ethminer/main.cpp
+++ b/ethminer/main.cpp
@@ -27,7 +27,7 @@
 #include <signal.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "MinerAux.h"
 using namespace std;
 using namespace dev;
diff --git a/evmjit/libevmjit-cpp/Env.cpp b/evmjit/libevmjit-cpp/Env.cpp
index a5a60f48c..d1f239f9f 100644
--- a/evmjit/libevmjit-cpp/Env.cpp
+++ b/evmjit/libevmjit-cpp/Env.cpp
@@ -1,6 +1,6 @@
 
 #pragma GCC diagnostic ignored "-Wconversion"
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 #include <evmjit/DataTypes.h>
diff --git a/evmjit/libevmjit-cpp/JitVM.cpp b/evmjit/libevmjit-cpp/JitVM.cpp
index 7acbec5c1..6efd4c31a 100644
--- a/evmjit/libevmjit-cpp/JitVM.cpp
+++ b/evmjit/libevmjit-cpp/JitVM.cpp
@@ -4,7 +4,7 @@
 #include "JitVM.h"
 
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevm/VM.h>
 #include <libevm/VMFactory.h>
 #include <evmjit/libevmjit/ExecutionEngine.h>
diff --git a/exp/main.cpp b/exp/main.cpp
index 138ae76a4..d31306496 100644
--- a/exp/main.cpp
+++ b/exp/main.cpp
@@ -41,12 +41,12 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/TransientDirectory.h>
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include <libdevcrypto/SecretStore.h>
 #include <libp2p/All.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/Farm.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethereum/All.h>
 #include <libethereum/KeyManager.h>
 #include <libethereum/AccountDiff.h>
diff --git a/libdevcrypto/FileSystem.cpp b/libdevcore/FileSystem.cpp
similarity index 97%
rename from libdevcrypto/FileSystem.cpp
rename to libdevcore/FileSystem.cpp
index adf3a2946..dfda891f5 100644
--- a/libdevcrypto/FileSystem.cpp
+++ b/libdevcore/FileSystem.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "FileSystem.h"
-#include <libdevcore/Common.h>
-#include <libdevcore/Log.h>
+#include "Common.h"
+#include "Log.h"
 
 #if defined(_WIN32)
 #include <shlobj.h>
diff --git a/libdevcrypto/FileSystem.h b/libdevcore/FileSystem.h
similarity index 100%
rename from libdevcrypto/FileSystem.h
rename to libdevcore/FileSystem.h
diff --git a/libdevcrypto/Hash.cpp b/libdevcore/Hash.cpp
similarity index 100%
rename from libdevcrypto/Hash.cpp
rename to libdevcore/Hash.cpp
diff --git a/libdevcrypto/Hash.h b/libdevcore/Hash.h
similarity index 100%
rename from libdevcrypto/Hash.h
rename to libdevcore/Hash.h
diff --git a/libdevcrypto/MemoryDB.cpp b/libdevcore/MemoryDB.cpp
similarity index 100%
rename from libdevcrypto/MemoryDB.cpp
rename to libdevcore/MemoryDB.cpp
diff --git a/libdevcrypto/MemoryDB.h b/libdevcore/MemoryDB.h
similarity index 100%
rename from libdevcrypto/MemoryDB.h
rename to libdevcore/MemoryDB.h
diff --git a/libdevcrypto/OverlayDB.cpp b/libdevcore/OverlayDB.cpp
similarity index 100%
rename from libdevcrypto/OverlayDB.cpp
rename to libdevcore/OverlayDB.cpp
diff --git a/libdevcrypto/OverlayDB.h b/libdevcore/OverlayDB.h
similarity index 100%
rename from libdevcrypto/OverlayDB.h
rename to libdevcore/OverlayDB.h
diff --git a/libdevcrypto/SHA3.cpp b/libdevcore/SHA3.cpp
similarity index 99%
rename from libdevcrypto/SHA3.cpp
rename to libdevcore/SHA3.cpp
index 250936db1..880f23d6e 100644
--- a/libdevcrypto/SHA3.cpp
+++ b/libdevcore/SHA3.cpp
@@ -26,7 +26,6 @@
 #include <cstring>
 #include <libdevcore/RLP.h>
 #include "picosha2.h"
-#include "CryptoPP.h"
 using namespace std;
 using namespace dev;
 
diff --git a/libdevcrypto/SHA3.h b/libdevcore/SHA3.h
similarity index 100%
rename from libdevcrypto/SHA3.h
rename to libdevcore/SHA3.h
diff --git a/libdevcrypto/TrieCommon.cpp b/libdevcore/TrieCommon.cpp
similarity index 100%
rename from libdevcrypto/TrieCommon.cpp
rename to libdevcore/TrieCommon.cpp
diff --git a/libdevcrypto/TrieCommon.h b/libdevcore/TrieCommon.h
similarity index 100%
rename from libdevcrypto/TrieCommon.h
rename to libdevcore/TrieCommon.h
diff --git a/libdevcrypto/TrieDB.cpp b/libdevcore/TrieDB.cpp
similarity index 100%
rename from libdevcrypto/TrieDB.cpp
rename to libdevcore/TrieDB.cpp
diff --git a/libdevcrypto/TrieDB.h b/libdevcore/TrieDB.h
similarity index 99%
rename from libdevcrypto/TrieDB.h
rename to libdevcore/TrieDB.h
index cf85148d2..13a520311 100644
--- a/libdevcrypto/TrieDB.h
+++ b/libdevcore/TrieDB.h
@@ -30,7 +30,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/Exceptions.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "MemoryDB.h"
 #include "OverlayDB.h"
 #include "TrieCommon.h"
diff --git a/libdevcrypto/TrieHash.cpp b/libdevcore/TrieHash.cpp
similarity index 97%
rename from libdevcrypto/TrieHash.cpp
rename to libdevcore/TrieHash.cpp
index 0b02ce77f..ec0a92f90 100644
--- a/libdevcrypto/TrieHash.cpp
+++ b/libdevcore/TrieHash.cpp
@@ -20,9 +20,9 @@
  */
 
 #include "TrieHash.h"
-#include <libdevcrypto/TrieCommon.h>
-#include <libdevcrypto/TrieDB.h>	// @TODO replace ASAP!
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/TrieCommon.h>
+#include <libdevcore/TrieDB.h>	// @TODO replace ASAP!
+#include <libdevcore/SHA3.h>
 #include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
diff --git a/libdevcrypto/TrieHash.h b/libdevcore/TrieHash.h
similarity index 100%
rename from libdevcrypto/TrieHash.h
rename to libdevcore/TrieHash.h
diff --git a/libdevcrypto/picosha2.h b/libdevcore/picosha2.h
similarity index 100%
rename from libdevcrypto/picosha2.h
rename to libdevcore/picosha2.h
diff --git a/libdevcrypto/Common.cpp b/libdevcrypto/Common.cpp
index 52be6ce3b..87e258573 100644
--- a/libdevcrypto/Common.cpp
+++ b/libdevcrypto/Common.cpp
@@ -26,9 +26,9 @@
 #include <thread>
 #include <mutex>
 #include <libdevcore/Guards.h>
-#include "SHA3.h"
+#include <libdevcore/SHA3.h>
+#include <libdevcore/FileSystem.h>
 #include "AES.h"
-#include "FileSystem.h"
 #include "CryptoPP.h"
 using namespace std;
 using namespace dev;
diff --git a/libdevcrypto/CryptoPP.h b/libdevcrypto/CryptoPP.h
index 4991e3713..ca8a2e6b5 100644
--- a/libdevcrypto/CryptoPP.h
+++ b/libdevcrypto/CryptoPP.h
@@ -49,7 +49,7 @@
 #include <cryptopp/dsa.h>
 #pragma warning(pop)
 #pragma GCC diagnostic pop
-#include "SHA3.h"
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 
 namespace dev
diff --git a/libdevcrypto/ECDHE.cpp b/libdevcrypto/ECDHE.cpp
index a00a92872..a5aaf3984 100644
--- a/libdevcrypto/ECDHE.cpp
+++ b/libdevcrypto/ECDHE.cpp
@@ -19,9 +19,9 @@
  * @date 2014
  */
 
-#include "SHA3.h"
-#include "CryptoPP.h"
 #include "ECDHE.h"
+#include <libdevcore/SHA3.h>
+#include "CryptoPP.h"
 
 using namespace std;
 using namespace dev;
diff --git a/libdevcrypto/SecretStore.cpp b/libdevcrypto/SecretStore.cpp
index 9be0b89e8..0416aa9f4 100644
--- a/libdevcrypto/SecretStore.cpp
+++ b/libdevcrypto/SecretStore.cpp
@@ -25,9 +25,9 @@
 #include <boost/filesystem.hpp>
 #include <libdevcore/Log.h>
 #include <libdevcore/Guards.h>
+#include <libdevcore/SHA3.h>
+#include <libdevcore/FileSystem.h>
 #include <test/JsonSpiritHeaders.h>
-#include "SHA3.h"
-#include "FileSystem.h"
 using namespace std;
 using namespace dev;
 namespace js = json_spirit;
diff --git a/libdevcrypto/SecretStore.h b/libdevcrypto/SecretStore.h
index 1fb6adf4a..18c290c1f 100644
--- a/libdevcrypto/SecretStore.h
+++ b/libdevcrypto/SecretStore.h
@@ -24,8 +24,8 @@
 #include <functional>
 #include <mutex>
 #include <libdevcore/FixedHash.h>
+#include <libdevcore/FileSystem.h>
 #include "Common.h"
-#include "FileSystem.h"
 
 namespace dev
 {
diff --git a/libethcore/ABI.h b/libethcore/ABI.h
index 7fca09c9a..09aca6754 100644
--- a/libethcore/ABI.h
+++ b/libethcore/ABI.h
@@ -24,7 +24,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/FixedHash.h>
 #include <libdevcore/CommonData.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 
 namespace dev
 {
diff --git a/libethcore/BlockInfo.cpp b/libethcore/BlockInfo.cpp
index 00a5108c4..22e171e31 100644
--- a/libethcore/BlockInfo.cpp
+++ b/libethcore/BlockInfo.cpp
@@ -21,8 +21,8 @@
 
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/TrieDB.h>
-#include <libdevcrypto/TrieHash.h>
+#include <libdevcore/TrieDB.h>
+#include <libdevcore/TrieHash.h>
 #include <libethcore/Common.h>
 #include <libethcore/Params.h>
 #include "EthashAux.h"
diff --git a/libethcore/Common.cpp b/libethcore/Common.cpp
index c74aeba5e..56db647f3 100644
--- a/libethcore/Common.cpp
+++ b/libethcore/Common.cpp
@@ -23,7 +23,7 @@
 #include <random>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <libdevcore/Base64.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Exceptions.h"
 #include "ProofOfWork.h"
 using namespace std;
diff --git a/libethcore/Ethash.cpp b/libethcore/Ethash.cpp
index 6276dd0a1..1f16166f0 100644
--- a/libethcore/Ethash.cpp
+++ b/libethcore/Ethash.cpp
@@ -34,7 +34,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
 #include <libdevcrypto/CryptoPP.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethash/ethash.h>
 #include <libethash/internal.h>
 #if ETH_ETHASHCL || !ETH_TRUE
diff --git a/libethcore/EthashAux.cpp b/libethcore/EthashAux.cpp
index eccb986a7..38425aca2 100644
--- a/libethcore/EthashAux.cpp
+++ b/libethcore/EthashAux.cpp
@@ -31,8 +31,8 @@
 #include <libdevcore/Guards.h>
 #include <libdevcore/Log.h>
 #include <libdevcrypto/CryptoPP.h>
-#include <libdevcrypto/SHA3.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/SHA3.h>
+#include <libdevcore/FileSystem.h>
 #include <libethash/internal.h>
 #include "BlockInfo.h"
 #include "Exceptions.h"
diff --git a/libethcore/ICAP.cpp b/libethcore/ICAP.cpp
index 6fce19a62..158c297f8 100644
--- a/libethcore/ICAP.cpp
+++ b/libethcore/ICAP.cpp
@@ -23,7 +23,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string.hpp>
 #include <libdevcore/Base64.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Exceptions.h"
 #include "ABI.h"
 using namespace std;
diff --git a/libethereum/Account.h b/libethereum/Account.h
index 660dc0a4c..87fc82b6c 100644
--- a/libethereum/Account.h
+++ b/libethereum/Account.h
@@ -23,8 +23,8 @@
 
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/TrieDB.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/TrieDB.h>
+#include <libdevcore/SHA3.h>
 
 namespace dev
 {
diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp
index 73747b25b..c46127303 100644
--- a/libethereum/BlockChain.cpp
+++ b/libethereum/BlockChain.cpp
@@ -33,7 +33,7 @@
 #include <libdevcore/Assertions.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/StructuredLogger.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
diff --git a/libethereum/CachedAddressState.cpp b/libethereum/CachedAddressState.cpp
index a25017793..7c2f0a80c 100644
--- a/libethereum/CachedAddressState.cpp
+++ b/libethereum/CachedAddressState.cpp
@@ -22,7 +22,7 @@
 #include "CachedAddressState.h"
 
 #include <libdevcrypto/Common.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include "Account.h"
 using namespace std;
 using namespace dev;
diff --git a/libethereum/CanonBlockChain.cpp b/libethereum/CanonBlockChain.cpp
index f1de7292b..5dd7dc2ce 100644
--- a/libethereum/CanonBlockChain.cpp
+++ b/libethereum/CanonBlockChain.cpp
@@ -25,7 +25,7 @@
 #include <boost/filesystem.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
diff --git a/libethereum/Defaults.cpp b/libethereum/Defaults.cpp
index febe53d84..b839bbb5c 100644
--- a/libethereum/Defaults.cpp
+++ b/libethereum/Defaults.cpp
@@ -21,7 +21,7 @@
 
 #include "Defaults.h"
 
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/libethereum/KeyManager.h b/libethereum/KeyManager.h
index 38e8d8853..bb537e1f1 100644
--- a/libethereum/KeyManager.h
+++ b/libethereum/KeyManager.h
@@ -24,7 +24,7 @@
 #include <functional>
 #include <mutex>
 #include <libdevcrypto/SecretStore.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 
 namespace dev
 {
diff --git a/libethereum/LogFilter.cpp b/libethereum/LogFilter.cpp
index ab9848d59..21ba9d3ef 100644
--- a/libethereum/LogFilter.cpp
+++ b/libethereum/LogFilter.cpp
@@ -21,7 +21,7 @@
 
 #include "LogFilter.h"
 
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "State.h"
 using namespace std;
 using namespace dev;
diff --git a/libethereum/Precompiled.cpp b/libethereum/Precompiled.cpp
index 9373697e1..0e80949fe 100644
--- a/libethereum/Precompiled.cpp
+++ b/libethereum/Precompiled.cpp
@@ -22,8 +22,8 @@
 #include "Precompiled.h"
 
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
-#include <libdevcrypto/Hash.h>
+#include <libdevcore/SHA3.h>
+#include <libdevcore/Hash.h>
 #include <libdevcrypto/Common.h>
 #include <libethcore/Common.h>
 #include <libevmcore/Params.h>
diff --git a/libethereum/State.cpp b/libethereum/State.cpp
index 3bf7aaff7..d302e7381 100644
--- a/libethereum/State.cpp
+++ b/libethereum/State.cpp
@@ -29,7 +29,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Assertions.h>
 #include <libdevcore/StructuredLogger.h>
-#include <libdevcrypto/TrieHash.h>
+#include <libdevcore/TrieHash.h>
 #include <libevmcore/Instruction.h>
 #include <libethcore/Exceptions.h>
 #include <libevm/VMFactory.h>
diff --git a/libethereum/State.h b/libethereum/State.h
index d9fc9d2b5..971c2220a 100644
--- a/libethereum/State.h
+++ b/libethereum/State.h
@@ -25,7 +25,7 @@
 #include <unordered_map>
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include <libethcore/Exceptions.h>
 #include <libethcore/BlockInfo.h>
 #include <libethcore/ProofOfWork.h>
diff --git a/libethereum/Transaction.h b/libethereum/Transaction.h
index 78852b7b8..09d6cd54c 100644
--- a/libethereum/Transaction.h
+++ b/libethereum/Transaction.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/Common.h>
 #include <libevmcore/Params.h>
 namespace dev
diff --git a/libethereum/Utility.cpp b/libethereum/Utility.cpp
index 7b0a961b2..adfea4a51 100644
--- a/libethereum/Utility.cpp
+++ b/libethereum/Utility.cpp
@@ -23,7 +23,7 @@
 
 #include <boost/regex.hpp>
 #include <libethcore/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
diff --git a/libevm/ExtVMFace.h b/libevm/ExtVMFace.h
index 48fbd0b01..8ebfd8fa5 100644
--- a/libevm/ExtVMFace.h
+++ b/libevm/ExtVMFace.h
@@ -26,7 +26,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmcore/Instruction.h>
 #include <libethcore/Common.h>
 #include <libethcore/BlockInfo.h>
diff --git a/libevm/SmartVM.cpp b/libevm/SmartVM.cpp
index 4f759a745..89397987e 100644
--- a/libevm/SmartVM.cpp
+++ b/libevm/SmartVM.cpp
@@ -21,7 +21,7 @@
 #include "SmartVM.h"
 #include <unordered_map>
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <evmjit/JIT.h>
 #include <evmjit/libevmjit-cpp/Utils.h>
 #include "VMFactory.h"
diff --git a/libevm/VM.h b/libevm/VM.h
index 668544f9d..181fcdc2e 100644
--- a/libevm/VM.h
+++ b/libevm/VM.h
@@ -25,7 +25,7 @@
 #include <libdevcore/Exceptions.h>
 #include <libethcore/Common.h>
 #include <libevmcore/Instruction.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/BlockInfo.h>
 #include <libevmcore/Params.h>
 #include "VMFace.h"
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index 9f6f9dd63..b2fa73116 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -23,7 +23,7 @@
 
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/AssemblyItem.h>
 
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
index 0aac9cedb..895778ed1 100644
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@@ -23,7 +23,7 @@
 
 #include "KnownState.h"
 #include <functional>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmasm/AssemblyItem.h>
 
 using namespace std;
diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp
index e2599c1d5..998579a90 100644
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@@ -31,7 +31,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libethcore/Exceptions.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "Session.h"
 #include "Common.h"
 #include "Capability.h"
diff --git a/libp2p/UDP.h b/libp2p/UDP.h
index b09d556e7..a455b5057 100644
--- a/libp2p/UDP.h
+++ b/libp2p/UDP.h
@@ -29,7 +29,7 @@
 
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
 #include "Common.h"
diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp
index 9842901e7..14884254e 100644
--- a/libsolidity/AST.cpp
+++ b/libsolidity/AST.cpp
@@ -28,7 +28,7 @@
 #include <libsolidity/Exceptions.h>
 #include <libsolidity/AST_accept.h>
 
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 
 using namespace std;
 
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp
index b3fedc45d..bffa4158f 100644
--- a/libsolidity/CompilerStack.cpp
+++ b/libsolidity/CompilerStack.cpp
@@ -31,7 +31,7 @@
 #include <libsolidity/CompilerStack.h>
 #include <libsolidity/InterfaceHandler.h>
 
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 
 using namespace std;
 
diff --git a/libsolidity/ExpressionCompiler.cpp b/libsolidity/ExpressionCompiler.cpp
index 838ee264e..2e513b7fc 100644
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/ExpressionCompiler.cpp
@@ -24,7 +24,7 @@
 #include <numeric>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcore/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/ExpressionCompiler.h>
 #include <libsolidity/CompilerContext.h>
diff --git a/libsolidity/Types.cpp b/libsolidity/Types.cpp
index d1f51decf..7577b83a1 100644
--- a/libsolidity/Types.cpp
+++ b/libsolidity/Types.cpp
@@ -25,7 +25,7 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/CommonData.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libsolidity/Utils.h>
 #include <libsolidity/AST.h>
 
diff --git a/libtestutils/Common.cpp b/libtestutils/Common.cpp
index 5767be32c..cff21d464 100644
--- a/libtestutils/Common.cpp
+++ b/libtestutils/Common.cpp
@@ -23,7 +23,7 @@
 #include <boost/filesystem.hpp>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "Common.h"
 
 using namespace std;
diff --git a/libweb3jsonrpc/WebThreeStubServer.cpp b/libweb3jsonrpc/WebThreeStubServer.cpp
index 5235b0c4f..44f7f521c 100644
--- a/libweb3jsonrpc/WebThreeStubServer.cpp
+++ b/libweb3jsonrpc/WebThreeStubServer.cpp
@@ -26,7 +26,7 @@
 #include <boost/filesystem.hpp>
 
 #include <libwebthree/WebThree.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "WebThreeStubServer.h"
 
 using namespace std;
diff --git a/libwhisper/Common.cpp b/libwhisper/Common.cpp
index c29ac6bf6..dd9172c70 100644
--- a/libwhisper/Common.cpp
+++ b/libwhisper/Common.cpp
@@ -21,7 +21,7 @@
 
 #include "Common.h"
 
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Message.h"
 using namespace std;
 using namespace dev;
diff --git a/libwhisper/Interface.h b/libwhisper/Interface.h
index db595e21e..8b84193aa 100644
--- a/libwhisper/Interface.h
+++ b/libwhisper/Interface.h
@@ -29,7 +29,7 @@
 
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 #include "Message.h"
 
diff --git a/libwhisper/Message.h b/libwhisper/Message.h
index bd73df268..893602190 100644
--- a/libwhisper/Message.h
+++ b/libwhisper/Message.h
@@ -30,7 +30,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 
 namespace dev
diff --git a/libwhisper/WhisperHost.h b/libwhisper/WhisperHost.h
index ebbbcf8ed..cd427da35 100644
--- a/libwhisper/WhisperHost.h
+++ b/libwhisper/WhisperHost.h
@@ -30,7 +30,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/Guards.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 #include "WhisperPeer.h"
 #include "Interface.h"
diff --git a/libwhisper/WhisperPeer.h b/libwhisper/WhisperPeer.h
index 8542e987d..ab9c8222a 100644
--- a/libwhisper/WhisperPeer.h
+++ b/libwhisper/WhisperPeer.h
@@ -29,7 +29,7 @@
 
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 #include "Message.h"
 
diff --git a/mix/FileIo.cpp b/mix/FileIo.cpp
index 22538194c..cf8300677 100644
--- a/mix/FileIo.cpp
+++ b/mix/FileIo.cpp
@@ -34,7 +34,7 @@
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "FileIo.h"
 
 using namespace dev;
diff --git a/mix/QFunctionDefinition.cpp b/mix/QFunctionDefinition.cpp
index 13dbd4821..e6764d712 100644
--- a/mix/QFunctionDefinition.cpp
+++ b/mix/QFunctionDefinition.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <libsolidity/AST.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcore/Exceptions.h>
 #include "QVariableDeclaration.h"
 #include "QFunctionDefinition.h"
diff --git a/neth/main.cpp b/neth/main.cpp
index 7ce64cba5..a6e661d2e 100644
--- a/neth/main.cpp
+++ b/neth/main.cpp
@@ -29,7 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libevm/VM.h>
diff --git a/rlp/main.cpp b/rlp/main.cpp
index 5f2f7f358..3924f9c44 100644
--- a/rlp/main.cpp
+++ b/rlp/main.cpp
@@ -25,7 +25,7 @@
 #include "../test/JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 using namespace std;
 using namespace dev;
 namespace js = json_spirit;
diff --git a/test/deprecated/main.cpp b/test/deprecated/main.cpp
index 6ec8885b3..6cb098228 100644
--- a/test/deprecated/main.cpp
+++ b/test/deprecated/main.cpp
@@ -20,7 +20,7 @@
  * Main test functions.
  */
 
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
 
diff --git a/test/libdevcrypto/MemTrie.cpp b/test/libdevcrypto/MemTrie.cpp
index ab5a13b60..4507d1d80 100644
--- a/test/libdevcrypto/MemTrie.cpp
+++ b/test/libdevcrypto/MemTrie.cpp
@@ -21,8 +21,8 @@
 
 #include "MemTrie.h"
 
-#include <libdevcrypto/TrieCommon.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/TrieCommon.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
diff --git a/test/libdevcrypto/crypto.cpp b/test/libdevcrypto/crypto.cpp
index 3381c45da..497887145 100644
--- a/test/libdevcrypto/crypto.cpp
+++ b/test/libdevcrypto/crypto.cpp
@@ -28,7 +28,7 @@
 #include <libdevcore/Log.h>
 #include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcrypto/ECDHE.h>
 #include <libdevcrypto/CryptoPP.h>
 
diff --git a/test/libdevcrypto/hexPrefix.cpp b/test/libdevcrypto/hexPrefix.cpp
index c72f24535..223f1ac7b 100644
--- a/test/libdevcrypto/hexPrefix.cpp
+++ b/test/libdevcrypto/hexPrefix.cpp
@@ -27,7 +27,7 @@
 #include "../JsonSpiritHeaders.h"
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/TrieCommon.h>
+#include <libdevcore/TrieCommon.h>
 #include "../TestHelper.h"
 
 using namespace std;
diff --git a/test/libdevcrypto/trie.cpp b/test/libdevcrypto/trie.cpp
index ecfc515aa..3d6d493dd 100644
--- a/test/libdevcrypto/trie.cpp
+++ b/test/libdevcrypto/trie.cpp
@@ -27,8 +27,8 @@
 
 #include "../JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/TrieDB.h>
-#include <libdevcrypto/TrieHash.h>
+#include <libdevcore/TrieDB.h>
+#include <libdevcore/TrieHash.h>
 #include "MemTrie.h"
 #include "../TestHelper.h"
 
diff --git a/test/libethereum/blockchain.cpp b/test/libethereum/blockchain.cpp
index 191b94cc3..4e98b4036 100644
--- a/test/libethereum/blockchain.cpp
+++ b/test/libethereum/blockchain.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <boost/filesystem.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libdevcore/TransientDirectory.h>
 #include <libethereum/CanonBlockChain.h>
 #include <test/TestHelper.h>
diff --git a/test/libp2p/rlpx.cpp b/test/libp2p/rlpx.cpp
index 6a86652fb..620ddd952 100644
--- a/test/libp2p/rlpx.cpp
+++ b/test/libp2p/rlpx.cpp
@@ -27,7 +27,7 @@
 #include <libdevcore/Log.h>
 #include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcrypto/ECDHE.h>
 #include <libdevcrypto/CryptoPP.h>
 #include <libp2p/RLPxHandshake.h>
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index aa51a674d..90ce20d26 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <tuple>
 #include <boost/test/unit_test.hpp>
-#include <libdevcrypto/Hash.h>
+#include <libdevcore/Hash.h>
 #include <test/libsolidity/solidityExecutionFramework.h>
 
 using namespace std;
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 4ec7b8bda..c52bbf9de 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -23,7 +23,7 @@
 #include <string>
 
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/NameAndTypeResolver.h>
diff --git a/third/MainWin.cpp b/third/MainWin.cpp
index 12625ffbc..3cfc016e3 100644
--- a/third/MainWin.cpp
+++ b/third/MainWin.cpp
@@ -32,7 +32,7 @@
 #include <QtCore/QtCore>
 #include <libserpent/funcs.h>
 #include <libserpent/util.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <liblll/Compiler.h>
 #include <liblll/CodeFragment.h>
 #include <libevm/VM.h>