discovery keyring init and refactoring

Author: RitvikKapila

examples/src/keyrings/aws_kms_mrk_discovery_keyring_example.py

@@ -53,7 +53,7 @@
 from aws_encryption_sdk import CommitmentPolicy
 from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
 
-from .example_branch_key_id_supplier import ExampleBranchKeyIdSupplier
+from .branch_key_id_supplier_example import ExampleBranchKeyIdSupplier
 
 # TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
 module_root_dir = '/'.join(__file__.split("/")[:-1])

examples/src/keyrings/example_branch_key_id_supplier.py renamed to examples/src/keyrings/branch_key_id_supplier_example.py

@@ -3,7 +3,7 @@
 """Test suite for the hierarchical keyring example."""
 import pytest
 
-from ...src.keyrings.hierarchical_keyring import encrypt_and_decrypt_with_keyring
+from ...src.keyrings.hierarchical_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]