Move Crypto and CryptoStorage to sensible logging