Moving shared crypto to network/crypto