diff --git a/examples/src/__init__.py b/examples/src/__init__.py
index e8fd618b1..120179eda 100644
--- a/examples/src/__init__.py
+++ b/examples/src/__init__.py
@@ -1,13 +1,3 @@
-# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Stub module indicator to make linter configuration simpler."""
diff --git a/examples/src/keyrings/aws_kms_discovery_keyring_example.py b/examples/src/aws_kms_discovery_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/aws_kms_discovery_keyring_example.py
rename to examples/src/aws_kms_discovery_keyring_example.py
index 53d9cf1e4..4695e8783 100644
--- a/examples/src/keyrings/aws_kms_discovery_keyring_example.py
+++ b/examples/src/aws_kms_discovery_keyring_example.py
@@ -43,7 +43,7 @@
     DiscoveryFilter,
 )
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/aws_kms_discovery_multi_keyring_example.py b/examples/src/aws_kms_discovery_multi_keyring_example.py
similarity index 98%
rename from examples/src/keyrings/aws_kms_discovery_multi_keyring_example.py
rename to examples/src/aws_kms_discovery_multi_keyring_example.py
index adfadec37..60d74ff31 100644
--- a/examples/src/keyrings/aws_kms_discovery_multi_keyring_example.py
+++ b/examples/src/aws_kms_discovery_multi_keyring_example.py
@@ -40,7 +40,7 @@
     DiscoveryFilter,
 )
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
@@ -56,7 +56,7 @@
 def encrypt_and_decrypt_with_keyring(
     kms_key_id: str,
     aws_account_id: str,
-    aws_regions: list[str]
+    aws_regions: list
 ):
     """Demonstrate an encrypt/decrypt cycle using an AWS KMS Discovery Multi Keyring.
 
diff --git a/examples/src/keyrings/aws_kms_keyring_example.py b/examples/src/aws_kms_keyring_example.py
similarity index 98%
rename from examples/src/keyrings/aws_kms_keyring_example.py
rename to examples/src/aws_kms_keyring_example.py
index 4d04ba538..b166aab99 100644
--- a/examples/src/keyrings/aws_kms_keyring_example.py
+++ b/examples/src/aws_kms_keyring_example.py
@@ -24,7 +24,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateAwsKmsKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/aws_kms_mrk_discovery_keyring_example.py b/examples/src/aws_kms_mrk_discovery_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/aws_kms_mrk_discovery_keyring_example.py
rename to examples/src/aws_kms_mrk_discovery_keyring_example.py
index 63233a068..8ba80b621 100644
--- a/examples/src/keyrings/aws_kms_mrk_discovery_keyring_example.py
+++ b/examples/src/aws_kms_mrk_discovery_keyring_example.py
@@ -45,7 +45,7 @@
     DiscoveryFilter,
 )
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/aws_kms_mrk_discovery_multi_keyring_example.py b/examples/src/aws_kms_mrk_discovery_multi_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/aws_kms_mrk_discovery_multi_keyring_example.py
rename to examples/src/aws_kms_mrk_discovery_multi_keyring_example.py
index d8ea9bc4c..47cb80f1d 100644
--- a/examples/src/keyrings/aws_kms_mrk_discovery_multi_keyring_example.py
+++ b/examples/src/aws_kms_mrk_discovery_multi_keyring_example.py
@@ -47,7 +47,7 @@
     DiscoveryFilter,
 )
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
@@ -64,7 +64,7 @@ def encrypt_and_decrypt_with_keyring(
     mrk_key_id_encrypt: str,
     mrk_encrypt_region: str,
     aws_account_id: str,
-    aws_regions: list[str]
+    aws_regions: list
 ):
     """Demonstrate decryption using an AWS KMS MRK Discovery Multi keyring.
 
diff --git a/examples/src/keyrings/aws_kms_mrk_keyring_example.py b/examples/src/aws_kms_mrk_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/aws_kms_mrk_keyring_example.py
rename to examples/src/aws_kms_mrk_keyring_example.py
index d5342ba64..65d8be71b 100644
--- a/examples/src/keyrings/aws_kms_mrk_keyring_example.py
+++ b/examples/src/aws_kms_mrk_keyring_example.py
@@ -28,7 +28,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateAwsKmsMrkKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/aws_kms_mrk_multi_keyring_example.py b/examples/src/aws_kms_mrk_multi_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/aws_kms_mrk_multi_keyring_example.py
rename to examples/src/aws_kms_mrk_multi_keyring_example.py
index e5445a87c..9c87008fe 100644
--- a/examples/src/keyrings/aws_kms_mrk_multi_keyring_example.py
+++ b/examples/src/aws_kms_mrk_multi_keyring_example.py
@@ -34,7 +34,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateAwsKmsMrkKeyringInput, CreateAwsKmsMrkMultiKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/aws_kms_multi_keyring_example.py b/examples/src/aws_kms_multi_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/aws_kms_multi_keyring_example.py
rename to examples/src/aws_kms_multi_keyring_example.py
index 9662405d6..715181646 100644
--- a/examples/src/keyrings/aws_kms_multi_keyring_example.py
+++ b/examples/src/aws_kms_multi_keyring_example.py
@@ -43,7 +43,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateAwsKmsKeyringInput, CreateAwsKmsMultiKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/aws_kms_rsa_keyring_example.py b/examples/src/aws_kms_rsa_keyring_example.py
similarity index 98%
rename from examples/src/keyrings/aws_kms_rsa_keyring_example.py
rename to examples/src/aws_kms_rsa_keyring_example.py
index 536581eb8..337dd14b6 100644
--- a/examples/src/keyrings/aws_kms_rsa_keyring_example.py
+++ b/examples/src/aws_kms_rsa_keyring_example.py
@@ -21,7 +21,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateAwsKmsRsaKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/branch_key_id_supplier_example.py b/examples/src/branch_key_id_supplier_example.py
similarity index 96%
rename from examples/src/keyrings/branch_key_id_supplier_example.py
rename to examples/src/branch_key_id_supplier_example.py
index 7b390cdda..b3d26497b 100644
--- a/examples/src/keyrings/branch_key_id_supplier_example.py
+++ b/examples/src/branch_key_id_supplier_example.py
@@ -4,7 +4,7 @@
 
 from aws_cryptographic_materialproviders.mpl.models import GetBranchKeyIdInput, GetBranchKeyIdOutput
 from aws_cryptographic_materialproviders.mpl.references import IBranchKeyIdSupplier
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 
 class ExampleBranchKeyIdSupplier(IBranchKeyIdSupplier):
diff --git a/examples/src/keyrings/file_streaming_example.py b/examples/src/file_streaming_example.py
similarity index 99%
rename from examples/src/keyrings/file_streaming_example.py
rename to examples/src/file_streaming_example.py
index b7352ba0e..72decde60 100644
--- a/examples/src/keyrings/file_streaming_example.py
+++ b/examples/src/file_streaming_example.py
@@ -31,7 +31,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import AesWrappingAlg, CreateRawAesKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/hierarchical_keyring_example.py b/examples/src/hierarchical_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/hierarchical_keyring_example.py
rename to examples/src/hierarchical_keyring_example.py
index 7020b68b4..c781f4f40 100644
--- a/examples/src/keyrings/hierarchical_keyring_example.py
+++ b/examples/src/hierarchical_keyring_example.py
@@ -47,7 +47,7 @@
     DefaultCache,
 )
 from aws_cryptographic_materialproviders.mpl.references import IBranchKeyIdSupplier, IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/__init__.py b/examples/src/legacy/__init__.py
similarity index 100%
rename from examples/src/keyrings/__init__.py
rename to examples/src/legacy/__init__.py
diff --git a/examples/src/basic_encryption.py b/examples/src/legacy/basic_encryption.py
similarity index 100%
rename from examples/src/basic_encryption.py
rename to examples/src/legacy/basic_encryption.py
diff --git a/examples/src/basic_file_encryption_with_multiple_providers.py b/examples/src/legacy/basic_file_encryption_with_multiple_providers.py
similarity index 100%
rename from examples/src/basic_file_encryption_with_multiple_providers.py
rename to examples/src/legacy/basic_file_encryption_with_multiple_providers.py
diff --git a/examples/src/basic_file_encryption_with_raw_key_provider.py b/examples/src/legacy/basic_file_encryption_with_raw_key_provider.py
similarity index 100%
rename from examples/src/basic_file_encryption_with_raw_key_provider.py
rename to examples/src/legacy/basic_file_encryption_with_raw_key_provider.py
diff --git a/examples/src/custom_kms_client_for_kms_provider.py b/examples/src/legacy/custom_kms_client_for_kms_provider.py
similarity index 100%
rename from examples/src/custom_kms_client_for_kms_provider.py
rename to examples/src/legacy/custom_kms_client_for_kms_provider.py
diff --git a/examples/src/data_key_caching_basic.py b/examples/src/legacy/data_key_caching_basic.py
similarity index 100%
rename from examples/src/data_key_caching_basic.py
rename to examples/src/legacy/data_key_caching_basic.py
diff --git a/examples/src/discovery_kms_provider.py b/examples/src/legacy/discovery_kms_provider.py
similarity index 100%
rename from examples/src/discovery_kms_provider.py
rename to examples/src/legacy/discovery_kms_provider.py
diff --git a/examples/src/keyrings/module_.py b/examples/src/legacy/module_.py
similarity index 100%
rename from examples/src/keyrings/module_.py
rename to examples/src/legacy/module_.py
diff --git a/examples/src/mrk_aware_kms_provider.py b/examples/src/legacy/mrk_aware_kms_provider.py
similarity index 100%
rename from examples/src/mrk_aware_kms_provider.py
rename to examples/src/legacy/mrk_aware_kms_provider.py
diff --git a/examples/src/multiple_kms_cmk.py b/examples/src/legacy/multiple_kms_cmk.py
similarity index 100%
rename from examples/src/multiple_kms_cmk.py
rename to examples/src/legacy/multiple_kms_cmk.py
diff --git a/examples/src/one_kms_cmk.py b/examples/src/legacy/one_kms_cmk.py
similarity index 100%
rename from examples/src/one_kms_cmk.py
rename to examples/src/legacy/one_kms_cmk.py
diff --git a/examples/src/one_kms_cmk_streaming_data.py b/examples/src/legacy/one_kms_cmk_streaming_data.py
similarity index 100%
rename from examples/src/one_kms_cmk_streaming_data.py
rename to examples/src/legacy/one_kms_cmk_streaming_data.py
diff --git a/examples/src/one_kms_cmk_unsigned.py b/examples/src/legacy/one_kms_cmk_unsigned.py
similarity index 100%
rename from examples/src/one_kms_cmk_unsigned.py
rename to examples/src/legacy/one_kms_cmk_unsigned.py
diff --git a/examples/src/legacy/pylintrc b/examples/src/legacy/pylintrc
new file mode 100644
index 000000000..858fa4d96
--- /dev/null
+++ b/examples/src/legacy/pylintrc
@@ -0,0 +1,44 @@
+[MESSAGE CONTROL]
+# Disabling messages that either we don't care about we intentionally break.
+disable =
+    invalid-name,  # we prefer long, descriptive, names for examples
+    bad-continuation,  # we let black handle this
+    ungrouped-imports,  # we let isort handle this
+    no-member,  # breaks with attrs
+    no-self-use,  # interesting to keep in mind for later refactoring, but not blocking
+    useless-object-inheritance,  # we need to support Python 2, so no, not useless
+    duplicate-code,  # some examples may be similar
+    too-few-public-methods,  # does not allow value stores
+    too-many-locals,  # examples may sometimes have more locals defined for clarity than would be appropriate in code
+    no-else-return,  # we omit this on purpose for brevity where it would add no value
+    attribute-defined-outside-init,  # breaks with attrs_post_init
+    abstract-method,  # throws false positives on io.BaseIO grandchildren
+    redefined-outer-name,  # we do this on purpose in multiple places
+    consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation
+
+[BASIC]
+# Allow function names up to 50 characters
+function-rgx = [a-z_][a-z0-9_]{2,50}$
+# Allow method names up to 50 characters
+method-rgx = [a-z_][a-z0-9_]{2,50}$
+# Allow class attribute names up to 50 characters
+# Whitelist class attribute names: iv
+class-attribute-rgx = (([A-Za-z_][A-Za-z0-9_]{2,50}|(__.*__))$)|(^iv$)
+# Whitelist attribute names: iv
+attr-rgx = ([a-z_][a-z0-9_]{2,30}$)|(^iv$)
+# Whitelist argument names: iv, b
+argument-rgx = ([a-z_][a-z0-9_]{2,30}$)|(^iv$)|(^b$)
+# Whitelist variable names: iv, b, _b, x, y, r, s
+variable-rgx = ([a-z_][a-z0-9_]{2,30}$)|(^iv$)|(^b$)|(^_b$)|(^x$)|(^y$)|(^r$)|(^s$)
+
+[VARIABLES]
+additional-builtins = raw_input
+
+[DESIGN]
+max-args = 10
+
+[FORMAT]
+max-line-length = 120
+
+[REPORTS]
+msg-template = {path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
diff --git a/examples/src/set_commitment.py b/examples/src/legacy/set_commitment.py
similarity index 100%
rename from examples/src/set_commitment.py
rename to examples/src/legacy/set_commitment.py
diff --git a/examples/src/keyrings/migration_set_commitment_policy_example.py b/examples/src/migration_set_commitment_policy_example.py
similarity index 98%
rename from examples/src/keyrings/migration_set_commitment_policy_example.py
rename to examples/src/migration_set_commitment_policy_example.py
index 0a9e6a3a6..4bd0bc372 100644
--- a/examples/src/keyrings/migration_set_commitment_policy_example.py
+++ b/examples/src/migration_set_commitment_policy_example.py
@@ -27,7 +27,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateAwsKmsKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/multi_keyring_example.py b/examples/src/multi_keyring_example.py
similarity index 99%
rename from examples/src/keyrings/multi_keyring_example.py
rename to examples/src/multi_keyring_example.py
index fd9968f59..b12ab61a3 100644
--- a/examples/src/keyrings/multi_keyring_example.py
+++ b/examples/src/multi_keyring_example.py
@@ -49,7 +49,7 @@
     CreateRawAesKeyringInput,
 )
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/pylintrc b/examples/src/pylintrc
index 858fa4d96..8ed5cb105 100644
--- a/examples/src/pylintrc
+++ b/examples/src/pylintrc
@@ -1,6 +1,7 @@
 [MESSAGE CONTROL]
 # Disabling messages that either we don't care about we intentionally break.
 disable =
+    import-error, # ignore mpl import errors
     invalid-name,  # we prefer long, descriptive, names for examples
     bad-continuation,  # we let black handle this
     ungrouped-imports,  # we let isort handle this
diff --git a/examples/src/keyrings/raw_aes_keyring_example.py b/examples/src/raw_aes_keyring_example.py
similarity index 98%
rename from examples/src/keyrings/raw_aes_keyring_example.py
rename to examples/src/raw_aes_keyring_example.py
index be37886da..d8634f774 100644
--- a/examples/src/keyrings/raw_aes_keyring_example.py
+++ b/examples/src/raw_aes_keyring_example.py
@@ -29,7 +29,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import AesWrappingAlg, CreateRawAesKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/src/keyrings/raw_rsa_keyring_example.py b/examples/src/raw_rsa_keyring_example.py
similarity index 98%
rename from examples/src/keyrings/raw_rsa_keyring_example.py
rename to examples/src/raw_rsa_keyring_example.py
index faf617209..4a38fd166 100644
--- a/examples/src/keyrings/raw_rsa_keyring_example.py
+++ b/examples/src/raw_rsa_keyring_example.py
@@ -42,7 +42,7 @@
 from cryptography.hazmat.backends import default_backend as crypto_default_backend
 from cryptography.hazmat.primitives import serialization as crypto_serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
@@ -240,7 +240,7 @@ def encrypt_and_decrypt_with_keyring(public_key_file_name=None, private_key_file
 
     # 10. Test decrypt for the original ciphertext using raw_rsa_keyring_bob
     try:
-        plaintext_bytes_bob, _ = client.decrypt(
+        plaintext_bytes_bob, _ = client.decrypt(  # pylint: disable=unused-variable
             source=ciphertext,
             keyring=raw_rsa_keyring_bob
         )
diff --git a/examples/src/keyrings/required_encryption_context_cmm.py b/examples/src/required_encryption_context_cmm.py
similarity index 98%
rename from examples/src/keyrings/required_encryption_context_cmm.py
rename to examples/src/required_encryption_context_cmm.py
index 3f106c5ee..1d5140e6d 100644
--- a/examples/src/keyrings/required_encryption_context_cmm.py
+++ b/examples/src/required_encryption_context_cmm.py
@@ -19,7 +19,7 @@
     CreateRequiredEncryptionContextCMMInput,
 )
 from aws_cryptographic_materialproviders.mpl.references import ICryptographicMaterialsManager, IKeyring
-from typing import Dict, List
+from typing import Dict, List  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
@@ -53,7 +53,8 @@ def encrypt_and_decrypt_with_keyring(
     #    Most encrypted data should have an associated encryption context
     #    to protect integrity. This sample uses placeholder values.
     #    For more information see:
-    #    blogs.aws.amazon.com/security/post/Tx2LZ6WBJJANTNW/How-to-Protect-the-Integrity-of-Your-Encrypted-Data-by-Using-AWS-Key-Management  # noqa: E501
+    #    pylint: disable=line-too-long
+    #    blogs.aws.amazon.com/security/post/Tx2LZ6WBJJANTNW/How-to-Protect-the-Integrity-of-Your-Encrypted-Data-by-Using-AWS-Key-Management
     encryption_context: Dict[str, str] = {
         "key1": "value1",
         "key2": "value2",
diff --git a/examples/src/keyrings/set_encryption_algorithm_suite_example.py b/examples/src/set_encryption_algorithm_suite_example.py
similarity index 99%
rename from examples/src/keyrings/set_encryption_algorithm_suite_example.py
rename to examples/src/set_encryption_algorithm_suite_example.py
index c14eb4bb3..200570083 100644
--- a/examples/src/keyrings/set_encryption_algorithm_suite_example.py
+++ b/examples/src/set_encryption_algorithm_suite_example.py
@@ -45,7 +45,7 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import AesWrappingAlg, CreateRawAesKeyringInput
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from typing import Dict
+from typing import Dict  # noqa pylint: disable=wrong-import-order
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
diff --git a/examples/test/__init__.py b/examples/test/__init__.py
index e8fd618b1..120179eda 100644
--- a/examples/test/__init__.py
+++ b/examples/test/__init__.py
@@ -1,13 +1,3 @@
-# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-# http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
+# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
 """Stub module indicator to make linter configuration simpler."""
diff --git a/examples/test/keyrings/__init__.py b/examples/test/legacy/__init__.py
similarity index 100%
rename from examples/test/keyrings/__init__.py
rename to examples/test/legacy/__init__.py
diff --git a/examples/test/examples_test_utils.py b/examples/test/legacy/examples_test_utils.py
similarity index 98%
rename from examples/test/examples_test_utils.py
rename to examples/test/legacy/examples_test_utils.py
index 8a51f21c8..afd531cc6 100644
--- a/examples/test/examples_test_utils.py
+++ b/examples/test/legacy/examples_test_utils.py
@@ -15,7 +15,7 @@
 import sys
 
 os.environ["AWS_ENCRYPTION_SDK_EXAMPLES_TESTING"] = "yes"
-sys.path.extend([os.sep.join([os.path.dirname(__file__), "..", "..", "test", "integration"])])
+sys.path.extend([os.sep.join([os.path.dirname(__file__), "..", "..", "..", "test", "integration"])])
 
 static_plaintext = (
     b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
diff --git a/examples/test/legacy/pylintrc b/examples/test/legacy/pylintrc
new file mode 100644
index 000000000..67090eedf
--- /dev/null
+++ b/examples/test/legacy/pylintrc
@@ -0,0 +1,22 @@
+[MESSAGES CONTROL]
+# Disabling messages that we either don't care about for tests or are necessary to break for tests.
+disable =
+    invalid-name,  # we prefer long, descriptive, names for tests
+    missing-docstring,  # we don't write docstrings for tests
+    wrong-import-position,  # similar to E0401, pylint does not appear to identify
+                            # unknown modules as non-standard-library. flake8 tests for this as well
+                            # and does treat them properly
+    duplicate-code,  # tests for similar things tend to be similar
+    consider-using-f-string # disable until 2022-05-05; 6 months after 3.5 deprecation
+
+[VARIABLES]
+additional-builtins = raw_input
+
+[DESIGN]
+max-args = 10
+
+[FORMAT]
+max-line-length = 120
+
+[REPORTS]
+msg-template = {path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
diff --git a/examples/test/test_i_basic_encryption.py b/examples/test/legacy/test_i_basic_encryption.py
similarity index 94%
rename from examples/test/test_i_basic_encryption.py
rename to examples/test/legacy/test_i_basic_encryption.py
index f2a4fab51..a2a96b08f 100644
--- a/examples/test/test_i_basic_encryption.py
+++ b/examples/test/legacy/test_i_basic_encryption.py
@@ -14,10 +14,9 @@
 import botocore.session
 import pytest
 
-from ..src.basic_encryption import cycle_string
+from ...src.legacy.basic_encryption import cycle_string
 from .examples_test_utils import get_cmk_arn, static_plaintext
 
-
 pytestmark = [pytest.mark.examples]
 
 
diff --git a/examples/test/test_i_basic_file_encryption_with_multiple_providers.py b/examples/test/legacy/test_i_basic_file_encryption_with_multiple_providers.py
similarity index 87%
rename from examples/test/test_i_basic_file_encryption_with_multiple_providers.py
rename to examples/test/legacy/test_i_basic_file_encryption_with_multiple_providers.py
index 282a272ab..af9fb223e 100644
--- a/examples/test/test_i_basic_file_encryption_with_multiple_providers.py
+++ b/examples/test/legacy/test_i_basic_file_encryption_with_multiple_providers.py
@@ -17,10 +17,8 @@
 import botocore.session
 import pytest
 
-from ..src.basic_file_encryption_with_multiple_providers import cycle_file
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.basic_file_encryption_with_multiple_providers import cycle_file
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/test_i_basic_file_encryption_with_raw_key_provider.py b/examples/test/legacy/test_i_basic_file_encryption_with_raw_key_provider.py
similarity index 93%
rename from examples/test/test_i_basic_file_encryption_with_raw_key_provider.py
rename to examples/test/legacy/test_i_basic_file_encryption_with_raw_key_provider.py
index 710c0ccac..d4dd0534c 100644
--- a/examples/test/test_i_basic_file_encryption_with_raw_key_provider.py
+++ b/examples/test/legacy/test_i_basic_file_encryption_with_raw_key_provider.py
@@ -16,10 +16,9 @@
 
 import pytest
 
-from ..src.basic_file_encryption_with_raw_key_provider import cycle_file
+from ...src.legacy.basic_file_encryption_with_raw_key_provider import cycle_file
 from .examples_test_utils import static_plaintext
 
-
 pytestmark = [pytest.mark.examples]
 
 
diff --git a/examples/test/test_i_data_key_caching_basic.py b/examples/test/legacy/test_i_data_key_caching_basic.py
similarity index 92%
rename from examples/test/test_i_data_key_caching_basic.py
rename to examples/test/legacy/test_i_data_key_caching_basic.py
index 734c35692..960059597 100644
--- a/examples/test/test_i_data_key_caching_basic.py
+++ b/examples/test/legacy/test_i_data_key_caching_basic.py
@@ -13,10 +13,9 @@
 """Unit test suite for the basic data key caching example in the AWS-hosted documentation."""
 import pytest
 
-from ..src.data_key_caching_basic import encrypt_with_caching
+from ...src.legacy.data_key_caching_basic import encrypt_with_caching
 from .examples_test_utils import get_cmk_arn
 
-
 pytestmark = [pytest.mark.examples]
 
 
diff --git a/examples/test/test_i_discovery_kms_provider.py b/examples/test/legacy/test_i_discovery_kms_provider.py
similarity index 85%
rename from examples/test/test_i_discovery_kms_provider.py
rename to examples/test/legacy/test_i_discovery_kms_provider.py
index e9a1c6e71..09c78fe36 100644
--- a/examples/test/test_i_discovery_kms_provider.py
+++ b/examples/test/legacy/test_i_discovery_kms_provider.py
@@ -15,10 +15,8 @@
 import botocore.session
 import pytest
 
-from ..src.discovery_kms_provider import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.discovery_kms_provider import encrypt_decrypt
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/test_i_mrk_aware_kms_provider.py b/examples/test/legacy/test_i_mrk_aware_kms_provider.py
similarity index 90%
rename from examples/test/test_i_mrk_aware_kms_provider.py
rename to examples/test/legacy/test_i_mrk_aware_kms_provider.py
index 8e7a003f8..81cd5cfd2 100644
--- a/examples/test/test_i_mrk_aware_kms_provider.py
+++ b/examples/test/legacy/test_i_mrk_aware_kms_provider.py
@@ -14,10 +14,8 @@
 
 import pytest
 
-from ..src.mrk_aware_kms_provider import encrypt_decrypt
-from .examples_test_utils import get_mrk_arn, get_second_mrk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.mrk_aware_kms_provider import encrypt_decrypt
+from .examples_test_utils import get_mrk_arn, get_second_mrk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/test_i_multiple_kms_cmk.py b/examples/test/legacy/test_i_multiple_kms_cmk.py
similarity index 90%
rename from examples/test/test_i_multiple_kms_cmk.py
rename to examples/test/legacy/test_i_multiple_kms_cmk.py
index 39369cbc6..f2ecac660 100644
--- a/examples/test/test_i_multiple_kms_cmk.py
+++ b/examples/test/legacy/test_i_multiple_kms_cmk.py
@@ -15,10 +15,8 @@
 import botocore.session
 import pytest
 
-from ..src.multiple_kms_cmk import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn, get_second_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.multiple_kms_cmk import encrypt_decrypt
+from .examples_test_utils import get_cmk_arn, get_second_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/test_i_one_kms_cmk.py b/examples/test/legacy/test_i_one_kms_cmk.py
similarity index 86%
rename from examples/test/test_i_one_kms_cmk.py
rename to examples/test/legacy/test_i_one_kms_cmk.py
index 71ce74d3d..a8d083e67 100644
--- a/examples/test/test_i_one_kms_cmk.py
+++ b/examples/test/legacy/test_i_one_kms_cmk.py
@@ -15,10 +15,8 @@
 import botocore.session
 import pytest
 
-from ..src.one_kms_cmk import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.one_kms_cmk import encrypt_decrypt
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/test_i_one_kms_cmk_streaming_data.py b/examples/test/legacy/test_i_one_kms_cmk_streaming_data.py
similarity index 94%
rename from examples/test/test_i_one_kms_cmk_streaming_data.py
rename to examples/test/legacy/test_i_one_kms_cmk_streaming_data.py
index b22fa4232..6115ed567 100644
--- a/examples/test/test_i_one_kms_cmk_streaming_data.py
+++ b/examples/test/legacy/test_i_one_kms_cmk_streaming_data.py
@@ -17,10 +17,9 @@
 import botocore.session
 import pytest
 
-from ..src.one_kms_cmk_streaming_data import encrypt_decrypt_stream
+from ...src.legacy.one_kms_cmk_streaming_data import encrypt_decrypt_stream
 from .examples_test_utils import get_cmk_arn, static_plaintext
 
-
 pytestmark = [pytest.mark.examples]
 
 
diff --git a/examples/test/test_i_one_kms_cmk_unsigned.py b/examples/test/legacy/test_i_one_kms_cmk_unsigned.py
similarity index 86%
rename from examples/test/test_i_one_kms_cmk_unsigned.py
rename to examples/test/legacy/test_i_one_kms_cmk_unsigned.py
index 8a2758c96..cc9acd949 100644
--- a/examples/test/test_i_one_kms_cmk_unsigned.py
+++ b/examples/test/legacy/test_i_one_kms_cmk_unsigned.py
@@ -15,10 +15,8 @@
 import botocore.session
 import pytest
 
-from ..src.one_kms_cmk_unsigned import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.one_kms_cmk_unsigned import encrypt_decrypt
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/test_i_set_commitment.py b/examples/test/legacy/test_i_set_commitment.py
similarity index 86%
rename from examples/test/test_i_set_commitment.py
rename to examples/test/legacy/test_i_set_commitment.py
index 96247334b..7f86fdcc2 100644
--- a/examples/test/test_i_set_commitment.py
+++ b/examples/test/legacy/test_i_set_commitment.py
@@ -15,10 +15,8 @@
 import botocore.session
 import pytest
 
-from ..src.set_commitment import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from ...src.legacy.set_commitment import encrypt_decrypt
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/pylintrc b/examples/test/pylintrc
index 67090eedf..9792ea592 100644
--- a/examples/test/pylintrc
+++ b/examples/test/pylintrc
@@ -1,6 +1,7 @@
 [MESSAGES CONTROL]
 # Disabling messages that we either don't care about for tests or are necessary to break for tests.
 disable =
+    import-error, # ignore mpl import errors
     invalid-name,  # we prefer long, descriptive, names for tests
     missing-docstring,  # we don't write docstrings for tests
     wrong-import-position,  # similar to E0401, pylint does not appear to identify
diff --git a/examples/test/keyrings/test_i_aws_kms_discovery_keyring_example.py b/examples/test/test_i_aws_kms_discovery_keyring_example.py
similarity index 86%
rename from examples/test/keyrings/test_i_aws_kms_discovery_keyring_example.py
rename to examples/test/test_i_aws_kms_discovery_keyring_example.py
index af3c2a3a3..06b141712 100644
--- a/examples/test/keyrings/test_i_aws_kms_discovery_keyring_example.py
+++ b/examples/test/test_i_aws_kms_discovery_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS Discovery keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_discovery_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_discovery_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_discovery_multi_keyring_example.py b/examples/test/test_i_aws_kms_discovery_multi_keyring_example.py
similarity index 86%
rename from examples/test/keyrings/test_i_aws_kms_discovery_multi_keyring_example.py
rename to examples/test/test_i_aws_kms_discovery_multi_keyring_example.py
index eff2a1a3b..f8cd13550 100644
--- a/examples/test/keyrings/test_i_aws_kms_discovery_multi_keyring_example.py
+++ b/examples/test/test_i_aws_kms_discovery_multi_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS Discovery Multi keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_discovery_multi_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_discovery_multi_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_keyring_example.py b/examples/test/test_i_aws_kms_keyring_example.py
similarity index 85%
rename from examples/test/keyrings/test_i_aws_kms_keyring_example.py
rename to examples/test/test_i_aws_kms_keyring_example.py
index 83a784a9e..ef7b1b643 100644
--- a/examples/test/keyrings/test_i_aws_kms_keyring_example.py
+++ b/examples/test/test_i_aws_kms_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_mrk_discovery_keyring_example.py b/examples/test/test_i_aws_kms_mrk_discovery_keyring_example.py
similarity index 89%
rename from examples/test/keyrings/test_i_aws_kms_mrk_discovery_keyring_example.py
rename to examples/test/test_i_aws_kms_mrk_discovery_keyring_example.py
index bc0279066..0a49709a3 100644
--- a/examples/test/keyrings/test_i_aws_kms_mrk_discovery_keyring_example.py
+++ b/examples/test/test_i_aws_kms_mrk_discovery_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS MRK Discovery keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_mrk_discovery_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_mrk_discovery_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_mrk_discovery_multi_keyring_example.py b/examples/test/test_i_aws_kms_mrk_discovery_multi_keyring_example.py
similarity index 88%
rename from examples/test/keyrings/test_i_aws_kms_mrk_discovery_multi_keyring_example.py
rename to examples/test/test_i_aws_kms_mrk_discovery_multi_keyring_example.py
index 93672b046..ded9a78e8 100644
--- a/examples/test/keyrings/test_i_aws_kms_mrk_discovery_multi_keyring_example.py
+++ b/examples/test/test_i_aws_kms_mrk_discovery_multi_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS MRK Discovery Multi keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_mrk_discovery_multi_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_mrk_discovery_multi_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_mrk_keyring_example.py b/examples/test/test_i_aws_kms_mrk_keyring_example.py
similarity index 91%
rename from examples/test/keyrings/test_i_aws_kms_mrk_keyring_example.py
rename to examples/test/test_i_aws_kms_mrk_keyring_example.py
index ab81d9c10..3bc977e26 100644
--- a/examples/test/keyrings/test_i_aws_kms_mrk_keyring_example.py
+++ b/examples/test/test_i_aws_kms_mrk_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS MRK keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_mrk_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_mrk_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_mrk_multi_keyring_example.py b/examples/test/test_i_aws_kms_mrk_multi_keyring_example.py
similarity index 90%
rename from examples/test/keyrings/test_i_aws_kms_mrk_multi_keyring_example.py
rename to examples/test/test_i_aws_kms_mrk_multi_keyring_example.py
index 8272f3987..960a8f3cb 100644
--- a/examples/test/keyrings/test_i_aws_kms_mrk_multi_keyring_example.py
+++ b/examples/test/test_i_aws_kms_mrk_multi_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS MRK Multi keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_mrk_multi_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_mrk_multi_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_multi_keyring_example.py b/examples/test/test_i_aws_kms_multi_keyring_example.py
similarity index 90%
rename from examples/test/keyrings/test_i_aws_kms_multi_keyring_example.py
rename to examples/test/test_i_aws_kms_multi_keyring_example.py
index 10f991754..28cf0c497 100644
--- a/examples/test/keyrings/test_i_aws_kms_multi_keyring_example.py
+++ b/examples/test/test_i_aws_kms_multi_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS multi keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_multi_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_multi_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_aws_kms_rsa_keyring_example.py b/examples/test/test_i_aws_kms_rsa_keyring_example.py
similarity index 93%
rename from examples/test/keyrings/test_i_aws_kms_rsa_keyring_example.py
rename to examples/test/test_i_aws_kms_rsa_keyring_example.py
index 4d953947a..6f41da1cb 100644
--- a/examples/test/keyrings/test_i_aws_kms_rsa_keyring_example.py
+++ b/examples/test/test_i_aws_kms_rsa_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the AWS KMS RSA keyring example."""
 import pytest
 
-from ...src.keyrings.aws_kms_rsa_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.aws_kms_rsa_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_file_streaming_example.py b/examples/test/test_i_file_streaming_example.py
similarity index 97%
rename from examples/test/keyrings/test_i_file_streaming_example.py
rename to examples/test/test_i_file_streaming_example.py
index 2e502f185..67cd2b34c 100644
--- a/examples/test/keyrings/test_i_file_streaming_example.py
+++ b/examples/test/test_i_file_streaming_example.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from ...src.keyrings.file_streaming_example import encrypt_and_decrypt_with_keyring
+from ..src.file_streaming_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_hierarchical_keyring_example.py b/examples/test/test_i_hierarchical_keyring_example.py
similarity index 86%
rename from examples/test/keyrings/test_i_hierarchical_keyring_example.py
rename to examples/test/test_i_hierarchical_keyring_example.py
index 6b3f3850a..72f2d48df 100644
--- a/examples/test/keyrings/test_i_hierarchical_keyring_example.py
+++ b/examples/test/test_i_hierarchical_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the hierarchical keyring example."""
 import pytest
 
-from ...src.keyrings.hierarchical_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.hierarchical_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_migration_set_commitment_policy_example.py b/examples/test/test_i_migration_set_commitment_policy_example.py
similarity index 83%
rename from examples/test/keyrings/test_i_migration_set_commitment_policy_example.py
rename to examples/test/test_i_migration_set_commitment_policy_example.py
index 7580ed670..afbc758bc 100644
--- a/examples/test/keyrings/test_i_migration_set_commitment_policy_example.py
+++ b/examples/test/test_i_migration_set_commitment_policy_example.py
@@ -3,7 +3,7 @@
 """Test suite for the migration_set_commitment_policy_example."""
 import pytest
 
-from ...src.keyrings.migration_set_commitment_policy_example import encrypt_and_decrypt_with_keyring
+from ..src.migration_set_commitment_policy_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_multi_keyring_example.py b/examples/test/test_i_multi_keyring_example.py
similarity index 85%
rename from examples/test/keyrings/test_i_multi_keyring_example.py
rename to examples/test/test_i_multi_keyring_example.py
index ad12c0c9c..485789c8b 100644
--- a/examples/test/keyrings/test_i_multi_keyring_example.py
+++ b/examples/test/test_i_multi_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the multi keyring example."""
 import pytest
 
-from ...src.keyrings.multi_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.multi_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_raw_aes_keyring_example.py b/examples/test/test_i_raw_aes_keyring_example.py
similarity index 81%
rename from examples/test/keyrings/test_i_raw_aes_keyring_example.py
rename to examples/test/test_i_raw_aes_keyring_example.py
index e5bd6d4c2..5ac2b6012 100644
--- a/examples/test/keyrings/test_i_raw_aes_keyring_example.py
+++ b/examples/test/test_i_raw_aes_keyring_example.py
@@ -3,7 +3,7 @@
 """Test suite for the Raw AES keyring example."""
 import pytest
 
-from ...src.keyrings.raw_aes_keyring_example import encrypt_and_decrypt_with_keyring
+from ..src.raw_aes_keyring_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_raw_rsa_keyring_example.py b/examples/test/test_i_raw_rsa_keyring_example.py
similarity index 93%
rename from examples/test/keyrings/test_i_raw_rsa_keyring_example.py
rename to examples/test/test_i_raw_rsa_keyring_example.py
index 87786b4b3..8cdf628f2 100644
--- a/examples/test/keyrings/test_i_raw_rsa_keyring_example.py
+++ b/examples/test/test_i_raw_rsa_keyring_example.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from ...src.keyrings.raw_rsa_keyring_example import encrypt_and_decrypt_with_keyring, generate_rsa_keys
+from ..src.raw_rsa_keyring_example import encrypt_and_decrypt_with_keyring, generate_rsa_keys
 
 pytestmark = [pytest.mark.examples]
 
@@ -60,7 +60,7 @@ def test_encrypt_and_decrypt_fails_if_user_provides_only_public_key():
     test both encryption and decryption, or not provide any keys and the example generates both
     """
     # Generate the user keys for testing
-    user_public_key, user_private_key = generate_rsa_keys()
+    user_public_key, user_private_key = generate_rsa_keys()  # pylint: disable=unused-variable
 
     # Convert the public key to string
     user_public_key = user_public_key.decode('utf-8')
@@ -92,7 +92,7 @@ def test_encrypt_and_decrypt_fails_if_user_provides_only_private_key():
     test both encryption and decryption, or not provide any keys and the example generates both
     """
     # Generate the user keys for testing
-    user_public_key, user_private_key = generate_rsa_keys()
+    user_public_key, user_private_key = generate_rsa_keys()  # pylint: disable=unused-variable
 
     # Convert the private key to string
     user_private_key = user_private_key.decode('utf-8')
diff --git a/examples/test/keyrings/test_i_required_encryption_context_cmm.py b/examples/test/test_i_required_encryption_context_cmm.py
similarity index 81%
rename from examples/test/keyrings/test_i_required_encryption_context_cmm.py
rename to examples/test/test_i_required_encryption_context_cmm.py
index 724705faa..2aa702b37 100644
--- a/examples/test/keyrings/test_i_required_encryption_context_cmm.py
+++ b/examples/test/test_i_required_encryption_context_cmm.py
@@ -3,7 +3,7 @@
 """Test suite for the required encryption context CMM example."""
 import pytest
 
-from ...src.keyrings.required_encryption_context_cmm import encrypt_and_decrypt_with_keyring
+from ..src.required_encryption_context_cmm import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/examples/test/keyrings/test_i_set_encryption_algorithm_suite_example.py b/examples/test/test_i_set_encryption_algorithm_suite_example.py
similarity index 79%
rename from examples/test/keyrings/test_i_set_encryption_algorithm_suite_example.py
rename to examples/test/test_i_set_encryption_algorithm_suite_example.py
index 0703bc961..9069cfe44 100644
--- a/examples/test/keyrings/test_i_set_encryption_algorithm_suite_example.py
+++ b/examples/test/test_i_set_encryption_algorithm_suite_example.py
@@ -3,7 +3,7 @@
 """Test suite for the Set Algorithm Suite example for a Raw AES keyring."""
 import pytest
 
-from ...src.keyrings.set_encryption_algorithm_suite_example import encrypt_and_decrypt_with_keyring
+from ..src.set_encryption_algorithm_suite_example import encrypt_and_decrypt_with_keyring
 
 pytestmark = [pytest.mark.examples]
 
diff --git a/tox.ini b/tox.ini
index 6a4c3d10c..8d4af1d2d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -89,10 +89,10 @@ commands =
     mpllocal: {[testenv:base-command]commands} test/ -m local
     integ: {[testenv:base-command]commands} test/ -m integ --ignore test/mpl/
     accept: {[testenv:base-command]commands} test/ -m accept --ignore test/mpl/
-    examples: {[testenv:base-command]commands} examples/test/ -m examples --ignore examples/test/keyrings/
+    examples: {[testenv:base-command]commands} examples/test/legacy/ -m examples
     # MPL keyring examples require a special IAM role; run these separately under a separate set of permissions
-    mplexamples: {[testenv:base-command]commands} examples/test/keyrings -m examples
-    all: {[testenv:base-command]commands} test/ examples/test/ --ignore test/mpl/ --ignore examples/test/keyrings/
+    mplexamples: {[testenv:base-command]commands} examples/test/ -m examples --ignore examples/test/legacy/
+    all: {[testenv:base-command]commands} test/ examples/test/legacy/ --ignore test/mpl/
     mplall: {[testenv:base-command]commands} test/ examples/test/
     manual: {[testenv:base-command]commands}
 
@@ -192,8 +192,8 @@ commands =
 basepython = {[testenv:pylint]basepython}
 deps = {[testenv:pylint]deps}
 commands =
-    pylint --rcfile=examples/src/pylintrc examples/src/ --ignore-paths=examples/src/keyrings
-    pylint --rcfile=examples/test/pylintrc --disable R0801 examples/test/ --ignore-paths=examples/test/keyrings
+    pylint --rcfile=examples/src/pylintrc examples/src/
+    pylint --rcfile=examples/test/pylintrc --disable R0801 examples/test/
 
 [testenv:pylint-tests]
 basepython = {[testenv:pylint]basepython}