diff --git a/python-package/src/atls/validators/__init__.py b/python-package/src/atls/validators/__init__.py
index 3ee77cf..206be70 100644
--- a/python-package/src/atls/validators/__init__.py
+++ b/python-package/src/atls/validators/__init__.py
@@ -1,11 +1,3 @@
-from atls.validators.az_aas import AZ_AAS_GLOBAL_JKUS
-from atls.validators.az_aas_aci_validator import AzAasAciValidator
-from atls.validators.az_aas_cvm_validator import AzAasCvmValidator
 from atls.validators.validator import Validator
 
-__all__ = [
-    "AZ_AAS_GLOBAL_JKUS",
-    "AzAasAciValidator",
-    "AzAasCvmValidator",
-    "Validator",
-]
+__all__ = ["Validator"]
diff --git a/python-package/src/atls/validators/azure/__init__.py b/python-package/src/atls/validators/azure/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/python-package/src/atls/validators/azure/aas/__init__.py b/python-package/src/atls/validators/azure/aas/__init__.py
new file mode 100644
index 0000000..87cdd92
--- /dev/null
+++ b/python-package/src/atls/validators/azure/aas/__init__.py
@@ -0,0 +1,9 @@
+from atls.validators.azure.aas.aci_validator import AciValidator
+from atls.validators.azure.aas.cvm_validator import CvmValidator
+from atls.validators.azure.aas.shared import PUBLIC_JKUS
+
+__all__ = [
+    "PUBLIC_JKUS",
+    "AciValidator",
+    "CvmValidator",
+]
diff --git a/python-package/src/atls/validators/az_aas_aci_validator.py b/python-package/src/atls/validators/azure/aas/aci_validator.py
similarity index 98%
rename from python-package/src/atls/validators/az_aas_aci_validator.py
rename to python-package/src/atls/validators/azure/aas/aci_validator.py
index 732975d..d4a5622 100644
--- a/python-package/src/atls/validators/az_aas_aci_validator.py
+++ b/python-package/src/atls/validators/azure/aas/aci_validator.py
@@ -4,7 +4,7 @@
 from typing import Any, Dict, List, Optional
 
 import jwt
-from atls.validators.validator import Validator
+from atls.validators import Validator
 from cryptography import x509
 from cryptography.hazmat.primitives.asymmetric.types import (
     CertificatePublicKeyTypes,
@@ -12,7 +12,7 @@
 from cryptography.x509.oid import ObjectIdentifier
 
 
-class AzAasAciValidator(Validator):
+class AciValidator(Validator):
     """
     Validates an attestation document issued for a confidential Azure ACI
     container running on AMD SEV-SNP using the Azure Attestation Service (AAS).
diff --git a/python-package/src/atls/validators/az_aas_cvm_validator.py b/python-package/src/atls/validators/azure/aas/cvm_validator.py
similarity index 87%
rename from python-package/src/atls/validators/az_aas_cvm_validator.py
rename to python-package/src/atls/validators/azure/aas/cvm_validator.py
index 1f9fb6f..dd933e5 100644
--- a/python-package/src/atls/validators/az_aas_cvm_validator.py
+++ b/python-package/src/atls/validators/azure/aas/cvm_validator.py
@@ -1,8 +1,8 @@
-from atls.validators.validator import Validator
+from atls.validators import Validator
 from cryptography.x509.oid import ObjectIdentifier
 
 
-class AzAasCvmValidator(Validator):
+class CvmValidator(Validator):
     """
     Validates an attestation document issued for an Azure Confidential Virtual
     Machine (CVM) running on AMD SEV-SNP using the Azure Attestation Service
diff --git a/python-package/src/atls/validators/az_aas.py b/python-package/src/atls/validators/azure/aas/shared.py
similarity index 87%
rename from python-package/src/atls/validators/az_aas.py
rename to python-package/src/atls/validators/azure/aas/shared.py
index 061c70c..32dcf7a 100644
--- a/python-package/src/atls/validators/az_aas.py
+++ b/python-package/src/atls/validators/azure/aas/shared.py
@@ -1,6 +1,6 @@
 from typing import List
 
-AZ_AAS_GLOBAL_JKUS: List[str] = [
+PUBLIC_JKUS: List[str] = [
     "https://sharedcus.cus.attest.azure.net/certs",
     "https://sharedeus.eus.attest.azure.net/certs",
     "https://sharedeus2.eus2.attest.azure.net/certs",