diff --git a/rules/cloud/azure_container_registry_created_or_deleted.yml b/rules/cloud/azure/azure_container_registry_created_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_container_registry_created_or_deleted.yml
rename to rules/cloud/azure/azure_container_registry_created_or_deleted.yml
diff --git a/rules/cloud/azure_dns_zone_modified_or_deleted.yml b/rules/cloud/azure/azure_dns_zone_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_dns_zone_modified_or_deleted.yml
rename to rules/cloud/azure/azure_dns_zone_modified_or_deleted.yml
diff --git a/rules/cloud/azure_firewall_modified_or_deleted.yml b/rules/cloud/azure/azure_firewall_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_firewall_modified_or_deleted.yml
rename to rules/cloud/azure/azure_firewall_modified_or_deleted.yml
diff --git a/rules/cloud/azure_firewall_rule_collection_modified_or_deleted.yml b/rules/cloud/azure/azure_firewall_rule_collection_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_firewall_rule_collection_modified_or_deleted.yml
rename to rules/cloud/azure/azure_firewall_rule_collection_modified_or_deleted.yml
diff --git a/rules/cloud/azure_kubernetes_cluster_created_or_deleted.yml b/rules/cloud/azure/azure_kubernetes_cluster_created_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_cluster_created_or_deleted.yml
rename to rules/cloud/azure/azure_kubernetes_cluster_created_or_deleted.yml
diff --git a/rules/cloud/azure_kubernetes_events_deleted.yml b/rules/cloud/azure/azure_kubernetes_events_deleted.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_events_deleted.yml
rename to rules/cloud/azure/azure_kubernetes_events_deleted.yml
diff --git a/rules/cloud/azure_kubernetes_network_policy_change.yml b/rules/cloud/azure/azure_kubernetes_network_policy_change.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_network_policy_change.yml
rename to rules/cloud/azure/azure_kubernetes_network_policy_change.yml
diff --git a/rules/cloud/azure_kubernetes_pods_deleted.yml b/rules/cloud/azure/azure_kubernetes_pods_deleted.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_pods_deleted.yml
rename to rules/cloud/azure/azure_kubernetes_pods_deleted.yml
diff --git a/rules/cloud/azure_kubernetes_role_access.yml b/rules/cloud/azure/azure_kubernetes_role_access.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_role_access.yml
rename to rules/cloud/azure/azure_kubernetes_role_access.yml
diff --git a/rules/cloud/azure_kubernetes_rolebinding_modified_or_deleted.yml b/rules/cloud/azure/azure_kubernetes_rolebinding_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_rolebinding_modified_or_deleted.yml
rename to rules/cloud/azure/azure_kubernetes_rolebinding_modified_or_deleted.yml
diff --git a/rules/cloud/azure_kubernetes_secret_or_config_object_access.yml b/rules/cloud/azure/azure_kubernetes_secret_or_config_object_access.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_secret_or_config_object_access.yml
rename to rules/cloud/azure/azure_kubernetes_secret_or_config_object_access.yml
diff --git a/rules/cloud/azure_kubernetes_service_account_modified_or_deleted.yml b/rules/cloud/azure/azure_kubernetes_service_account_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_kubernetes_service_account_modified_or_deleted.yml
rename to rules/cloud/azure/azure_kubernetes_service_account_modified_or_deleted.yml
diff --git a/rules/cloud/azure_network_firewall_rule_modified_or_deleted.yml b/rules/cloud/azure/azure_network_firewall_rule_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_network_firewall_rule_modified_or_deleted.yml
rename to rules/cloud/azure/azure_network_firewall_rule_modified_or_deleted.yml
diff --git a/rules/cloud/azure_network_p2s_vpn_modified_or_deleted.yml b/rules/cloud/azure/azure_network_p2s_vpn_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_network_p2s_vpn_modified_or_deleted.yml
rename to rules/cloud/azure/azure_network_p2s_vpn_modified_or_deleted.yml
diff --git a/rules/cloud/azure_network_security_modified_or_deleted.yml b/rules/cloud/azure/azure_network_security_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_network_security_modified_or_deleted.yml
rename to rules/cloud/azure/azure_network_security_modified_or_deleted.yml
diff --git a/rules/cloud/azure_network_virtual_device_modified_or_deleted.yml b/rules/cloud/azure/azure_network_virtual_device_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_network_virtual_device_modified_or_deleted.yml
rename to rules/cloud/azure/azure_network_virtual_device_modified_or_deleted.yml
diff --git a/rules/cloud/azure_virtual_network_modified_or_deleted.yml b/rules/cloud/azure/azure_virtual_network_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_virtual_network_modified_or_deleted.yml
rename to rules/cloud/azure/azure_virtual_network_modified_or_deleted.yml
diff --git a/rules/cloud/azure_vpn_connection_modified_or_deleted.yml b/rules/cloud/azure/azure_vpn_connection_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/azure_vpn_connection_modified_or_deleted.yml
rename to rules/cloud/azure/azure_vpn_connection_modified_or_deleted.yml