diff --git a/keystore/keyring.go b/crypto/keyring/keyring.go similarity index 100% rename from keystore/keyring.go rename to crypto/keyring/keyring.go diff --git a/keystore/keyring_test.go b/crypto/keyring/keyring_test.go similarity index 100% rename from keystore/keyring_test.go rename to crypto/keyring/keyring_test.go