diff --git a/analytics/cloud-infra/aws_acm_certificate.yaml b/analytics/cloud-infra/aws_acm_certificate.yaml deleted file mode 100755 index 3968539b2..000000000 --- a/analytics/cloud-infra/aws_acm_certificate.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: ACM Public Certificate (SSL/TLS) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::certificatemanager::certificate' group by 1,2; -status: inactive -tags: - category: - - Security diff --git a/analytics/cloud-infra/aws_acmpca_certificate_authority.yaml b/analytics/cloud-infra/aws_acmpca_certificate_authority.yaml deleted file mode 100755 index cf82001bb..000000000 --- a/analytics/cloud-infra/aws_acmpca_certificate_authority.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Private Certificate Authority -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::acmpca::certificateauthority' group by 1,2; -status: inactive -tags: - category: - - Security diff --git a/analytics/cloud-infra/aws_ami.yaml b/analytics/cloud-infra/aws_ami.yaml deleted file mode 100755 index ebfeab1b7..000000000 --- a/analytics/cloud-infra/aws_ami.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 VM Image -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::image' group by 1,2; -status: inactive -tags: - category: - - Storage diff --git a/analytics/cloud-infra/aws_api_gateway.yaml b/analytics/cloud-infra/aws_api_gateway.yaml deleted file mode 100755 index 74aaf1060..000000000 --- a/analytics/cloud-infra/aws_api_gateway.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: API Gateways -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::apigateway::restapi' group by 1,2; -status: active -tags: - category: - - Network - search_terms: - - API Gateway - - AWS API - - REST API - - AWS Gateway - - API management - - AWS REST - - AWS services - - API interface - - Amazon API Gateway - - AWS API development diff --git a/analytics/cloud-infra/aws_autoscaling_group.yaml b/analytics/cloud-infra/aws_autoscaling_group.yaml deleted file mode 100755 index f8b59a14a..000000000 --- a/analytics/cloud-infra/aws_autoscaling_group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Auto Scaling Group -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::autoscaling::autoscalinggroup' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/aws_backup_plan.yaml b/analytics/cloud-infra/aws_backup_plan.yaml deleted file mode 100755 index 761c7a27c..000000000 --- a/analytics/cloud-infra/aws_backup_plan.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Backup Plan -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::backup::plan' group by 1,2; -status: inactive -tags: - category: - - Resiliency diff --git a/analytics/cloud-infra/aws_backup_vault.yaml b/analytics/cloud-infra/aws_backup_vault.yaml deleted file mode 100755 index 63dab01a2..000000000 --- a/analytics/cloud-infra/aws_backup_vault.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Backup Vault -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::backup::vault' group by 1,2; -status: active -tags: - category: - - Resiliency - search_terms: - - AWS Backup - - Backup Vault - - AWS vault - - AWS data backup - - AWS cloud backup - - AWS storage backup - - AWS backup service - - Amazon backup - - AWS backup solution - - AWS secure backup diff --git a/analytics/cloud-infra/aws_batch_compute_environment.yaml b/analytics/cloud-infra/aws_batch_compute_environment.yaml deleted file mode 100755 index 3e6e37e7f..000000000 --- a/analytics/cloud-infra/aws_batch_compute_environment.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Batch Compute Environment -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::batch::computeenvironment' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/aws_cloudformation_stack.yaml b/analytics/cloud-infra/aws_cloudformation_stack.yaml deleted file mode 100755 index 88fbf7c84..000000000 --- a/analytics/cloud-infra/aws_cloudformation_stack.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: CloudFormation Stacks -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::cloudformation::stack' group by 1,2; -status: inactive -tags: - category: - - DevOps diff --git a/analytics/cloud-infra/aws_cloudformation_stack_set.yaml b/analytics/cloud-infra/aws_cloudformation_stack_set.yaml deleted file mode 100755 index bce4b09ba..000000000 --- a/analytics/cloud-infra/aws_cloudformation_stack_set.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: CloudFormation StackSet -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::cloudformation::stackset' group by 1,2; -status: inactive -tags: - category: - - DevOps diff --git a/analytics/cloud-infra/aws_cloudfront_distribution.yaml b/analytics/cloud-infra/aws_cloudfront_distribution.yaml deleted file mode 100755 index 58f222878..000000000 --- a/analytics/cloud-infra/aws_cloudfront_distribution.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: CloudFront (CDN) Distribution -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::cloudfront::distribution' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/aws_cloudtrail.yaml b/analytics/cloud-infra/aws_cloudtrail.yaml deleted file mode 100755 index baa4e5bda..000000000 --- a/analytics/cloud-infra/aws_cloudtrail.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: CloudTrail -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::cloudtrail::trail' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/aws_codebuild_project.yaml b/analytics/cloud-infra/aws_codebuild_project.yaml deleted file mode 100755 index e3b7b038b..000000000 --- a/analytics/cloud-infra/aws_codebuild_project.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: CodeBuild Project -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::codebuild::project' group by 1,2; -status: inactive -tags: - category: - - DevOps diff --git a/analytics/cloud-infra/aws_codecommit_repository.yaml b/analytics/cloud-infra/aws_codecommit_repository.yaml deleted file mode 100755 index 2daa9da9f..000000000 --- a/analytics/cloud-infra/aws_codecommit_repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Code Commit Repository -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::codecommit::repository' group by 1,2; -status: inactive -tags: - category: - - DevOps diff --git a/analytics/cloud-infra/aws_codepipeline.yaml b/analytics/cloud-infra/aws_codepipeline.yaml deleted file mode 100755 index afc0a7677..000000000 --- a/analytics/cloud-infra/aws_codepipeline.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Code Pipeline -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::codepipeline::pipeline' group by 1,2; -status: inactive -tags: - category: - - DevOps diff --git a/analytics/cloud-infra/aws_customer_gateway.yaml b/analytics/cloud-infra/aws_customer_gateway.yaml deleted file mode 100755 index 2167ce12b..000000000 --- a/analytics/cloud-infra/aws_customer_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Customer Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::customergateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_db_instance.yaml b/analytics/cloud-infra/aws_db_instance.yaml deleted file mode 100755 index 270bc0530..000000000 --- a/analytics/cloud-infra/aws_db_instance.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: RDS Instances -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::rds::dbinstance' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - RDS - - AWS RDS - - Relational Database Service - - AWS database - - RDS instances - - Amazon RDS - - AWS managed database - - AWS SQL - - RDS MySQL - - RDS PostgreSQL diff --git a/analytics/cloud-infra/aws_directory_service_directory.yaml b/analytics/cloud-infra/aws_directory_service_directory.yaml deleted file mode 100755 index bee0e3c6d..000000000 --- a/analytics/cloud-infra/aws_directory_service_directory.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Directory Service - Identity Directory -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::directoryservice::directory' group by 1,2; -status: inactive -tags: - category: - - Identity + Access diff --git a/analytics/cloud-infra/aws_docdb_cluster.yaml b/analytics/cloud-infra/aws_docdb_cluster.yaml deleted file mode 100755 index 1af77ae87..000000000 --- a/analytics/cloud-infra/aws_docdb_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon DocumentDB Elastic Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::docdb::cluster' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - DocumentDB - - AWS DocumentDB - - NoSQL - - AWS NoSQL - - Amazon DocumentDB - - AWS database - - MongoDB compatible - - AWS managed database - - DocumentDB cluster - - AWS scalable database diff --git a/analytics/cloud-infra/aws_dx_gateway.yaml b/analytics/cloud-infra/aws_dx_gateway.yaml deleted file mode 100755 index e883674ce..000000000 --- a/analytics/cloud-infra/aws_dx_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Direct Connect Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::directconnect::gateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_dynamodb_table.yaml b/analytics/cloud-infra/aws_dynamodb_table.yaml deleted file mode 100755 index d6ae8fc5c..000000000 --- a/analytics/cloud-infra/aws_dynamodb_table.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: DynamoDB Table -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::dynamodb::table' group by 1,2; -status: inactive -tags: - category: - - Database diff --git a/analytics/cloud-infra/aws_ebs_snapshot.yaml b/analytics/cloud-infra/aws_ebs_snapshot.yaml deleted file mode 100755 index 3a04097d6..000000000 --- a/analytics/cloud-infra/aws_ebs_snapshot.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Disk Snapshot -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::volumesnapshot' group by 1,2; -status: inactive -tags: - category: - - Storage diff --git a/analytics/cloud-infra/aws_ebs_volume.yaml b/analytics/cloud-infra/aws_ebs_volume.yaml deleted file mode 100755 index b336a0fb3..000000000 --- a/analytics/cloud-infra/aws_ebs_volume.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: EBS Volume (Disk) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::volume' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - EBS - - AWS EBS - - Amazon EBS - - Elastic Block Store - - AWS storage - - AWS disk - - AWS block storage - - Amazon block storage - - EBS volume - - AWS volume diff --git a/analytics/cloud-infra/aws_ec2_local_gateway.yaml b/analytics/cloud-infra/aws_ec2_local_gateway.yaml deleted file mode 100755 index 2dbf94224..000000000 --- a/analytics/cloud-infra/aws_ec2_local_gateway.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Local Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::localgateway' group by 1,2; -status: active -tags: - category: - - Network Gateways - search_terms: - - AWS Local Gateway - - AWS on-premises connection - - AWS gateway - - AWS network gateway - - AWS hybrid cloud - - AWS local network - - AWS direct connect - - AWS cloud integration - - AWS local connectivity - - AWS network interface diff --git a/analytics/cloud-infra/aws_ec2_transit_gateway.yaml b/analytics/cloud-infra/aws_ec2_transit_gateway.yaml deleted file mode 100755 index 93aaf95bd..000000000 --- a/analytics/cloud-infra/aws_ec2_transit_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Transit Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::transitgateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_ecr_repository.yaml b/analytics/cloud-infra/aws_ecr_repository.yaml deleted file mode 100755 index 6db79773e..000000000 --- a/analytics/cloud-infra/aws_ecr_repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Container (ECR) Repository -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ecr::repository' group by 1,2; -status: inactive -tags: - category: - - Containers diff --git a/analytics/cloud-infra/aws_ecs_cluster.yaml b/analytics/cloud-infra/aws_ecs_cluster.yaml deleted file mode 100755 index 17a3f6012..000000000 --- a/analytics/cloud-infra/aws_ecs_cluster.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Elastic Container Service (ECS) Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ecs::cluster' group by 1,2; -status: inactive -tags: - category: - - Containers diff --git a/analytics/cloud-infra/aws_efs_file_system.yaml b/analytics/cloud-infra/aws_efs_file_system.yaml deleted file mode 100755 index 21552020f..000000000 --- a/analytics/cloud-infra/aws_efs_file_system.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Elastic File System (EFS) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::efs::filesystem' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - EFS - - AWS file storage - - Elastic File System - - AWS EFS - - NFS - - AWS NFS - - Cloud file storage - - AWS file system - - Amazon EFS - - AWS storage diff --git a/analytics/cloud-infra/aws_egress_only_internet_gateway.yaml b/analytics/cloud-infra/aws_egress_only_internet_gateway.yaml deleted file mode 100755 index 380722860..000000000 --- a/analytics/cloud-infra/aws_egress_only_internet_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Internet Gateway (Egress-Only) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::egressonlyinternetgateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_eip.yaml b/analytics/cloud-infra/aws_eip.yaml deleted file mode 100755 index d7d271b71..000000000 --- a/analytics/cloud-infra/aws_eip.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Elastic IP (Public IP) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::elasticip' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/aws_eks_cluster.yaml b/analytics/cloud-infra/aws_eks_cluster.yaml deleted file mode 100755 index 15f233cac..000000000 --- a/analytics/cloud-infra/aws_eks_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: EKS (Kubernetes) Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::eks::cluster' group by 1,2; -status: active -tags: - category: - - Containers - search_terms: - - EKS - - AWS Kubernetes - - Kubernetes - - AWS EKS cluster - - Amazon EKS - - AWS container - - Kubernetes cluster - - AWS orchestration - - EKS service - - AWS cloud Kubernetes diff --git a/analytics/cloud-infra/aws_elastic_beanstalk_application.yaml b/analytics/cloud-infra/aws_elastic_beanstalk_application.yaml deleted file mode 100755 index dbc21c4d7..000000000 --- a/analytics/cloud-infra/aws_elastic_beanstalk_application.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Elastic Beanstalk Web Application Service -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::elasticbeanstalk::application' group by 1,2; -status: active -tags: - category: - - PaaS - search_terms: - - Elastic Beanstalk - - AWS Beanstalk - - AWS web app - - Beanstalk - - AWS deployment - - AWS PaaS - - Web application - - AWS application - - AWS scalable app - - Amazon Beanstalk diff --git a/analytics/cloud-infra/aws_elasticache_cluster.yaml b/analytics/cloud-infra/aws_elasticache_cluster.yaml deleted file mode 100755 index 87600f162..000000000 --- a/analytics/cloud-infra/aws_elasticache_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: ElastiCache Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::elasticache::cluster' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - ElastiCache - - AWS cache - - Redis - - Memcached - - AWS Redis - - AWS Memcached - - Cache cluster - - AWS in-memory - - ElastiCache cluster - - AWS caching diff --git a/analytics/cloud-infra/aws_elb.yaml b/analytics/cloud-infra/aws_elb.yaml deleted file mode 100755 index 1b622fb15..000000000 --- a/analytics/cloud-infra/aws_elb.yaml +++ /dev/null @@ -1,21 +0,0 @@ -integrationType: -- aws_cloud_account -name: Classic Load Balancer (Legacy) -query: select og_account_id, region, count(*) from aws_ec2_classic_load_balancer group by 1,2; -status: active -tables: -- aws::elasticloadbalancing::loadbalancer -tags: - category: - - Network - search_terms: - - Classic Load Balancer - - AWS load balancing - - AWS CLB - - Load balancer - - AWS legacy - - AWS Elastic Load Balancing - - CLB - - Amazon Load Balancer - - AWS traffic - - AWS network diff --git a/analytics/cloud-infra/aws_emr_cluster.yaml b/analytics/cloud-infra/aws_emr_cluster.yaml deleted file mode 100755 index 0ff72db7a..000000000 --- a/analytics/cloud-infra/aws_emr_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Elastic MapReduce (EMR) Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::emr::cluster' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - EMR - - AWS EMR - - MapReduce - - AWS big data - - Elastic MapReduce - - Amazon EMR - - Hadoop - - AWS data processing - - AWS Hadoop - - Big data cluster diff --git a/analytics/cloud-infra/aws_fsx_ile_system.yaml b/analytics/cloud-infra/aws_fsx_ile_system.yaml deleted file mode 100755 index d0a58e18c..000000000 --- a/analytics/cloud-infra/aws_fsx_ile_system.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: FSx File System -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::fsx::filesystem' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - FSx - - AWS FSx - - File system - - AWS storage - - FSx for Windows - - FSx for Lustre - - Amazon FSx - - Cloud file storage - - AWS file system - - AWS scalable storage diff --git a/analytics/cloud-infra/aws_glacier_vault.yaml b/analytics/cloud-infra/aws_glacier_vault.yaml deleted file mode 100755 index 2f4987334..000000000 --- a/analytics/cloud-infra/aws_glacier_vault.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: S3 Glacier Vault -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::glacier::vault' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - S3 Glacier - - AWS Glacier - - Cold storage - - AWS archive - - Amazon Glacier - - AWS data archive - - Glacier Vault - - AWS long-term storage - - AWS S3 - - AWS low-cost storage diff --git a/analytics/cloud-infra/aws_iam_group.yaml b/analytics/cloud-infra/aws_iam_group.yaml deleted file mode 100755 index 6d86d6f72..000000000 --- a/analytics/cloud-infra/aws_iam_group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: IAM Group -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::iam::group' group by 1,2; -status: inactive -tags: - category: - - Identity + Access diff --git a/analytics/cloud-infra/aws_iam_policy.yaml b/analytics/cloud-infra/aws_iam_policy.yaml deleted file mode 100755 index d4186e63e..000000000 --- a/analytics/cloud-infra/aws_iam_policy.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: IAM Policy -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::iam::policy' group by 1,2; -status: inactive -tags: - category: - - Identity + Access diff --git a/analytics/cloud-infra/aws_iam_role.yaml b/analytics/cloud-infra/aws_iam_role.yaml deleted file mode 100755 index 44e8e1635..000000000 --- a/analytics/cloud-infra/aws_iam_role.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: IAM Role -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::iam::role' group by 1,2; -status: inactive -tags: - category: - - Identity + Access diff --git a/analytics/cloud-infra/aws_iam_user.yaml b/analytics/cloud-infra/aws_iam_user.yaml deleted file mode 100755 index d893687ec..000000000 --- a/analytics/cloud-infra/aws_iam_user.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: IAM User -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::iam::user' group by 1,2; -status: inactive -tags: - category: - - Identity + Access diff --git a/analytics/cloud-infra/aws_instance.yaml b/analytics/cloud-infra/aws_instance.yaml deleted file mode 100755 index 51fc0be7a..000000000 --- a/analytics/cloud-infra/aws_instance.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 Instance (Virtual Machine) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::instance' group by 1,2; -status: active -tags: - category: - - Compute - search_terms: - - EC2 - - AWS EC2 - - Amazon EC2 - - AWS VM - - AWS Virtual Machine - - AWS server - - Amazon cloud server - - EC2 instance - - AWS computing - - Amazon VM diff --git a/analytics/cloud-infra/aws_internet_gateway.yaml b/analytics/cloud-infra/aws_internet_gateway.yaml deleted file mode 100755 index d3e323609..000000000 --- a/analytics/cloud-infra/aws_internet_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Internet Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::internetgateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_keyspaces_keyspace.yaml b/analytics/cloud-infra/aws_keyspaces_keyspace.yaml deleted file mode 100755 index 0326539d4..000000000 --- a/analytics/cloud-infra/aws_keyspaces_keyspace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Cassandra Keyspace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::keyspaces::keyspace' group by 1,2; -status: inactive -tags: - category: - - Database diff --git a/analytics/cloud-infra/aws_kinesis_stream.yaml b/analytics/cloud-infra/aws_kinesis_stream.yaml deleted file mode 100755 index 36642deb6..000000000 --- a/analytics/cloud-infra/aws_kinesis_stream.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Kinesis Data Streams -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::kinesis::stream' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - Kinesis - - AWS Kinesis - - Data stream - - AWS streaming - - Kinesis streams - - Amazon Kinesis - - AWS real-time - - Streaming data - - Kinesis data - - AWS data flow diff --git a/analytics/cloud-infra/aws_lambda_function.yaml b/analytics/cloud-infra/aws_lambda_function.yaml deleted file mode 100755 index 2712d6009..000000000 --- a/analytics/cloud-infra/aws_lambda_function.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Lambda Function -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::lambda::function' group by 1,2; -status: active -tags: - category: - - PaaS - search_terms: - - Lambda - - AWS Lambda - - Serverless - - AWS serverless - - Lambda functions - - AWS functions - - AWS compute - - Function-as-a-Service - - AWS FaaS - - Lambda computing diff --git a/analytics/cloud-infra/aws_lb_application.yaml b/analytics/cloud-infra/aws_lb_application.yaml deleted file mode 100755 index 759234793..000000000 --- a/analytics/cloud-infra/aws_lb_application.yaml +++ /dev/null @@ -1,21 +0,0 @@ -integrationType: -- aws_cloud_account -name: Application Load Balancer -query: select og_account_id, region, count(*) from aws_ec2_application_load_balancer group by 1,2; -status: active -tables: -- aws::elasticloadbalancing::loadbalancer -tags: - category: - - Network - search_terms: - - ALB - - AWS ALB - - Application Load Balancer - - AWS load balancing - - AWS load balancer - - AWS traffic management - - AWS application balancing - - AWS web traffic - - AWS elastic load balancing - - AWS web balancing diff --git a/analytics/cloud-infra/aws_lb_network.yaml b/analytics/cloud-infra/aws_lb_network.yaml deleted file mode 100755 index 61a5ce6bc..000000000 --- a/analytics/cloud-infra/aws_lb_network.yaml +++ /dev/null @@ -1,21 +0,0 @@ -integrationType: -- aws_cloud_account -name: Network Load Balancer -query: select og_account_id, region, count(*) from aws_ec2_network_load_balancer group by 1,2; -status: active -tables: -- aws::elasticloadbalancing::loadbalancer -tags: - category: - - Network - search_terms: - - NLB - - AWS NLB - - Network Load Balancer - - AWS network balancing - - AWS TCP load balancer - - AWS layer 4 load balancer - - AWS load balancing - - AWS network traffic - - AWS high-performance load balancer - - AWS elastic load balancing diff --git a/analytics/cloud-infra/aws_lightsail_instance.yaml b/analytics/cloud-infra/aws_lightsail_instance.yaml deleted file mode 100755 index 443b46bbe..000000000 --- a/analytics/cloud-infra/aws_lightsail_instance.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Lightsail Instance -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::lightsail::instance' group by 1,2; -status: active -tags: - category: - - PaaS - search_terms: - - AWS Lightsail - - AWS VPS - - AWS virtual server - - AWS hosting - - Lightsail - - AWS cloud server - - AWS easy deployment - - AWS web server - - AWS Lightsail instance - - AWS simplified cloud diff --git a/analytics/cloud-infra/aws_memorydb_cluster.yaml b/analytics/cloud-infra/aws_memorydb_cluster.yaml deleted file mode 100755 index b708f7566..000000000 --- a/analytics/cloud-infra/aws_memorydb_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: MemoryDB Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::memorydb::cluster' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - MemoryDB - - AWS MemoryDB - - In-memory database - - Redis compatible - - AWS Redis - - AWS database - - MemoryDB cluster - - AWS fast database - - Amazon MemoryDB - - AWS caching diff --git a/analytics/cloud-infra/aws_mq_broker.yaml b/analytics/cloud-infra/aws_mq_broker.yaml deleted file mode 100755 index 760053bfa..000000000 --- a/analytics/cloud-infra/aws_mq_broker.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS MQ Broker -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::mq::broker' group by 1,2; -status: inactive -tags: - category: - - Messaging diff --git a/analytics/cloud-infra/aws_msk_cluster.yaml b/analytics/cloud-infra/aws_msk_cluster.yaml deleted file mode 100755 index b86ba164c..000000000 --- a/analytics/cloud-infra/aws_msk_cluster.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Managed Kafka Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::kafka::cluster' group by 1,2; -status: inactive -tags: - category: - - Managed Services diff --git a/analytics/cloud-infra/aws_mwaa_environment.yaml b/analytics/cloud-infra/aws_mwaa_environment.yaml deleted file mode 100755 index d52bf1b6b..000000000 --- a/analytics/cloud-infra/aws_mwaa_environment.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Managed Airflow -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::mwaa::environment' group by 1,2; -status: active -tags: - category: - - Managed Services - search_terms: - - AWS Airflow - - AWS managed workflow - - AWS orchestration - - Airflow - - AWS data pipeline - - AWS Apache Airflow - - AWS workflow automation - - AWS ETL - - AWS task management - - AWS data processing diff --git a/analytics/cloud-infra/aws_nat_gateway.yaml b/analytics/cloud-infra/aws_nat_gateway.yaml deleted file mode 100755 index d2955e580..000000000 --- a/analytics/cloud-infra/aws_nat_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: NAT Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::natgateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_neptune_orderable_db_instance.yaml b/analytics/cloud-infra/aws_neptune_orderable_db_instance.yaml deleted file mode 100755 index 363bc464d..000000000 --- a/analytics/cloud-infra/aws_neptune_orderable_db_instance.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Neptune Database -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::neptune::database' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Neptune - - AWS Neptune - - Amazon Neptune - - AWS database - - Neptune DB - - AWS graph database - - AWS managed database - - Neptune graph - - AWS NoSQL database - - AWS Neptune service diff --git a/analytics/cloud-infra/aws_networkfirewall_firewall.yaml b/analytics/cloud-infra/aws_networkfirewall_firewall.yaml deleted file mode 100755 index f675a0d3c..000000000 --- a/analytics/cloud-infra/aws_networkfirewall_firewall.yaml +++ /dev/null @@ -1,18 +0,0 @@ - -name: Network Firewall -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::networkfirewall::firewall' group by 1,2; -status: active -tags: - category: - - Network - search_terms: - - AWS Firewall - - AWS network security - - AWS security - - AWS firewall service - - AWS network protection - - AWS traffic filtering - - AWS firewall rules - - AWS virtual firewall - - AWS cloud firewall - - AWS network defense diff --git a/analytics/cloud-infra/aws_opensearch_domain.yaml b/analytics/cloud-infra/aws_opensearch_domain.yaml deleted file mode 100755 index b7bac82bd..000000000 --- a/analytics/cloud-infra/aws_opensearch_domain.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: OpenSearch (ElasticSearch) Domains -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::opensearch::domain' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - OpenSearch - - AWS OpenSearch - - ElasticSearch - - AWS search - - AWS ElasticSearch - - Search domain - - AWS data search - - OpenSearch service - - AWS search engine - - Amazon OpenSearch diff --git a/analytics/cloud-infra/aws_opensearchserverless_collection.yaml b/analytics/cloud-infra/aws_opensearchserverless_collection.yaml deleted file mode 100755 index 3715e4ca3..000000000 --- a/analytics/cloud-infra/aws_opensearchserverless_collection.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: OpenSearch (ElasticSearch) Serverless Collection -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::opensearchserverless::collection' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - AWS OpenSearch - - AWS Elasticsearch - - AWS serverless - - AWS search service - - AWS analytics - - OpenSearch - - Elasticsearch AWS - - AWS data search - - AWS serverless search - - AWS managed search diff --git a/analytics/cloud-infra/aws_opsworks_instance.yaml b/analytics/cloud-infra/aws_opsworks_instance.yaml deleted file mode 100755 index b11a91b24..000000000 --- a/analytics/cloud-infra/aws_opsworks_instance.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: OpsWorks Config Management Instance -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::opsworkscm::server' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/aws_organizations_organization.yaml b/analytics/cloud-infra/aws_organizations_organization.yaml deleted file mode 100755 index 320fd989b..000000000 --- a/analytics/cloud-infra/aws_organizations_organization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Organization -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::organizations::organization' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/aws_prometheus_workspace.yaml b/analytics/cloud-infra/aws_prometheus_workspace.yaml deleted file mode 100755 index b19b4649d..000000000 --- a/analytics/cloud-infra/aws_prometheus_workspace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Managed Prometheus Workspace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::amp::workspace' group by 1,2; -status: inactive -tags: - category: - - Managed Services diff --git a/analytics/cloud-infra/aws_redshift_cluster.yaml b/analytics/cloud-infra/aws_redshift_cluster.yaml deleted file mode 100755 index 8c8c28409..000000000 --- a/analytics/cloud-infra/aws_redshift_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Redshift Cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::redshift::cluster' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - AWS Redshift - - Redshift - - AWS data warehouse - - AWS cloud warehouse - - AWS big data - - Redshift database - - AWS Redshift service - - AWS analytics - - AWS SQL warehouse - - AWS scalable warehouse diff --git a/analytics/cloud-infra/aws_redshiftserverless_namespace.yaml b/analytics/cloud-infra/aws_redshiftserverless_namespace.yaml deleted file mode 100755 index 195fb1749..000000000 --- a/analytics/cloud-infra/aws_redshiftserverless_namespace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Redshift (Serverless) Namespace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::redshiftserverless::namespace' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Redshift - - AWS Redshift - - Data warehouse - - AWS serverless - - Amazon Redshift - - Cloud data warehouse - - Redshift namespace - - AWS analytics - - AWS scalable database - - AWS cloud warehouse diff --git a/analytics/cloud-infra/aws_resourcegroups_group.yaml b/analytics/cloud-infra/aws_resourcegroups_group.yaml deleted file mode 100755 index 2c3ef0a4f..000000000 --- a/analytics/cloud-infra/aws_resourcegroups_group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Resource Groups -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::resourcegroups::groups' group by 1,2; -status: inactive -tags: - category: - - Governance diff --git a/analytics/cloud-infra/aws_route53_zone.yaml b/analytics/cloud-infra/aws_route53_zone.yaml deleted file mode 100755 index 8aee41ece..000000000 --- a/analytics/cloud-infra/aws_route53_zone.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Route53 DNS Zone -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::route53::hostedzone' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/aws_route_table.yaml b/analytics/cloud-infra/aws_route_table.yaml deleted file mode 100755 index ec7509042..000000000 --- a/analytics/cloud-infra/aws_route_table.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Network Route Table -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::routetable' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/aws_s3_bucket.yaml b/analytics/cloud-infra/aws_s3_bucket.yaml deleted file mode 100755 index b1a8c9881..000000000 --- a/analytics/cloud-infra/aws_s3_bucket.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: S3 Bucket -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::s3::bucket' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - AWS S3 - - AWS storage - - S3 Bucket - - AWS cloud storage - - AWS object storage - - S3 - - AWS data storage - - AWS scalable storage - - AWS bucket - - AWS file storage diff --git a/analytics/cloud-infra/aws_security_group.yaml b/analytics/cloud-infra/aws_security_group.yaml deleted file mode 100755 index 2d8e7a5eb..000000000 --- a/analytics/cloud-infra/aws_security_group.yaml +++ /dev/null @@ -1,7 +0,0 @@ - -name: (Network) Security Group -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::securitygroup' group by 1,2; -status: inactive -tags: - category: - - Network Security diff --git a/analytics/cloud-infra/aws_ses_domain_identity.yaml b/analytics/cloud-infra/aws_ses_domain_identity.yaml deleted file mode 100755 index c986f9290..000000000 --- a/analytics/cloud-infra/aws_ses_domain_identity.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: SES Email Identity (Legacy) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ses::identity' group by 1,2; -status: inactive -tags: - category: - - End User diff --git a/analytics/cloud-infra/aws_sesv2_email_identity.yaml b/analytics/cloud-infra/aws_sesv2_email_identity.yaml deleted file mode 100755 index 087972c24..000000000 --- a/analytics/cloud-infra/aws_sesv2_email_identity.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: SES (V2) Email Identity -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::sesv2::emailidentity' group by 1,2; -status: active -tags: - category: - - End User - search_terms: - - AWS SES - - AWS email service - - Simple Email Service - - AWS SES V2 - - AWS email - - AWS email identity - - AWS messaging - - AWS email delivery - - AWS email marketing - - AWS transactional email diff --git a/analytics/cloud-infra/aws_subnet.yaml b/analytics/cloud-infra/aws_subnet.yaml deleted file mode 100755 index 2c9413a43..000000000 --- a/analytics/cloud-infra/aws_subnet.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Subnet -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::subnet' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/aws_timestreamwrite_database.yaml b/analytics/cloud-infra/aws_timestreamwrite_database.yaml deleted file mode 100755 index 5687f9419..000000000 --- a/analytics/cloud-infra/aws_timestreamwrite_database.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Timestream Database -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::timestream::database' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - AWS Timestream - - AWS time-series database - - AWS database - - Timestream - - AWS real-time DB - - AWS IoT data - - AWS time-series - - AWS data storage - - AWS streaming data - - AWS scalable database diff --git a/analytics/cloud-infra/aws_vpc.yaml b/analytics/cloud-infra/aws_vpc.yaml deleted file mode 100755 index 7c2df462f..000000000 --- a/analytics/cloud-infra/aws_vpc.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: VPC (Virtual Network) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::vpc' group by 1,2; -status: active -tags: - category: - - Network - search_terms: - - VPC - - AWS VPC - - Amazon VPC - - AWS network - - AWS virtual network - - Amazon virtual private cloud - - AWS cloud network - - Virtual Private Cloud - - AWS private network - - AWS networking diff --git a/analytics/cloud-infra/aws_vpn_gateway.yaml b/analytics/cloud-infra/aws_vpn_gateway.yaml deleted file mode 100755 index 4a9d6a8de..000000000 --- a/analytics/cloud-infra/aws_vpn_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: VPN Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::ec2::vpngateway' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/aws_wafv2_web_acl.yaml b/analytics/cloud-infra/aws_wafv2_web_acl.yaml deleted file mode 100755 index 8c7edae24..000000000 --- a/analytics/cloud-infra/aws_wafv2_web_acl.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- aws_cloud_account -name: Web Firewall (WAF v2) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::wafv2::webacl' group by 1,2; -status: inactive -tags: - category: - - Network Security diff --git a/analytics/cloud-infra/aws_workspaces_workspace.yaml b/analytics/cloud-infra/aws_workspaces_workspace.yaml deleted file mode 100755 index d25cedf12..000000000 --- a/analytics/cloud-infra/aws_workspaces_workspace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- aws_cloud_account -name: Workspace (VDI) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'aws::workspaces::workspace' group by 1,2; -status: active -tags: - category: - - End User - search_terms: - - AWS Workspace - - Amazon Workspace - - AWS VDI - - Amazon VDI - - AWS desktop - - AWS virtual desktop - - AWS cloud desktop - - AWS DaaS - - AWS remote desktop - - Amazon virtual desktop diff --git a/analytics/cloud-infra/azurerm_analysis_services_server.yaml b/analytics/cloud-infra/azurerm_analysis_services_server.yaml deleted file mode 100755 index 75d909943..000000000 --- a/analytics/cloud-infra/azurerm_analysis_services_server.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Analysis Services server -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.analysisservices/servers' group by 1,2; -status: inactive -tags: - category: - - Data Analytics diff --git a/analytics/cloud-infra/azurerm_api_management_service.yaml b/analytics/cloud-infra/azurerm_api_management_service.yaml deleted file mode 100755 index 5e42d286d..000000000 --- a/analytics/cloud-infra/azurerm_api_management_service.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: API Management Service -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.apimanagement/service' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_application_gateway.yaml b/analytics/cloud-infra/azurerm_application_gateway.yaml deleted file mode 100755 index 1a8ac30ec..000000000 --- a/analytics/cloud-infra/azurerm_application_gateway.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Application gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/applicationgateways' group by 1,2; -status: active -tags: - category: - - Network - search_terms: - - Application Gateway - - Azure Gateway - - Azure WAF - - Azure web application firewall - - Azure application proxy - - Azure load balancing - - Azure routing - - Azure web traffic - - Azure application security - - Azure front-end diff --git a/analytics/cloud-infra/azurerm_application_insights.yaml b/analytics/cloud-infra/azurerm_application_insights.yaml deleted file mode 100755 index 17fa3c48a..000000000 --- a/analytics/cloud-infra/azurerm_application_insights.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Application Insights -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.applicationinsights/components' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/azurerm_application_security_group.yaml b/analytics/cloud-infra/azurerm_application_security_group.yaml deleted file mode 100755 index 649ecfc95..000000000 --- a/analytics/cloud-infra/azurerm_application_security_group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Application security group (ASG) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/applicationsecuritygroups' group by 1,2; -status: inactive -tags: - category: - - Network Security diff --git a/analytics/cloud-infra/azurerm_automation_account.yaml b/analytics/cloud-infra/azurerm_automation_account.yaml deleted file mode 100755 index 21637a260..000000000 --- a/analytics/cloud-infra/azurerm_automation_account.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Automation account -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.automation/automationaccounts' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/azurerm_availability_set.yaml b/analytics/cloud-infra/azurerm_availability_set.yaml deleted file mode 100755 index ff3c9d444..000000000 --- a/analytics/cloud-infra/azurerm_availability_set.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Availability set -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/availabilitysets' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_bastion_host.yaml b/analytics/cloud-infra/azurerm_bastion_host.yaml deleted file mode 100755 index d42a1b50b..000000000 --- a/analytics/cloud-infra/azurerm_bastion_host.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Bastion -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/bastionhosts' group by 1,2; -status: inactive -tags: - category: - - Security diff --git a/analytics/cloud-infra/azurerm_batch_account.yaml b/analytics/cloud-infra/azurerm_batch_account.yaml deleted file mode 100755 index 7096997cb..000000000 --- a/analytics/cloud-infra/azurerm_batch_account.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Batch accounts -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.batch/batchaccounts' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_cdn_profile.yaml b/analytics/cloud-infra/azurerm_cdn_profile.yaml deleted file mode 100755 index 6729741d7..000000000 --- a/analytics/cloud-infra/azurerm_cdn_profile.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: CDN profile -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.cdn/profiles' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_cognitive_account.yaml b/analytics/cloud-infra/azurerm_cognitive_account.yaml deleted file mode 100755 index 2acee2e0f..000000000 --- a/analytics/cloud-infra/azurerm_cognitive_account.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cognitive Services -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.cognitiveservices/accounts' group by 1,2; -status: active -tags: - category: - - AI + ML diff --git a/analytics/cloud-infra/azurerm_container_app.yaml b/analytics/cloud-infra/azurerm_container_app.yaml deleted file mode 100755 index 4ee68c172..000000000 --- a/analytics/cloud-infra/azurerm_container_app.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Container apps -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.app/containerapps' group by 1,2; -status: active -tags: - category: - - Containers - search_terms: - - Azure containers - - Container apps - - Azure Kubernetes - - AKS - - Azure microservices - - Container orchestration - - Azure cloud apps - - Microsoft containers - - Azure serverless - - Container service diff --git a/analytics/cloud-infra/azurerm_container_registry.yaml b/analytics/cloud-infra/azurerm_container_registry.yaml deleted file mode 100755 index f12a9428b..000000000 --- a/analytics/cloud-infra/azurerm_container_registry.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Container registry -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.containerregistry/registries' group by 1,2; -status: inactive -tags: - category: - - Containers diff --git a/analytics/cloud-infra/azurerm_cosmosdb_account.yaml b/analytics/cloud-infra/azurerm_cosmosdb_account.yaml deleted file mode 100755 index 9271629ab..000000000 --- a/analytics/cloud-infra/azurerm_cosmosdb_account.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cosmos DB Account -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.documentdb/databaseaccounts' group by 1,2; -status: inactive -tags: - category: - - Database diff --git a/analytics/cloud-infra/azurerm_cosmosdb_postgresql_cluster.yaml b/analytics/cloud-infra/azurerm_cosmosdb_postgresql_cluster.yaml deleted file mode 100755 index 47252f384..000000000 --- a/analytics/cloud-infra/azurerm_cosmosdb_postgresql_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cosmos DB PostgreSQL cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.dbforpostgresql/servers' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Cosmos DB - - Azure PostgreSQL - - Azure NoSQL - - Azure database - - Cosmos DB PostgreSQL - - Azure Cosmos - - Azure scalable database - - PostgreSQL cluster - - Azure multi-model - - Azure cloud database diff --git a/analytics/cloud-infra/azurerm_cosmosdb_sql_database.yaml b/analytics/cloud-infra/azurerm_cosmosdb_sql_database.yaml deleted file mode 100755 index 225a21d7c..000000000 --- a/analytics/cloud-infra/azurerm_cosmosdb_sql_database.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cosmos DB database -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.documentdb/sqldatabases' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Cosmos DB - - Azure Cosmos - - Azure NoSQL - - Azure database - - Azure multi-model DB - - Azure global distribution - - Azure JSON database - - Cosmos database - - Azure scalable DB - - Azure serverless database diff --git a/analytics/cloud-infra/azurerm_dashboard_grafana.yaml b/analytics/cloud-infra/azurerm_dashboard_grafana.yaml deleted file mode 100755 index 96b03f0a2..000000000 --- a/analytics/cloud-infra/azurerm_dashboard_grafana.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Managed Grafana -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.dashboard/grafana' group by 1,2; -status: inactive -tags: - category: - - Managed Services diff --git a/analytics/cloud-infra/azurerm_data_factory.yaml b/analytics/cloud-infra/azurerm_data_factory.yaml deleted file mode 100755 index 16c801b37..000000000 --- a/analytics/cloud-infra/azurerm_data_factory.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Data Factory -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.datafactory/factories' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - Data Factory - - Azure ETL - - Azure integration - - Azure data pipeline - - Azure data processing - - Azure DaaS - - Azure Data Factory service - - Azure data workflow - - Azure orchestration - - Azure analytics diff --git a/analytics/cloud-infra/azurerm_data_protection_backup_vault.yaml b/analytics/cloud-infra/azurerm_data_protection_backup_vault.yaml deleted file mode 100755 index 7bfcd9dc1..000000000 --- a/analytics/cloud-infra/azurerm_data_protection_backup_vault.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Backup Vault -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.dataprotection/backupvaults' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - Azure Backup - - Azure Vault - - Backup Azure - - Azure data protection - - Azure recovery services - - Azure disaster recovery - - Azure storage backup - - Azure cloud backup - - Azure Backup Vault - - Azure data backup diff --git a/analytics/cloud-infra/azurerm_disk_encryption_set.yaml b/analytics/cloud-infra/azurerm_disk_encryption_set.yaml deleted file mode 100755 index 7adc32882..000000000 --- a/analytics/cloud-infra/azurerm_disk_encryption_set.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Disk encryption set -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/diskencryptionsets' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_dns_zone.yaml b/analytics/cloud-infra/azurerm_dns_zone.yaml deleted file mode 100755 index 24ca97f73..000000000 --- a/analytics/cloud-infra/azurerm_dns_zone.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: DNS Zone -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/dnszones' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_eventgrid_domain.yaml b/analytics/cloud-infra/azurerm_eventgrid_domain.yaml deleted file mode 100755 index 141842354..000000000 --- a/analytics/cloud-infra/azurerm_eventgrid_domain.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Event Grid domain -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.eventgrid/domains' group by 1,2; -status: inactive -tags: - category: - - Data Analytics diff --git a/analytics/cloud-infra/azurerm_eventhub_namespace.yaml b/analytics/cloud-infra/azurerm_eventhub_namespace.yaml deleted file mode 100755 index 7f329ebcc..000000000 --- a/analytics/cloud-infra/azurerm_eventhub_namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Event Hubs namespace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.eventhub/namespaces' group by 1,2; -status: inactive -tags: - category: - - Data Analytics diff --git a/analytics/cloud-infra/azurerm_express_route_circuit.yaml b/analytics/cloud-infra/azurerm_express_route_circuit.yaml deleted file mode 100755 index 4cb1a1983..000000000 --- a/analytics/cloud-infra/azurerm_express_route_circuit.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: ExpressRoute circuit -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/expressroutecircuits' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_firewall.yaml b/analytics/cloud-infra/azurerm_firewall.yaml deleted file mode 100755 index 90dd441ba..000000000 --- a/analytics/cloud-infra/azurerm_firewall.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Firewall -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/azurefirewalls' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_frontdoor.yaml b/analytics/cloud-infra/azurerm_frontdoor.yaml deleted file mode 100755 index 470465837..000000000 --- a/analytics/cloud-infra/azurerm_frontdoor.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Front Door (classic) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/frontdoors' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_hdinsight_cluster.yaml b/analytics/cloud-infra/azurerm_hdinsight_cluster.yaml deleted file mode 100755 index 37fde1d67..000000000 --- a/analytics/cloud-infra/azurerm_hdinsight_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: HDInsight cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.hdinsight/clusters' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - HDInsight - - Azure HDInsight - - Azure Hadoop - - Azure Big Data - - HDInsight cluster - - Azure data cluster - - Azure Hive - - Azure Spark - - Azure HBase - - Azure big data processing diff --git a/analytics/cloud-infra/azurerm_image.yaml b/analytics/cloud-infra/azurerm_image.yaml deleted file mode 100755 index 5e760d1e1..000000000 --- a/analytics/cloud-infra/azurerm_image.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: VM Image template -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.virtualmachineimages/imagetemplates' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_iothub.yaml b/analytics/cloud-infra/azurerm_iothub.yaml deleted file mode 100755 index 7e95cad44..000000000 --- a/analytics/cloud-infra/azurerm_iothub.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: IoT hub -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.devices/iothubs' group by 1,2; -status: active -tags: - category: - - IoT - search_terms: - - Azure IoT - - IoT Hub - - Azure IoT service - - Azure IoT devices - - Azure IoT communication - - Azure IoT platform - - Azure device management - - Azure IoT data - - Azure IoT integration - - Azure IoT messaging diff --git a/analytics/cloud-infra/azurerm_key_vault.yaml b/analytics/cloud-infra/azurerm_key_vault.yaml deleted file mode 100755 index a8a3fee9f..000000000 --- a/analytics/cloud-infra/azurerm_key_vault.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Key vault -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.keyvault/vaults' group by 1,2; -status: active -tags: - category: - - Security - search_terms: - - Key Vault - - Azure Key Vault - - Azure security - - Azure secret management - - Azure encryption - - Azure vault - - Azure keys - - Azure secrets - - Azure certificate management - - Azure key management diff --git a/analytics/cloud-infra/azurerm_kubernetes_cluster.yaml b/analytics/cloud-infra/azurerm_kubernetes_cluster.yaml deleted file mode 100755 index 619dc7cc1..000000000 --- a/analytics/cloud-infra/azurerm_kubernetes_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: AKS (Kubernetes) cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.containerservice/managedclusters' group by 1,2; -status: active -tags: - category: - - Containers - search_terms: - - AKS - - Azure Kubernetes - - Kubernetes - - Azure container - - AKS cluster - - Azure cloud - - AKS deployment - - Azure orchestration - - Microsoft AKS - - Azure Kubernetes Service diff --git a/analytics/cloud-infra/azurerm_kusto_cluster.yaml b/analytics/cloud-infra/azurerm_kusto_cluster.yaml deleted file mode 100755 index 9459e3661..000000000 --- a/analytics/cloud-infra/azurerm_kusto_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Data Explorer cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.kusto/clusters' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - Data Explorer - - Azure Data Explorer - - Kusto - - Azure analytics - - Data cluster - - Azure big data - - Azure Kusto - - Azure exploration - - Azure data platform - - Azure real-time analytics diff --git a/analytics/cloud-infra/azurerm_lb.yaml b/analytics/cloud-infra/azurerm_lb.yaml deleted file mode 100755 index ca28fef89..000000000 --- a/analytics/cloud-infra/azurerm_lb.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Load balancer -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/loadbalancers' group by 1,2; -status: active -tags: - category: - - Network - search_terms: - - Azure Load Balancer - - Azure LB - - Azure balancing - - Azure traffic manager - - Azure traffic balancing - - Azure network load balancer - - Azure cloud load balancing - - Azure load management - - Azure network balancer - - Azure traffic distribution diff --git a/analytics/cloud-infra/azurerm_local_network_gateway.yaml b/analytics/cloud-infra/azurerm_local_network_gateway.yaml deleted file mode 100755 index ff9beeab2..000000000 --- a/analytics/cloud-infra/azurerm_local_network_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Local network gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/localnetworkgateways' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/azurerm_log_analytics_workspace.yaml b/analytics/cloud-infra/azurerm_log_analytics_workspace.yaml deleted file mode 100755 index 114e90a43..000000000 --- a/analytics/cloud-infra/azurerm_log_analytics_workspace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Log Analytics workspace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.operationalinsights/workspaces' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/azurerm_machine_learning_workspace.yaml b/analytics/cloud-infra/azurerm_machine_learning_workspace.yaml deleted file mode 100755 index 05d6988f6..000000000 --- a/analytics/cloud-infra/azurerm_machine_learning_workspace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Machine Learning workspace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.machinelearningservices/workspaces' group by 1,2; -status: inactive -tags: - category: - - AI + ML diff --git a/analytics/cloud-infra/azurerm_managed_disk.yaml b/analytics/cloud-infra/azurerm_managed_disk.yaml deleted file mode 100755 index 6f665cd00..000000000 --- a/analytics/cloud-infra/azurerm_managed_disk.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Managed disk -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/disks' group by 1,2; -status: active -tags: - category: - - Compute - search_terms: - - Managed disk - - Azure disk - - Azure storage - - Azure persistent storage - - Azure SSD - - Azure HDD - - Azure data storage - - Azure disk storage - - Azure block storage - - Managed disk Azure diff --git a/analytics/cloud-infra/azurerm_mariadb_server.yaml b/analytics/cloud-infra/azurerm_mariadb_server.yaml deleted file mode 100755 index 05dfa3378..000000000 --- a/analytics/cloud-infra/azurerm_mariadb_server.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: MariaDB server -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.dbformariadb/servers' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Azure MariaDB - - MariaDB - - Azure database - - Azure SQL - - MariaDB server - - Azure relational database - - Microsoft MariaDB - - MariaDB cloud - - Azure MySQL - - Azure SQL service diff --git a/analytics/cloud-infra/azurerm_mssql_elasticpool.yaml b/analytics/cloud-infra/azurerm_mssql_elasticpool.yaml deleted file mode 100755 index 5a0a179da..000000000 --- a/analytics/cloud-infra/azurerm_mssql_elasticpool.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure SQL Elastic Pool -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.sql/servers/elasticpools' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Azure SQL - - SQL Elastic Pool - - Azure database - - Azure SQL Pool - - SQL Server - - Microsoft SQL - - Azure managed SQL - - Azure SQL services - - SQL database - - Azure cloud SQL diff --git a/analytics/cloud-infra/azurerm_mssql_managed_instance.yaml b/analytics/cloud-infra/azurerm_mssql_managed_instance.yaml deleted file mode 100755 index a4c118f14..000000000 --- a/analytics/cloud-infra/azurerm_mssql_managed_instance.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Microsoft SQL Azure Managed Instance -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.sql/managedinstances' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Azure SQL Managed - - Azure managed SQL - - Azure SQL Server - - Microsoft SQL - - SQL Azure - - Azure database - - Azure SQL instance - - Azure cloud SQL - - Managed database - - Azure SQL services diff --git a/analytics/cloud-infra/azurerm_mssql_server.yaml b/analytics/cloud-infra/azurerm_mssql_server.yaml deleted file mode 100755 index 693411ac2..000000000 --- a/analytics/cloud-infra/azurerm_mssql_server.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Microsoft SQL Azure Database Server -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.sql/servers' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - SQL Azure - - Azure SQL Database - - Azure SQL - - Azure Database - - Azure relational database - - Azure SQL Server - - Azure cloud database - - Azure SQL service - - Azure SQL management - - Azure SQL data diff --git a/analytics/cloud-infra/azurerm_mysql_server.yaml b/analytics/cloud-infra/azurerm_mysql_server.yaml deleted file mode 100755 index d358b3b20..000000000 --- a/analytics/cloud-infra/azurerm_mysql_server.yaml +++ /dev/null @@ -1,18 +0,0 @@ -integrationType: -- azure_subscription -name: MySQL Server -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.dbformysql/servers' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Azure MySQL - - MySQL - - Azure database - - Azure relational database - - MySQL server - - Azure SQL - - Microsoft MySQL - - MySQL cloud - - Azure MySQL service diff --git a/analytics/cloud-infra/azurerm_nat_gateway.yaml b/analytics/cloud-infra/azurerm_nat_gateway.yaml deleted file mode 100755 index 544982d15..000000000 --- a/analytics/cloud-infra/azurerm_nat_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: NAT gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/natgateways' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/azurerm_netapp_account.yaml b/analytics/cloud-infra/azurerm_netapp_account.yaml deleted file mode 100755 index 30a388a1d..000000000 --- a/analytics/cloud-infra/azurerm_netapp_account.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: NetApp Account -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.netapp/netappaccounts' group by 1,2; -status: inactive -tags: - category: - - Storage diff --git a/analytics/cloud-infra/azurerm_network_interface.yaml b/analytics/cloud-infra/azurerm_network_interface.yaml deleted file mode 100755 index b46ba30e7..000000000 --- a/analytics/cloud-infra/azurerm_network_interface.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Network interface (NIC) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/networkinterfaces' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_network_security_group.yaml b/analytics/cloud-infra/azurerm_network_security_group.yaml deleted file mode 100755 index 8e49804a7..000000000 --- a/analytics/cloud-infra/azurerm_network_security_group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Network security group (NSG) -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/networksecuritygroups' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_network_watcher.yaml b/analytics/cloud-infra/azurerm_network_watcher.yaml deleted file mode 100755 index 8800f3ec4..000000000 --- a/analytics/cloud-infra/azurerm_network_watcher.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Network Watcher -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/networkwatchers' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_postgresql_server.yaml b/analytics/cloud-infra/azurerm_postgresql_server.yaml deleted file mode 100755 index 5575737b7..000000000 --- a/analytics/cloud-infra/azurerm_postgresql_server.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: PostgreSQL Server -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.dbforpostgresql/servers' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Azure PostgreSQL - - PostgreSQL Azure - - Azure RDBMS - - Azure database - - PostgreSQL database - - Azure SQL - - Azure managed database - - Azure PostgreSQL service - - Azure open-source DB - - Azure PostgreSQL server diff --git a/analytics/cloud-infra/azurerm_private_dns_resolver.yaml b/analytics/cloud-infra/azurerm_private_dns_resolver.yaml deleted file mode 100755 index bd4232503..000000000 --- a/analytics/cloud-infra/azurerm_private_dns_resolver.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: DNS private resolver -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/dnsresolvers' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_private_dns_zone.yaml b/analytics/cloud-infra/azurerm_private_dns_zone.yaml deleted file mode 100755 index 2f3eea95f..000000000 --- a/analytics/cloud-infra/azurerm_private_dns_zone.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: DNS Private zone -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/privatednszones' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_private_endpoint.yaml b/analytics/cloud-infra/azurerm_private_endpoint.yaml deleted file mode 100755 index 529a80f01..000000000 --- a/analytics/cloud-infra/azurerm_private_endpoint.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Private endpoint -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/privateendpoints' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_private_link_service.yaml b/analytics/cloud-infra/azurerm_private_link_service.yaml deleted file mode 100755 index 7836c5b06..000000000 --- a/analytics/cloud-infra/azurerm_private_link_service.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Private Link -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/privatelinkservices' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_public_ip.yaml b/analytics/cloud-infra/azurerm_public_ip.yaml deleted file mode 100755 index 904d8dfdc..000000000 --- a/analytics/cloud-infra/azurerm_public_ip.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Public IP address -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/publicipaddresses' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_purview_account.yaml b/analytics/cloud-infra/azurerm_purview_account.yaml deleted file mode 100755 index 50e2bd49e..000000000 --- a/analytics/cloud-infra/azurerm_purview_account.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Microsoft Purview Account -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.purview/accounts' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/azurerm_recovery_services_vault.yaml b/analytics/cloud-infra/azurerm_recovery_services_vault.yaml deleted file mode 100755 index e4674183e..000000000 --- a/analytics/cloud-infra/azurerm_recovery_services_vault.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Recovery Services vault -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.recoveryservices/vaults' group by 1,2; -status: active -tags: - category: - - Resiliency - search_terms: - - Azure Recovery Services - - Azure backup - - Azure disaster recovery - - Azure vault - - Azure data protection - - Azure recovery - - Azure Recovery Vault - - Azure Backup Vault - - Azure data backup - - Azure business continuity diff --git a/analytics/cloud-infra/azurerm_redis_cache.yaml b/analytics/cloud-infra/azurerm_redis_cache.yaml deleted file mode 100755 index 6c4749371..000000000 --- a/analytics/cloud-infra/azurerm_redis_cache.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cache for Redis instance -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.cache/redis' group by 1,2; -status: active -tags: - category: - - Database - search_terms: - - Azure Redis - - Azure Cache - - Redis Cache - - Azure in-memory - - Azure Redis Cache - - Azure performance - - Azure scalable cache - - Azure database cache - - Azure Redis instance - - Azure Redis service diff --git a/analytics/cloud-infra/azurerm_resource_group.yaml b/analytics/cloud-infra/azurerm_resource_group.yaml deleted file mode 100755 index 42735b587..000000000 --- a/analytics/cloud-infra/azurerm_resource_group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Resource group -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.resources/resourcegroups' group by 1,2; -status: inactive -tags: - category: - - Management and governance diff --git a/analytics/cloud-infra/azurerm_route_table.yaml b/analytics/cloud-infra/azurerm_route_table.yaml deleted file mode 100755 index 219441637..000000000 --- a/analytics/cloud-infra/azurerm_route_table.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Route table -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/routetables' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_search_service.yaml b/analytics/cloud-infra/azurerm_search_service.yaml deleted file mode 100755 index 08370807d..000000000 --- a/analytics/cloud-infra/azurerm_search_service.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cognitive Search -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.search/searchservices' group by 1,2; -status: inactive -tags: - category: - - AI + ML diff --git a/analytics/cloud-infra/azurerm_service_fabric_cluster.yaml b/analytics/cloud-infra/azurerm_service_fabric_cluster.yaml deleted file mode 100755 index 40ecb4c18..000000000 --- a/analytics/cloud-infra/azurerm_service_fabric_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Service Fabric cluster -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.servicefabric/clusters' group by 1,2; -status: active -tags: - category: - - Containers - search_terms: - - Service Fabric - - Azure Fabric - - Azure microservices - - Cluster management - - Azure cloud services - - Azure orchestrator - - Fabric cluster - - Azure scalable services - - Microsoft Fabric - - Azure application management diff --git a/analytics/cloud-infra/azurerm_signalr_service.yaml b/analytics/cloud-infra/azurerm_signalr_service.yaml deleted file mode 100755 index 9f972541a..000000000 --- a/analytics/cloud-infra/azurerm_signalr_service.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: SignalR -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.signalrservice/signalr' group by 1,2; -status: inactive -tags: - category: - - DevOps diff --git a/analytics/cloud-infra/azurerm_snapshot.yaml b/analytics/cloud-infra/azurerm_snapshot.yaml deleted file mode 100755 index cb4007f24..000000000 --- a/analytics/cloud-infra/azurerm_snapshot.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Snapshot -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/snapshots' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_ssh_public_key.yaml b/analytics/cloud-infra/azurerm_ssh_public_key.yaml deleted file mode 100755 index 67cd94a60..000000000 --- a/analytics/cloud-infra/azurerm_ssh_public_key.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: SSH Public Key -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/sshpublickeys' group by 1,2; -status: inactive -tags: - category: - - Security diff --git a/analytics/cloud-infra/azurerm_storage_account.yaml b/analytics/cloud-infra/azurerm_storage_account.yaml deleted file mode 100755 index 8a2bb60b8..000000000 --- a/analytics/cloud-infra/azurerm_storage_account.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Storage account -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.storage/storageaccounts' group by 1,2; -status: active -tags: - category: - - Storage - search_terms: - - Azure Storage - - Azure cloud storage - - Azure blob storage - - Azure file storage - - Azure account - - Azure data storage - - Azure durable storage - - Azure storage services - - Azure scalable storage - - Azure storage account diff --git a/analytics/cloud-infra/azurerm_stream_analytics_cluster.yaml b/analytics/cloud-infra/azurerm_stream_analytics_cluster.yaml deleted file mode 100755 index dd5f39329..000000000 --- a/analytics/cloud-infra/azurerm_stream_analytics_cluster.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Stream Analytics -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.streamanalytics/cluster' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - Stream Analytics - - Azure streaming - - Azure real-time analytics - - Azure data stream - - Azure event processing - - Azure Stream Analytics service - - Azure IoT stream - - Azure analytics - - Stream processing Azure - - Azure live data diff --git a/analytics/cloud-infra/azurerm_subnet.yaml b/analytics/cloud-infra/azurerm_subnet.yaml deleted file mode 100755 index 050ee13b4..000000000 --- a/analytics/cloud-infra/azurerm_subnet.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual network subnet -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/virtualnetworks/subnets' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_synapse_workspace.yaml b/analytics/cloud-infra/azurerm_synapse_workspace.yaml deleted file mode 100755 index 693b4f77d..000000000 --- a/analytics/cloud-infra/azurerm_synapse_workspace.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Synapse Analytics Workspaces -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.synapse/workspaces' group by 1,2; -status: active -tags: - category: - - Data Analytics - search_terms: - - Azure Synapse - - Synapse Analytics - - Azure data - - Azure analytics - - Data warehouse - - Azure BI - - Big data - - Azure workspace - - Microsoft Synapse - - Azure cloud analytics diff --git a/analytics/cloud-infra/azurerm_traffic_manager_profile.yaml b/analytics/cloud-infra/azurerm_traffic_manager_profile.yaml deleted file mode 100755 index d12299412..000000000 --- a/analytics/cloud-infra/azurerm_traffic_manager_profile.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Traffic Manager profile -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/trafficmanagerprofiles' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_virtual_desktop_host_pool.yaml b/analytics/cloud-infra/azurerm_virtual_desktop_host_pool.yaml deleted file mode 100755 index 42a025266..000000000 --- a/analytics/cloud-infra/azurerm_virtual_desktop_host_pool.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual desktop host pool -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.desktopvirtualization/hostpools' group by 1,2; -status: inactive -tags: - category: - - End User diff --git a/analytics/cloud-infra/azurerm_virtual_desktop_workspace.yaml b/analytics/cloud-infra/azurerm_virtual_desktop_workspace.yaml deleted file mode 100755 index 1c9306eb6..000000000 --- a/analytics/cloud-infra/azurerm_virtual_desktop_workspace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual desktop workspace -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.desktopvirtualization/workspaces' group by 1,2; -status: inactive -tags: - category: - - End User diff --git a/analytics/cloud-infra/azurerm_virtual_hub.yaml b/analytics/cloud-infra/azurerm_virtual_hub.yaml deleted file mode 100755 index 5a895a58e..000000000 --- a/analytics/cloud-infra/azurerm_virtual_hub.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: VirtualHub Route server -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/virtualhubs' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_virtual_machine.yaml b/analytics/cloud-infra/azurerm_virtual_machine.yaml deleted file mode 100755 index 1c626bda0..000000000 --- a/analytics/cloud-infra/azurerm_virtual_machine.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual machine -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/virtualmachines' group by 1,2; -status: active -tags: - category: - - Compute - search_terms: - - Azure VM - - Azure Virtual Machine - - Azure compute - - Azure services - - Azure cloud VM - - Microsoft Azure VM - - Azure instance - - Azure virtual server - - Azure computing - - Azure server diff --git a/analytics/cloud-infra/azurerm_virtual_machine_scale_set.yaml b/analytics/cloud-infra/azurerm_virtual_machine_scale_set.yaml deleted file mode 100755 index 1b34f2f79..000000000 --- a/analytics/cloud-infra/azurerm_virtual_machine_scale_set.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual machine scale set -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.compute/virtualmachinescalesets' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_virtual_network.yaml b/analytics/cloud-infra/azurerm_virtual_network.yaml deleted file mode 100755 index b55dd4b29..000000000 --- a/analytics/cloud-infra/azurerm_virtual_network.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual network -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/virtualnetworks' group by 1,2; -status: active -tags: - category: - - Network - search_terms: - - Azure VNet - - Azure network - - Azure networking - - Azure virtual network - - Microsoft Azure network - - Azure cloud network - - Azure VPN - - Azure private network - - Azure network service - - Azure VPC diff --git a/analytics/cloud-infra/azurerm_virtual_network_gateway.yaml b/analytics/cloud-infra/azurerm_virtual_network_gateway.yaml deleted file mode 100755 index e4e40467f..000000000 --- a/analytics/cloud-infra/azurerm_virtual_network_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual network gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/virtualnetworkgateways' group by 1,2; -status: inactive -tags: - category: - - Network Gateways diff --git a/analytics/cloud-infra/azurerm_virtual_wan.yaml b/analytics/cloud-infra/azurerm_virtual_wan.yaml deleted file mode 100755 index 92021e0ae..000000000 --- a/analytics/cloud-infra/azurerm_virtual_wan.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual WAN -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/virtualwans' group by 1,2; -status: inactive -tags: - category: - - Network diff --git a/analytics/cloud-infra/azurerm_vpn_gateway.yaml b/analytics/cloud-infra/azurerm_vpn_gateway.yaml deleted file mode 100755 index 597afdf3f..000000000 --- a/analytics/cloud-infra/azurerm_vpn_gateway.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: VPN Gateway -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/vpngateways' group by 1,2; -status: inactive -tags: - category: - - Security diff --git a/analytics/cloud-infra/azurerm_web_application_firewall_policy.yaml b/analytics/cloud-infra/azurerm_web_application_firewall_policy.yaml deleted file mode 100755 index 945f822bd..000000000 --- a/analytics/cloud-infra/azurerm_web_application_firewall_policy.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Web Application Firewall (WAF) policy -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.network/firewallpolicies' group by 1,2; -status: inactive -tags: - category: - - Security diff --git a/analytics/cloud-infra/azurerm_web_staticsite.yaml b/analytics/cloud-infra/azurerm_web_staticsite.yaml deleted file mode 100755 index cae73e2a4..000000000 --- a/analytics/cloud-infra/azurerm_web_staticsite.yaml +++ /dev/null @@ -1,8 +0,0 @@ -integrationType: -- azure_subscription -name: Static web app -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.web/staticsites' group by 1,2; -status: inactive -tags: - category: - - Compute diff --git a/analytics/cloud-infra/azurerm_webapp.yaml b/analytics/cloud-infra/azurerm_webapp.yaml deleted file mode 100755 index 850fdac39..000000000 --- a/analytics/cloud-infra/azurerm_webapp.yaml +++ /dev/null @@ -1,19 +0,0 @@ -integrationType: -- azure_subscription -name: Web app -query: select connection_id, region, count(*) from platform_lookup where resource_type = 'microsoft.web/sites' group by 1,2; -status: active -tags: - category: - - PaaS - search_terms: - - Azure App Service - - Azure Web App - - Azure web application - - Azure hosting - - Azure PaaS - - Web App Azure - - Azure website - - Azure cloud app - - Azure application service - - Azure web deployment diff --git a/analytics/cloud-spend/advanced_data_security.yaml b/analytics/cloud-spend/advanced_data_security.yaml deleted file mode 100755 index d5263ac62..000000000 --- a/analytics/cloud-spend/advanced_data_security.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Advanced Data Security -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Advanced Data Security' group by 1,2; -status: active -tables: -- Advanced Data Security -tags: - category: - - Security diff --git a/analytics/cloud-spend/advanced_threat_protection.yaml b/analytics/cloud-spend/advanced_threat_protection.yaml deleted file mode 100755 index 45d3ea864..000000000 --- a/analytics/cloud-spend/advanced_threat_protection.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Advanced Threat Protection -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Advanced Threat Protection' group by 1,2; -status: active -tables: -- Advanced Threat Protection -tags: - category: - - Security diff --git a/analytics/cloud-spend/alexa_for_business.yaml b/analytics/cloud-spend/alexa_for_business.yaml deleted file mode 100755 index 2135cf6ad..000000000 --- a/analytics/cloud-spend/alexa_for_business.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Alexa for Business -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Alexa for Business' group by 1,2; -status: active -tables: -- Alexa for Business -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_api_gateway.yaml b/analytics/cloud-spend/amazon_api_gateway.yaml deleted file mode 100755 index a0b106817..000000000 --- a/analytics/cloud-spend/amazon_api_gateway.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon API Gateway -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon API Gateway' group by 1,2; -status: active -tables: -- Amazon API Gateway -tags: - category: - - Network diff --git a/analytics/cloud-spend/amazon_appstream.yaml b/analytics/cloud-spend/amazon_appstream.yaml deleted file mode 100755 index 277cab098..000000000 --- a/analytics/cloud-spend/amazon_appstream.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon AppStream -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon AppStream' group by 1,2; -status: active -tables: -- Amazon AppStream -tags: - category: - - Devices & End User diff --git a/analytics/cloud-spend/amazon_athena.yaml b/analytics/cloud-spend/amazon_athena.yaml deleted file mode 100755 index 77596ac1b..000000000 --- a/analytics/cloud-spend/amazon_athena.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Athena -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Athena' group by 1,2; -status: active -tables: -- Amazon Athena -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_chime_features.yaml b/analytics/cloud-spend/amazon_chime_features.yaml deleted file mode 100755 index 7eca9aee7..000000000 --- a/analytics/cloud-spend/amazon_chime_features.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Chime Features -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Chime Features' group by 1,2; -status: active -tables: -- Amazon Chime Features -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_chime_voice_connector_a_service_sold_by_amcs_llc.yaml b/analytics/cloud-spend/amazon_chime_voice_connector_a_service_sold_by_amcs_llc.yaml deleted file mode 100755 index 92461e204..000000000 --- a/analytics/cloud-spend/amazon_chime_voice_connector_a_service_sold_by_amcs_llc.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Chime Voice Connector a service sold by AMCS LLC -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Chime Voice Connector a service sold by AMCS LLC' group by 1,2; -status: active -tables: -- Amazon Chime Voice Connector a service sold by AMCS LLC -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_cloud_directory.yaml b/analytics/cloud-spend/amazon_cloud_directory.yaml deleted file mode 100755 index f7c5de3d4..000000000 --- a/analytics/cloud-spend/amazon_cloud_directory.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Cloud Directory -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Cloud Directory' group by 1,2; -status: active -tables: -- Amazon Cloud Directory -tags: - category: - - Data Management diff --git a/analytics/cloud-spend/amazon_cloudfront.yaml b/analytics/cloud-spend/amazon_cloudfront.yaml deleted file mode 100755 index 94a6d36ae..000000000 --- a/analytics/cloud-spend/amazon_cloudfront.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon CloudFront -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon CloudFront' group by 1,2; -status: active -tables: -- Amazon CloudFront -tags: - category: - - Network diff --git a/analytics/cloud-spend/amazon_cloudsearch.yaml b/analytics/cloud-spend/amazon_cloudsearch.yaml deleted file mode 100755 index 2bddf55b4..000000000 --- a/analytics/cloud-spend/amazon_cloudsearch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon CloudSearch -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon CloudSearch' group by 1,2; -status: active -tables: -- Amazon CloudSearch -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_cognito.yaml b/analytics/cloud-spend/amazon_cognito.yaml deleted file mode 100755 index 980f2ae3d..000000000 --- a/analytics/cloud-spend/amazon_cognito.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Cognito -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Cognito' group by 1,2; -status: active -tables: -- Amazon Cognito -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_comprehend.yaml b/analytics/cloud-spend/amazon_comprehend.yaml deleted file mode 100755 index db1ad03c4..000000000 --- a/analytics/cloud-spend/amazon_comprehend.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Comprehend -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Comprehend' group by 1,2; -status: active -tables: -- Amazon Comprehend -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_connect.yaml b/analytics/cloud-spend/amazon_connect.yaml deleted file mode 100755 index d76d78c0a..000000000 --- a/analytics/cloud-spend/amazon_connect.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Connect -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Connect' group by 1,2; -status: active -tables: -- Amazon Connect -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/amazon_detective.yaml b/analytics/cloud-spend/amazon_detective.yaml deleted file mode 100755 index a66bcccc0..000000000 --- a/analytics/cloud-spend/amazon_detective.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Detective -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Detective' group by 1,2; -status: active -tables: -- Amazon Detective -tags: - category: - - Security diff --git a/analytics/cloud-spend/amazon_devops_guru.yaml b/analytics/cloud-spend/amazon_devops_guru.yaml deleted file mode 100755 index 0c92983bd..000000000 --- a/analytics/cloud-spend/amazon_devops_guru.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon DevOps Guru -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon DevOps Guru' group by 1,2; -status: active -tables: -- Amazon DevOps Guru -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/amazon_documentdb_(with_mongodb_compatibility).yaml b/analytics/cloud-spend/amazon_documentdb_(with_mongodb_compatibility).yaml deleted file mode 100755 index 8abcf03cf..000000000 --- a/analytics/cloud-spend/amazon_documentdb_(with_mongodb_compatibility).yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon DocumentDB (with MongoDB compatibility) -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon DocumentDB (with MongoDB compatibility)' group by 1,2; -status: active -tables: -- Amazon DocumentDB (with MongoDB compatibility) -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_dynamodb.yaml b/analytics/cloud-spend/amazon_dynamodb.yaml deleted file mode 100755 index 371042471..000000000 --- a/analytics/cloud-spend/amazon_dynamodb.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon DynamoDB -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon DynamoDB' group by 1,2; -status: active -tables: -- Amazon DynamoDB -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_ec2_container_registry_(ecr).yaml b/analytics/cloud-spend/amazon_ec2_container_registry_(ecr).yaml deleted file mode 100755 index 82f412532..000000000 --- a/analytics/cloud-spend/amazon_ec2_container_registry_(ecr).yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon EC2 Container Registry (ECR) -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon EC2 Container Registry (ECR)' group by 1,2; -status: active -tables: -- Amazon EC2 Container Registry (ECR) -tags: - category: - - Containers diff --git a/analytics/cloud-spend/amazon_elastic_compute_cloud___compute.yaml b/analytics/cloud-spend/amazon_elastic_compute_cloud___compute.yaml deleted file mode 100755 index adbe245e3..000000000 --- a/analytics/cloud-spend/amazon_elastic_compute_cloud___compute.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic Compute Cloud - Compute -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic Compute Cloud - Compute' group by 1,2; -status: active -tables: -- Amazon Elastic Compute Cloud - Compute -tags: - category: - - Compute diff --git a/analytics/cloud-spend/amazon_elastic_container_registry_public.yaml b/analytics/cloud-spend/amazon_elastic_container_registry_public.yaml deleted file mode 100755 index a763a5f91..000000000 --- a/analytics/cloud-spend/amazon_elastic_container_registry_public.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic Container Registry Public -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic Container Registry Public' group by 1,2; -status: active -tables: -- Amazon Elastic Container Registry Public -tags: - category: - - Containers diff --git a/analytics/cloud-spend/amazon_elastic_container_service.yaml b/analytics/cloud-spend/amazon_elastic_container_service.yaml deleted file mode 100755 index 6c5aa5a04..000000000 --- a/analytics/cloud-spend/amazon_elastic_container_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic Container Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic Container Service' group by 1,2; -status: active -tables: -- Amazon Elastic Container Service -tags: - category: - - Containers diff --git a/analytics/cloud-spend/amazon_elastic_container_service_for_kubernetes.yaml b/analytics/cloud-spend/amazon_elastic_container_service_for_kubernetes.yaml deleted file mode 100755 index 4fe3764dc..000000000 --- a/analytics/cloud-spend/amazon_elastic_container_service_for_kubernetes.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic Container Service for Kubernetes -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic Container Service for Kubernetes' group by 1,2; -status: active -tables: -- Amazon Elastic Container Service for Kubernetes -tags: - category: - - Containers diff --git a/analytics/cloud-spend/amazon_elastic_file_system.yaml b/analytics/cloud-spend/amazon_elastic_file_system.yaml deleted file mode 100755 index 9f7fd10ba..000000000 --- a/analytics/cloud-spend/amazon_elastic_file_system.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic File System -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic File System' group by 1,2; -status: active -tables: -- Amazon Elastic File System -tags: - category: - - Storage diff --git a/analytics/cloud-spend/amazon_elastic_load_balancing.yaml b/analytics/cloud-spend/amazon_elastic_load_balancing.yaml deleted file mode 100755 index 5ddfab87c..000000000 --- a/analytics/cloud-spend/amazon_elastic_load_balancing.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic Load Balancing -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic Load Balancing' group by 1,2; -status: active -tables: -- Amazon Elastic Load Balancing -tags: - category: - - Network diff --git a/analytics/cloud-spend/amazon_elastic_mapreduce.yaml b/analytics/cloud-spend/amazon_elastic_mapreduce.yaml deleted file mode 100755 index 4ac16c50f..000000000 --- a/analytics/cloud-spend/amazon_elastic_mapreduce.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Elastic MapReduce -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Elastic MapReduce' group by 1,2; -status: active -tables: -- Amazon Elastic MapReduce -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_elasticache.yaml b/analytics/cloud-spend/amazon_elasticache.yaml deleted file mode 100755 index b8a3a2e0c..000000000 --- a/analytics/cloud-spend/amazon_elasticache.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon ElastiCache -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon ElastiCache' group by 1,2; -status: active -tables: -- Amazon ElastiCache -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_fsx.yaml b/analytics/cloud-spend/amazon_fsx.yaml deleted file mode 100755 index bc804e22a..000000000 --- a/analytics/cloud-spend/amazon_fsx.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon FSx -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon FSx' group by 1,2; -status: active -tables: -- Amazon FSx -tags: - category: - - Storage diff --git a/analytics/cloud-spend/amazon_glacier.yaml b/analytics/cloud-spend/amazon_glacier.yaml deleted file mode 100755 index 17eb80603..000000000 --- a/analytics/cloud-spend/amazon_glacier.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Glacier -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Glacier' group by 1,2; -status: active -tables: -- Amazon Glacier -tags: - category: - - Storage diff --git a/analytics/cloud-spend/amazon_guardduty.yaml b/analytics/cloud-spend/amazon_guardduty.yaml deleted file mode 100755 index 67c84bfa1..000000000 --- a/analytics/cloud-spend/amazon_guardduty.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon GuardDuty -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon GuardDuty' group by 1,2; -status: active -tables: -- Amazon GuardDuty -tags: - category: - - Security diff --git a/analytics/cloud-spend/amazon_honeycode.yaml b/analytics/cloud-spend/amazon_honeycode.yaml deleted file mode 100755 index 23b2df97d..000000000 --- a/analytics/cloud-spend/amazon_honeycode.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Honeycode -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Honeycode' group by 1,2; -status: active -tables: -- Amazon Honeycode -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/amazon_inspector.yaml b/analytics/cloud-spend/amazon_inspector.yaml deleted file mode 100755 index 81e233829..000000000 --- a/analytics/cloud-spend/amazon_inspector.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Inspector -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Inspector' group by 1,2; -status: active -tables: -- Amazon Inspector -tags: - category: - - Security diff --git a/analytics/cloud-spend/amazon_kendra.yaml b/analytics/cloud-spend/amazon_kendra.yaml deleted file mode 100755 index ecd3ee352..000000000 --- a/analytics/cloud-spend/amazon_kendra.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Kendra -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Kendra' group by 1,2; -status: active -tables: -- Amazon Kendra -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_kinesis.yaml b/analytics/cloud-spend/amazon_kinesis.yaml deleted file mode 100755 index 278ed70dc..000000000 --- a/analytics/cloud-spend/amazon_kinesis.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Kinesis -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Kinesis' group by 1,2; -status: active -tables: -- Amazon Kinesis -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_kinesis_analytics.yaml b/analytics/cloud-spend/amazon_kinesis_analytics.yaml deleted file mode 100755 index 9f6830cd7..000000000 --- a/analytics/cloud-spend/amazon_kinesis_analytics.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Kinesis Analytics -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Kinesis Analytics' group by 1,2; -status: active -tables: -- Amazon Kinesis Analytics -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_kinesis_firehose.yaml b/analytics/cloud-spend/amazon_kinesis_firehose.yaml deleted file mode 100755 index 173e48664..000000000 --- a/analytics/cloud-spend/amazon_kinesis_firehose.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Kinesis Firehose -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Kinesis Firehose' group by 1,2; -status: active -tables: -- Amazon Kinesis Firehose -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_kinesis_video_streams.yaml b/analytics/cloud-spend/amazon_kinesis_video_streams.yaml deleted file mode 100755 index a22bed0e6..000000000 --- a/analytics/cloud-spend/amazon_kinesis_video_streams.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Kinesis Video Streams -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Kinesis Video Streams' group by 1,2; -status: active -tables: -- Amazon Kinesis Video Streams -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_lex.yaml b/analytics/cloud-spend/amazon_lex.yaml deleted file mode 100755 index 8c8eb752d..000000000 --- a/analytics/cloud-spend/amazon_lex.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Lex -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Lex' group by 1,2; -status: active -tables: -- Amazon Lex -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/amazon_lightsail.yaml b/analytics/cloud-spend/amazon_lightsail.yaml deleted file mode 100755 index baf0962d1..000000000 --- a/analytics/cloud-spend/amazon_lightsail.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Lightsail -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Lightsail' group by 1,2; -status: active -tables: -- Amazon Lightsail -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_location_service.yaml b/analytics/cloud-spend/amazon_location_service.yaml deleted file mode 100755 index f1a45f950..000000000 --- a/analytics/cloud-spend/amazon_location_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Location Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Location Service' group by 1,2; -status: active -tables: -- Amazon Location Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_macie.yaml b/analytics/cloud-spend/amazon_macie.yaml deleted file mode 100755 index fe6579693..000000000 --- a/analytics/cloud-spend/amazon_macie.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Macie -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Macie' group by 1,2; -status: active -tables: -- Amazon Macie -tags: - category: - - Security diff --git a/analytics/cloud-spend/amazon_managed_grafana.yaml b/analytics/cloud-spend/amazon_managed_grafana.yaml deleted file mode 100755 index 51a233c86..000000000 --- a/analytics/cloud-spend/amazon_managed_grafana.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Managed Grafana -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Managed Grafana' group by 1,2; -status: active -tables: -- Amazon Managed Grafana -tags: - category: - - Data + Analytics diff --git a/analytics/cloud-spend/amazon_managed_streaming_for_apache_kafka.yaml b/analytics/cloud-spend/amazon_managed_streaming_for_apache_kafka.yaml deleted file mode 100755 index 53181141f..000000000 --- a/analytics/cloud-spend/amazon_managed_streaming_for_apache_kafka.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Managed Streaming for Apache Kafka -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Managed Streaming for Apache Kafka' group by 1,2; -status: active -tables: -- Amazon Managed Streaming for Apache Kafka -tags: - category: - - Data + Analytics diff --git a/analytics/cloud-spend/amazon_managed_workflows_for_apache_airflow.yaml b/analytics/cloud-spend/amazon_managed_workflows_for_apache_airflow.yaml deleted file mode 100755 index 81ded2207..000000000 --- a/analytics/cloud-spend/amazon_managed_workflows_for_apache_airflow.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Managed Workflows for Apache Airflow -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Managed Workflows for Apache Airflow' group by 1,2; -status: active -tables: -- Amazon Managed Workflows for Apache Airflow -tags: - category: - - Data + Analytics diff --git a/analytics/cloud-spend/amazon_memorydb.yaml b/analytics/cloud-spend/amazon_memorydb.yaml deleted file mode 100755 index 6e6614d20..000000000 --- a/analytics/cloud-spend/amazon_memorydb.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon MemoryDB -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon MemoryDB' group by 1,2; -status: active -tables: -- Amazon MemoryDB -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_mq.yaml b/analytics/cloud-spend/amazon_mq.yaml deleted file mode 100755 index daae55b35..000000000 --- a/analytics/cloud-spend/amazon_mq.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon MQ -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon MQ' group by 1,2; -status: active -tables: -- Amazon MQ -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_neptune.yaml b/analytics/cloud-spend/amazon_neptune.yaml deleted file mode 100755 index 35274c1c1..000000000 --- a/analytics/cloud-spend/amazon_neptune.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Neptune -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Neptune' group by 1,2; -status: active -tables: -- Amazon Neptune -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_opensearch_service.yaml b/analytics/cloud-spend/amazon_opensearch_service.yaml deleted file mode 100755 index fec0a19ae..000000000 --- a/analytics/cloud-spend/amazon_opensearch_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon OpenSearch Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon OpenSearch Service' group by 1,2; -status: active -tables: -- Amazon OpenSearch Service -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_pinpoint.yaml b/analytics/cloud-spend/amazon_pinpoint.yaml deleted file mode 100755 index 415c5eec3..000000000 --- a/analytics/cloud-spend/amazon_pinpoint.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Pinpoint -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Pinpoint' group by 1,2; -status: active -tables: -- Amazon Pinpoint -tags: - category: - - Messaging diff --git a/analytics/cloud-spend/amazon_polly.yaml b/analytics/cloud-spend/amazon_polly.yaml deleted file mode 100755 index dcba3dd27..000000000 --- a/analytics/cloud-spend/amazon_polly.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Polly -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Polly' group by 1,2; -status: active -tables: -- Amazon Polly -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_quantum_ledger_database.yaml b/analytics/cloud-spend/amazon_quantum_ledger_database.yaml deleted file mode 100755 index 45799c535..000000000 --- a/analytics/cloud-spend/amazon_quantum_ledger_database.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Quantum Ledger Database -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Quantum Ledger Database' group by 1,2; -status: active -tables: -- Amazon Quantum Ledger Database -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_quicksight.yaml b/analytics/cloud-spend/amazon_quicksight.yaml deleted file mode 100755 index bd8ddfff9..000000000 --- a/analytics/cloud-spend/amazon_quicksight.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon QuickSight -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon QuickSight' group by 1,2; -status: active -tables: -- Amazon QuickSight -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_redshift.yaml b/analytics/cloud-spend/amazon_redshift.yaml deleted file mode 100755 index b9415504c..000000000 --- a/analytics/cloud-spend/amazon_redshift.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Redshift -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Redshift' group by 1,2; -status: active -tables: -- Amazon Redshift -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_registrar.yaml b/analytics/cloud-spend/amazon_registrar.yaml deleted file mode 100755 index c3300d626..000000000 --- a/analytics/cloud-spend/amazon_registrar.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Registrar -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Registrar' group by 1,2; -status: active -tables: -- Amazon Registrar -tags: - category: - - Network diff --git a/analytics/cloud-spend/amazon_rekognition.yaml b/analytics/cloud-spend/amazon_rekognition.yaml deleted file mode 100755 index 1e4f4b88c..000000000 --- a/analytics/cloud-spend/amazon_rekognition.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Rekognition -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Rekognition' group by 1,2; -status: active -tables: -- Amazon Rekognition -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/amazon_relational_database_service.yaml b/analytics/cloud-spend/amazon_relational_database_service.yaml deleted file mode 100755 index 7e67ce278..000000000 --- a/analytics/cloud-spend/amazon_relational_database_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Relational Database Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Relational Database Service' group by 1,2; -status: active -tables: -- Amazon Relational Database Service -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_route_53.yaml b/analytics/cloud-spend/amazon_route_53.yaml deleted file mode 100755 index e4db11672..000000000 --- a/analytics/cloud-spend/amazon_route_53.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Route 53 -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Route 53' group by 1,2; -status: active -tables: -- Amazon Route 53 -tags: - category: - - Network diff --git a/analytics/cloud-spend/amazon_sagemaker.yaml b/analytics/cloud-spend/amazon_sagemaker.yaml deleted file mode 100755 index 0262e468d..000000000 --- a/analytics/cloud-spend/amazon_sagemaker.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon SageMaker -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon SageMaker' group by 1,2; -status: active -tables: -- Amazon SageMaker -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_simple_email_service.yaml b/analytics/cloud-spend/amazon_simple_email_service.yaml deleted file mode 100755 index d52f10e4b..000000000 --- a/analytics/cloud-spend/amazon_simple_email_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Simple Email Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Simple Email Service' group by 1,2; -status: active -tables: -- Amazon Simple Email Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_simple_notification_service.yaml b/analytics/cloud-spend/amazon_simple_notification_service.yaml deleted file mode 100755 index 7575304e1..000000000 --- a/analytics/cloud-spend/amazon_simple_notification_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Simple Notification Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Simple Notification Service' group by 1,2; -status: active -tables: -- Amazon Simple Notification Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_simple_queue_service.yaml b/analytics/cloud-spend/amazon_simple_queue_service.yaml deleted file mode 100755 index 1b0657a88..000000000 --- a/analytics/cloud-spend/amazon_simple_queue_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Simple Queue Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Simple Queue Service' group by 1,2; -status: active -tables: -- Amazon Simple Queue Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_simple_storage_service.yaml b/analytics/cloud-spend/amazon_simple_storage_service.yaml deleted file mode 100755 index f981c4d97..000000000 --- a/analytics/cloud-spend/amazon_simple_storage_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Simple Storage Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Simple Storage Service' group by 1,2; -status: active -tables: -- Amazon Simple Storage Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_simple_workflow_service.yaml b/analytics/cloud-spend/amazon_simple_workflow_service.yaml deleted file mode 100755 index d3cf10ea5..000000000 --- a/analytics/cloud-spend/amazon_simple_workflow_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Simple Workflow Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Simple Workflow Service' group by 1,2; -status: active -tables: -- Amazon Simple Workflow Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/amazon_simpledb.yaml b/analytics/cloud-spend/amazon_simpledb.yaml deleted file mode 100755 index c0d3c086d..000000000 --- a/analytics/cloud-spend/amazon_simpledb.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon SimpleDB -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon SimpleDB' group by 1,2; -status: active -tables: -- Amazon SimpleDB -tags: - category: - - Database diff --git a/analytics/cloud-spend/amazon_sumerian.yaml b/analytics/cloud-spend/amazon_sumerian.yaml deleted file mode 100755 index b722eb2fa..000000000 --- a/analytics/cloud-spend/amazon_sumerian.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Sumerian -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Sumerian' group by 1,2; -status: active -tables: -- Amazon Sumerian -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_textract.yaml b/analytics/cloud-spend/amazon_textract.yaml deleted file mode 100755 index 46089968d..000000000 --- a/analytics/cloud-spend/amazon_textract.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Textract -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Textract' group by 1,2; -status: active -tables: -- Amazon Textract -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_transcribe.yaml b/analytics/cloud-spend/amazon_transcribe.yaml deleted file mode 100755 index 02b355c23..000000000 --- a/analytics/cloud-spend/amazon_transcribe.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Transcribe -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Transcribe' group by 1,2; -status: active -tables: -- Amazon Transcribe -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/amazon_translate.yaml b/analytics/cloud-spend/amazon_translate.yaml deleted file mode 100755 index 83f0c1acf..000000000 --- a/analytics/cloud-spend/amazon_translate.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Translate -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Translate' group by 1,2; -status: active -tables: -- Amazon Translate -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/amazon_virtual_private_cloud.yaml b/analytics/cloud-spend/amazon_virtual_private_cloud.yaml deleted file mode 100755 index 8a92667d4..000000000 --- a/analytics/cloud-spend/amazon_virtual_private_cloud.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon Virtual Private Cloud -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon Virtual Private Cloud' group by 1,2; -status: active -tables: -- Amazon Virtual Private Cloud -tags: - category: - - Network diff --git a/analytics/cloud-spend/amazon_workdocs.yaml b/analytics/cloud-spend/amazon_workdocs.yaml deleted file mode 100755 index 73e3fcea6..000000000 --- a/analytics/cloud-spend/amazon_workdocs.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon WorkDocs -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon WorkDocs' group by 1,2; -status: active -tables: -- Amazon WorkDocs -tags: - category: - - End User diff --git a/analytics/cloud-spend/amazon_workspaces.yaml b/analytics/cloud-spend/amazon_workspaces.yaml deleted file mode 100755 index 66823f7dc..000000000 --- a/analytics/cloud-spend/amazon_workspaces.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon WorkSpaces -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon WorkSpaces' group by 1,2; -status: active -tables: -- Amazon WorkSpaces -tags: - category: - - End User diff --git a/analytics/cloud-spend/amazon_workspaces_application_manager.yaml b/analytics/cloud-spend/amazon_workspaces_application_manager.yaml deleted file mode 100755 index 202a1040f..000000000 --- a/analytics/cloud-spend/amazon_workspaces_application_manager.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon WorkSpaces Application Manager -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon WorkSpaces Application Manager' group by 1,2; -status: active -tables: -- Amazon WorkSpaces Application Manager -tags: - category: - - End User diff --git a/analytics/cloud-spend/amazon_workspaces_web.yaml b/analytics/cloud-spend/amazon_workspaces_web.yaml deleted file mode 100755 index 366c81ee1..000000000 --- a/analytics/cloud-spend/amazon_workspaces_web.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Amazon WorkSpaces Web -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Amazon WorkSpaces Web' group by 1,2; -status: active -tables: -- Amazon WorkSpaces Web -tags: - category: - - End User diff --git a/analytics/cloud-spend/amazoncloudwatch.yaml b/analytics/cloud-spend/amazoncloudwatch.yaml deleted file mode 100755 index 2a6f54a8c..000000000 --- a/analytics/cloud-spend/amazoncloudwatch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AmazonCloudWatch -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AmazonCloudWatch' group by 1,2; -status: active -tables: -- AmazonCloudWatch -tags: - category: - - Monitoring diff --git a/analytics/cloud-spend/amazonworkmail.yaml b/analytics/cloud-spend/amazonworkmail.yaml deleted file mode 100755 index 61a460437..000000000 --- a/analytics/cloud-spend/amazonworkmail.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AmazonWorkMail -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AmazonWorkMail' group by 1,2; -status: active -tables: -- AmazonWorkMail -tags: - category: - - End User diff --git a/analytics/cloud-spend/api_management.yaml b/analytics/cloud-spend/api_management.yaml deleted file mode 100755 index 067b3e003..000000000 --- a/analytics/cloud-spend/api_management.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: API Management -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'API Management' group by 1,2; -status: active -tables: -- API Management -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/apn_annual_program_fee.yaml b/analytics/cloud-spend/apn_annual_program_fee.yaml deleted file mode 100755 index 6ab937e93..000000000 --- a/analytics/cloud-spend/apn_annual_program_fee.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: APN Annual Program Fee -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'APN Annual Program Fee' group by 1,2; -status: active -tables: -- APN Annual Program Fee -tags: - category: - - Administrative Fees diff --git a/analytics/cloud-spend/app_center.yaml b/analytics/cloud-spend/app_center.yaml deleted file mode 100755 index d951daa51..000000000 --- a/analytics/cloud-spend/app_center.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: App Center -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'App Center' group by 1,2; -status: active -tables: -- App Center -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/app_configuration.yaml b/analytics/cloud-spend/app_configuration.yaml deleted file mode 100755 index cf63dc10e..000000000 --- a/analytics/cloud-spend/app_configuration.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: App Configuration -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'App Configuration' group by 1,2; -status: active -tables: -- App Configuration -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/application_gateway.yaml b/analytics/cloud-spend/application_gateway.yaml deleted file mode 100755 index f6fed11fb..000000000 --- a/analytics/cloud-spend/application_gateway.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Application Gateway -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Application Gateway' group by 1,2; -status: active -tables: -- Application Gateway -tags: - category: - - Network diff --git a/analytics/cloud-spend/application_insights.yaml b/analytics/cloud-spend/application_insights.yaml deleted file mode 100755 index c0e88123b..000000000 --- a/analytics/cloud-spend/application_insights.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Application Insights -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Application Insights' group by 1,2; -status: active -tables: -- Application Insights -tags: - category: - - Observability diff --git a/analytics/cloud-spend/automation.yaml b/analytics/cloud-spend/automation.yaml deleted file mode 100755 index ed9e316d6..000000000 --- a/analytics/cloud-spend/automation.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Automation -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Automation' group by 1,2; -status: active -tables: -- Automation -tags: - category: - - Management diff --git a/analytics/cloud-spend/aws_amplify.yaml b/analytics/cloud-spend/aws_amplify.yaml deleted file mode 100755 index 38b364b54..000000000 --- a/analytics/cloud-spend/aws_amplify.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Amplify -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Amplify' group by 1,2; -status: active -tables: -- AWS Amplify -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/aws_application_migration_service.yaml b/analytics/cloud-spend/aws_application_migration_service.yaml deleted file mode 100755 index bf6ecb8e1..000000000 --- a/analytics/cloud-spend/aws_application_migration_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Application Migration Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Application Migration Service' group by 1,2; -status: active -tables: -- AWS Application Migration Service -tags: - category: - - Migration diff --git a/analytics/cloud-spend/aws_appsync.yaml b/analytics/cloud-spend/aws_appsync.yaml deleted file mode 100755 index 5ad4bfd42..000000000 --- a/analytics/cloud-spend/aws_appsync.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS AppSync -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS AppSync' group by 1,2; -status: active -tables: -- AWS AppSync -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/aws_backup.yaml b/analytics/cloud-spend/aws_backup.yaml deleted file mode 100755 index a907fca68..000000000 --- a/analytics/cloud-spend/aws_backup.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Backup -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Backup' group by 1,2; -status: active -tables: -- AWS Backup -tags: - category: - - Resiliency diff --git a/analytics/cloud-spend/aws_budgets.yaml b/analytics/cloud-spend/aws_budgets.yaml deleted file mode 100755 index f494c0d70..000000000 --- a/analytics/cloud-spend/aws_budgets.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Budgets -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Budgets' group by 1,2; -status: active -tables: -- AWS Budgets -tags: - category: - - Cost Management diff --git a/analytics/cloud-spend/aws_certificate_manager.yaml b/analytics/cloud-spend/aws_certificate_manager.yaml deleted file mode 100755 index 4ca026cd8..000000000 --- a/analytics/cloud-spend/aws_certificate_manager.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Certificate Manager -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Certificate Manager' group by 1,2; -status: active -tables: -- AWS Certificate Manager -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_cloud_map.yaml b/analytics/cloud-spend/aws_cloud_map.yaml deleted file mode 100755 index 209afcc65..000000000 --- a/analytics/cloud-spend/aws_cloud_map.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Cloud Map -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Cloud Map' group by 1,2; -status: active -tables: -- AWS Cloud Map -tags: - category: - - Governance diff --git a/analytics/cloud-spend/aws_cloud_wan.yaml b/analytics/cloud-spend/aws_cloud_wan.yaml deleted file mode 100755 index 15fa8e714..000000000 --- a/analytics/cloud-spend/aws_cloud_wan.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Cloud WAN -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Cloud WAN' group by 1,2; -status: active -tables: -- AWS Cloud WAN -tags: - category: - - Network diff --git a/analytics/cloud-spend/aws_cloudhsm.yaml b/analytics/cloud-spend/aws_cloudhsm.yaml deleted file mode 100755 index e54e4cdd6..000000000 --- a/analytics/cloud-spend/aws_cloudhsm.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS CloudHSM -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS CloudHSM' group by 1,2; -status: active -tables: -- AWS CloudHSM -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_cloudshell.yaml b/analytics/cloud-spend/aws_cloudshell.yaml deleted file mode 100755 index 3b38ef057..000000000 --- a/analytics/cloud-spend/aws_cloudshell.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS CloudShell -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS CloudShell' group by 1,2; -status: active -tables: -- AWS CloudShell -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/aws_cloudtrail.yaml b/analytics/cloud-spend/aws_cloudtrail.yaml deleted file mode 100755 index 47b2ea9dc..000000000 --- a/analytics/cloud-spend/aws_cloudtrail.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS CloudTrail -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS CloudTrail' group by 1,2; -status: active -tables: -- AWS CloudTrail -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_codeartifact.yaml b/analytics/cloud-spend/aws_codeartifact.yaml deleted file mode 100755 index 05841c64b..000000000 --- a/analytics/cloud-spend/aws_codeartifact.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS CodeArtifact -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS CodeArtifact' group by 1,2; -status: active -tables: -- AWS CodeArtifact -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/aws_codecommit.yaml b/analytics/cloud-spend/aws_codecommit.yaml deleted file mode 100755 index 648e3b872..000000000 --- a/analytics/cloud-spend/aws_codecommit.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS CodeCommit -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS CodeCommit' group by 1,2; -status: active -tables: -- AWS CodeCommit -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/aws_codepipeline.yaml b/analytics/cloud-spend/aws_codepipeline.yaml deleted file mode 100755 index 0c2bf4516..000000000 --- a/analytics/cloud-spend/aws_codepipeline.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS CodePipeline -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS CodePipeline' group by 1,2; -status: active -tables: -- AWS CodePipeline -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/aws_config.yaml b/analytics/cloud-spend/aws_config.yaml deleted file mode 100755 index 0750efe34..000000000 --- a/analytics/cloud-spend/aws_config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Config -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Config' group by 1,2; -status: active -tables: -- AWS Config -tags: - category: - - Governance diff --git a/analytics/cloud-spend/aws_contact_center.yaml b/analytics/cloud-spend/aws_contact_center.yaml deleted file mode 100755 index 22e403dd9..000000000 --- a/analytics/cloud-spend/aws_contact_center.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: "Contact Center Telecommunications (service sold by AMCS, LLC) " -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service like 'Contact Center Telecommunications (service sold by AMCS, LLC)%' group by 1, 2; -status: active -tables: -- "Contact Center Telecommunications (service sold by AMCS, LLC) " -tags: - category: - - Tax diff --git a/analytics/cloud-spend/aws_cost_explorer.yaml b/analytics/cloud-spend/aws_cost_explorer.yaml deleted file mode 100755 index 6143eccf1..000000000 --- a/analytics/cloud-spend/aws_cost_explorer.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Cost Explorer -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Cost Explorer' group by 1,2; -status: active -tables: -- AWS Cost Explorer -tags: - category: - - Cost Management diff --git a/analytics/cloud-spend/aws_data_pipeline.yaml b/analytics/cloud-spend/aws_data_pipeline.yaml deleted file mode 100755 index 49474f5b5..000000000 --- a/analytics/cloud-spend/aws_data_pipeline.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Data Pipeline -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Data Pipeline' group by 1,2; -status: active -tables: -- AWS Data Pipeline -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/aws_data_transfer.yaml b/analytics/cloud-spend/aws_data_transfer.yaml deleted file mode 100755 index b20b8a6aa..000000000 --- a/analytics/cloud-spend/aws_data_transfer.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Data Transfer -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Data Transfer' group by 1,2; -status: active -tables: -- AWS Data Transfer -tags: - category: - - Network diff --git a/analytics/cloud-spend/aws_database_migration_service.yaml b/analytics/cloud-spend/aws_database_migration_service.yaml deleted file mode 100755 index 49e19556f..000000000 --- a/analytics/cloud-spend/aws_database_migration_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Database Migration Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Database Migration Service' group by 1,2; -status: active -tables: -- AWS Database Migration Service -tags: - category: - - Data Management diff --git a/analytics/cloud-spend/aws_datasync.yaml b/analytics/cloud-spend/aws_datasync.yaml deleted file mode 100755 index 7fc1f28a1..000000000 --- a/analytics/cloud-spend/aws_datasync.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS DataSync -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS DataSync' group by 1,2; -status: active -tables: -- AWS DataSync -tags: - category: - - Data Management diff --git a/analytics/cloud-spend/aws_deepracer.yaml b/analytics/cloud-spend/aws_deepracer.yaml deleted file mode 100755 index c21fb6d3c..000000000 --- a/analytics/cloud-spend/aws_deepracer.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS DeepRacer -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS DeepRacer' group by 1,2; -status: active -tables: -- AWS DeepRacer -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/aws_direct_connect.yaml b/analytics/cloud-spend/aws_direct_connect.yaml deleted file mode 100755 index d7a1c1c4e..000000000 --- a/analytics/cloud-spend/aws_direct_connect.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Direct Connect -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Direct Connect' group by 1,2; -status: active -tables: -- AWS Direct Connect -tags: - category: - - Network diff --git a/analytics/cloud-spend/aws_directory_service.yaml b/analytics/cloud-spend/aws_directory_service.yaml deleted file mode 100755 index c426684f9..000000000 --- a/analytics/cloud-spend/aws_directory_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Directory Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Directory Service' group by 1,2; -status: active -tables: -- AWS Directory Service -tags: - category: - - IAM diff --git a/analytics/cloud-spend/aws_elastic_disaster_recovery.yaml b/analytics/cloud-spend/aws_elastic_disaster_recovery.yaml deleted file mode 100755 index 763b27149..000000000 --- a/analytics/cloud-spend/aws_elastic_disaster_recovery.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Elastic Disaster Recovery -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Elastic Disaster Recovery' group by 1,2; -status: active -tables: -- AWS Elastic Disaster Recovery -tags: - category: - - Resiliency diff --git a/analytics/cloud-spend/aws_fault_injection_simulator.yaml b/analytics/cloud-spend/aws_fault_injection_simulator.yaml deleted file mode 100755 index eb82a4a1e..000000000 --- a/analytics/cloud-spend/aws_fault_injection_simulator.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Fault Injection Simulator -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Fault Injection Simulator' group by 1,2; -status: active -tables: -- AWS Fault Injection Simulator -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/aws_firewall_manager.yaml b/analytics/cloud-spend/aws_firewall_manager.yaml deleted file mode 100755 index 3f776dfbd..000000000 --- a/analytics/cloud-spend/aws_firewall_manager.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Firewall Manager -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Firewall Manager' group by 1,2; -status: active -tables: -- AWS Firewall Manager -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_global_accelerator.yaml b/analytics/cloud-spend/aws_global_accelerator.yaml deleted file mode 100755 index 7f2a69338..000000000 --- a/analytics/cloud-spend/aws_global_accelerator.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Global Accelerator -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Global Accelerator' group by 1,2; -status: active -tables: -- AWS Global Accelerator -tags: - category: - - Network diff --git a/analytics/cloud-spend/aws_glue.yaml b/analytics/cloud-spend/aws_glue.yaml deleted file mode 100755 index b57f577ef..000000000 --- a/analytics/cloud-spend/aws_glue.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Glue -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Glue' group by 1,2; -status: active -tables: -- AWS Glue -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/aws_iot.yaml b/analytics/cloud-spend/aws_iot.yaml deleted file mode 100755 index 304e5779c..000000000 --- a/analytics/cloud-spend/aws_iot.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS IoT -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS IoT' group by 1,2; -status: active -tables: -- AWS IoT -tags: - category: - - Devices & End User diff --git a/analytics/cloud-spend/aws_key_management_service.yaml b/analytics/cloud-spend/aws_key_management_service.yaml deleted file mode 100755 index 4479932fb..000000000 --- a/analytics/cloud-spend/aws_key_management_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Key Management Service -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Key Management Service' group by 1,2; -status: active -tables: -- AWS Key Management Service -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_lambda.yaml b/analytics/cloud-spend/aws_lambda.yaml deleted file mode 100755 index a6687368a..000000000 --- a/analytics/cloud-spend/aws_lambda.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Lambda -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Lambda' group by 1,2; -status: active -tables: -- AWS Lambda -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/aws_marketplace.yaml b/analytics/cloud-spend/aws_marketplace.yaml deleted file mode 100755 index d0027a10f..000000000 --- a/analytics/cloud-spend/aws_marketplace.yaml +++ /dev/null @@ -1,11 +0,0 @@ -integrationType: -- aws_cloud_account -finderQuery: SELECT * FROM aws_cost_by_service_daily WHERE cost_source = 'AWS Marketplace'; -name: AWS Marketplace -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE cost_source = 'AWS Marketplace' group by 1, 2; -status: active -tables: -- AWS Marketplace -tags: - category: - - Marketplace diff --git a/analytics/cloud-spend/aws_migration_hub_refactor_spaces.yaml b/analytics/cloud-spend/aws_migration_hub_refactor_spaces.yaml deleted file mode 100755 index c8ed0c59e..000000000 --- a/analytics/cloud-spend/aws_migration_hub_refactor_spaces.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Migration Hub Refactor Spaces -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Migration Hub Refactor Spaces' group by 1,2; -status: active -tables: -- AWS Migration Hub Refactor Spaces -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/aws_network_firewall.yaml b/analytics/cloud-spend/aws_network_firewall.yaml deleted file mode 100755 index f21cfa024..000000000 --- a/analytics/cloud-spend/aws_network_firewall.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Network Firewall -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Network Firewall' group by 1,2; -status: active -tables: -- AWS Network Firewall -tags: - category: - - Network diff --git a/analytics/cloud-spend/aws_premium_support.yaml b/analytics/cloud-spend/aws_premium_support.yaml deleted file mode 100755 index a6f66193e..000000000 --- a/analytics/cloud-spend/aws_premium_support.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Premium Support -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Premium Support' group by 1,2; -status: active -tables: -- AWS Premium Support -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/aws_resilience_hub.yaml b/analytics/cloud-spend/aws_resilience_hub.yaml deleted file mode 100755 index 84be2c1e2..000000000 --- a/analytics/cloud-spend/aws_resilience_hub.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Resilience Hub -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Resilience Hub' group by 1,2; -status: active -tables: -- AWS Resilience Hub -tags: - category: - - Resiliency diff --git a/analytics/cloud-spend/aws_secrets_manager.yaml b/analytics/cloud-spend/aws_secrets_manager.yaml deleted file mode 100755 index c8974c48c..000000000 --- a/analytics/cloud-spend/aws_secrets_manager.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Secrets Manager -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Secrets Manager' group by 1,2; -status: active -tables: -- AWS Secrets Manager -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_security_hub.yaml b/analytics/cloud-spend/aws_security_hub.yaml deleted file mode 100755 index 6b5bae257..000000000 --- a/analytics/cloud-spend/aws_security_hub.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Security Hub -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Security Hub' group by 1,2; -status: active -tables: -- AWS Security Hub -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_service_catalog.yaml b/analytics/cloud-spend/aws_service_catalog.yaml deleted file mode 100755 index b94ec4304..000000000 --- a/analytics/cloud-spend/aws_service_catalog.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Service Catalog -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Service Catalog' group by 1,2; -status: active -tables: -- AWS Service Catalog -tags: - category: - - Governance diff --git a/analytics/cloud-spend/aws_shield.yaml b/analytics/cloud-spend/aws_shield.yaml deleted file mode 100755 index a75f9be5b..000000000 --- a/analytics/cloud-spend/aws_shield.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Shield -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Shield' group by 1,2; -status: active -tables: -- AWS Shield -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_step_functions.yaml b/analytics/cloud-spend/aws_step_functions.yaml deleted file mode 100755 index 01b379ab1..000000000 --- a/analytics/cloud-spend/aws_step_functions.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Step Functions -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Step Functions' group by 1,2; -status: active -tables: -- AWS Step Functions -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/aws_storage_gateway.yaml b/analytics/cloud-spend/aws_storage_gateway.yaml deleted file mode 100755 index fffea1fcd..000000000 --- a/analytics/cloud-spend/aws_storage_gateway.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Storage Gateway -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Storage Gateway' group by 1,2; -status: active -tables: -- AWS Storage Gateway -tags: - category: - - Storage diff --git a/analytics/cloud-spend/aws_support_(business).yaml b/analytics/cloud-spend/aws_support_(business).yaml deleted file mode 100755 index 95224388a..000000000 --- a/analytics/cloud-spend/aws_support_(business).yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Support (Business) -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Support (Business)' group by 1,2; -status: active -tables: -- AWS Support (Business) -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/aws_systems_manager.yaml b/analytics/cloud-spend/aws_systems_manager.yaml deleted file mode 100755 index cd16db4a3..000000000 --- a/analytics/cloud-spend/aws_systems_manager.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Systems Manager -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Systems Manager' group by 1,2; -status: active -tables: -- AWS Systems Manager -tags: - category: - - Ops diff --git a/analytics/cloud-spend/aws_transfer_family.yaml b/analytics/cloud-spend/aws_transfer_family.yaml deleted file mode 100755 index 96bf5b22d..000000000 --- a/analytics/cloud-spend/aws_transfer_family.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS Transfer Family -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS Transfer Family' group by 1,2; -status: active -tables: -- AWS Transfer Family -tags: - category: - - Network diff --git a/analytics/cloud-spend/aws_waf.yaml b/analytics/cloud-spend/aws_waf.yaml deleted file mode 100755 index a07b651d2..000000000 --- a/analytics/cloud-spend/aws_waf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS WAF -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS WAF' group by 1,2; -status: active -tables: -- AWS WAF -tags: - category: - - Security diff --git a/analytics/cloud-spend/aws_x_ray.yaml b/analytics/cloud-spend/aws_x_ray.yaml deleted file mode 100755 index cfc6690c5..000000000 --- a/analytics/cloud-spend/aws_x_ray.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: AWS X-Ray -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'AWS X-Ray' group by 1,2; -status: active -tables: -- AWS X-Ray -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/azure_active_directory_b2c.yaml b/analytics/cloud-spend/azure_active_directory_b2c.yaml deleted file mode 100755 index 27be7cc5d..000000000 --- a/analytics/cloud-spend/azure_active_directory_b2c.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Active Directory B2C -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Active Directory B2C' group by 1,2; -status: active -tables: -- Azure Active Directory B2C -tags: - category: - - IAM diff --git a/analytics/cloud-spend/azure_active_directory_for_external_identities.yaml b/analytics/cloud-spend/azure_active_directory_for_external_identities.yaml deleted file mode 100755 index b384d2db9..000000000 --- a/analytics/cloud-spend/azure_active_directory_for_external_identities.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Active Directory for External Identities -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Active Directory for External Identities' group by 1,2; -status: active -tables: -- Azure Active Directory for External Identities -tags: - category: - - IAM diff --git a/analytics/cloud-spend/azure_analysis_services.yaml b/analytics/cloud-spend/azure_analysis_services.yaml deleted file mode 100755 index 088e627b7..000000000 --- a/analytics/cloud-spend/azure_analysis_services.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Analysis Services -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Analysis Services' group by 1,2; -status: active -tables: -- Azure Analysis Services -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/azure_api_for_fhir.yaml b/analytics/cloud-spend/azure_api_for_fhir.yaml deleted file mode 100755 index b53e1def8..000000000 --- a/analytics/cloud-spend/azure_api_for_fhir.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure API for FHIR -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure API for FHIR' group by 1,2; -status: active -tables: -- Azure API for FHIR -tags: - category: - - Partner Service diff --git a/analytics/cloud-spend/azure_app_service.yaml b/analytics/cloud-spend/azure_app_service.yaml deleted file mode 100755 index 80fe319a3..000000000 --- a/analytics/cloud-spend/azure_app_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure App Service -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure App Service' group by 1,2; -status: active -tables: -- Azure App Service -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/azure_applied_ai_services.yaml b/analytics/cloud-spend/azure_applied_ai_services.yaml deleted file mode 100755 index 25e187490..000000000 --- a/analytics/cloud-spend/azure_applied_ai_services.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Applied AI Services -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Applied AI Services' group by 1,2; -status: active -tables: -- Azure Applied AI Services -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/azure_arc.yaml b/analytics/cloud-spend/azure_arc.yaml deleted file mode 100755 index fa0b534c1..000000000 --- a/analytics/cloud-spend/azure_arc.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Arc -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Arc' group by 1,2; -status: active -tables: -- Azure Arc -tags: - category: - - Multi-Cloud diff --git a/analytics/cloud-spend/azure_arc_enabled_databases.yaml b/analytics/cloud-spend/azure_arc_enabled_databases.yaml deleted file mode 100755 index ac876d26c..000000000 --- a/analytics/cloud-spend/azure_arc_enabled_databases.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Arc Enabled Databases -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Arc Enabled Databases' group by 1,2; -status: active -tables: -- Azure Arc Enabled Databases -tags: - category: - - Multi-Cloud diff --git a/analytics/cloud-spend/azure_bastion.yaml b/analytics/cloud-spend/azure_bastion.yaml deleted file mode 100755 index 38d57c4fd..000000000 --- a/analytics/cloud-spend/azure_bastion.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Bastion -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Bastion' group by 1,2; -status: active -tables: -- Azure Bastion -tags: - category: - - Security diff --git a/analytics/cloud-spend/azure_bot_service.yaml b/analytics/cloud-spend/azure_bot_service.yaml deleted file mode 100755 index f2ccd92d5..000000000 --- a/analytics/cloud-spend/azure_bot_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Bot Service -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Bot Service' group by 1,2; -status: active -tables: -- Azure Bot Service -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/azure_cognitive_search.yaml b/analytics/cloud-spend/azure_cognitive_search.yaml deleted file mode 100755 index 744afa3e7..000000000 --- a/analytics/cloud-spend/azure_cognitive_search.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cognitive Search -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Cognitive Search' group by 1,2; -status: active -tables: -- Azure Cognitive Search -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/azure_confidential_ledger.yaml b/analytics/cloud-spend/azure_confidential_ledger.yaml deleted file mode 100755 index 7cc37e22c..000000000 --- a/analytics/cloud-spend/azure_confidential_ledger.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure confidential ledger -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure confidential ledger' group by 1,2; -status: active -tables: -- Azure confidential ledger -tags: - category: - - Blockchain diff --git a/analytics/cloud-spend/azure_container_apps.yaml b/analytics/cloud-spend/azure_container_apps.yaml deleted file mode 100755 index f122f32b9..000000000 --- a/analytics/cloud-spend/azure_container_apps.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Container Apps -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Container Apps' group by 1,2; -status: active -tables: -- Azure Container Apps -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/azure_cosmos_db.yaml b/analytics/cloud-spend/azure_cosmos_db.yaml deleted file mode 100755 index 89578be13..000000000 --- a/analytics/cloud-spend/azure_cosmos_db.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Cosmos DB -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Cosmos DB' group by 1,2; -status: active -tables: -- Azure Cosmos DB -tags: - category: - - Database diff --git a/analytics/cloud-spend/azure_data_explorer.yaml b/analytics/cloud-spend/azure_data_explorer.yaml deleted file mode 100755 index d85a834ae..000000000 --- a/analytics/cloud-spend/azure_data_explorer.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Data Explorer -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Data Explorer' group by 1,2; -status: active -tables: -- Azure Data Explorer -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/azure_data_factory_v2.yaml b/analytics/cloud-spend/azure_data_factory_v2.yaml deleted file mode 100755 index 90a1d8559..000000000 --- a/analytics/cloud-spend/azure_data_factory_v2.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Data Factory v2 -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Data Factory v2' group by 1,2; -status: active -tables: -- Azure Data Factory v2 -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/azure_database_for_mariadb.yaml b/analytics/cloud-spend/azure_database_for_mariadb.yaml deleted file mode 100755 index 6204b84a9..000000000 --- a/analytics/cloud-spend/azure_database_for_mariadb.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Database for MariaDB -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Database for MariaDB' group by 1,2; -status: active -tables: -- Azure Database for MariaDB -tags: - category: - - Database diff --git a/analytics/cloud-spend/azure_database_for_mysql.yaml b/analytics/cloud-spend/azure_database_for_mysql.yaml deleted file mode 100755 index 90693f256..000000000 --- a/analytics/cloud-spend/azure_database_for_mysql.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Database for MySQL -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Database for MySQL' group by 1,2; -status: active -tables: -- Azure Database for MySQL -tags: - category: - - Database diff --git a/analytics/cloud-spend/azure_database_for_postgresql.yaml b/analytics/cloud-spend/azure_database_for_postgresql.yaml deleted file mode 100755 index 887e2be7a..000000000 --- a/analytics/cloud-spend/azure_database_for_postgresql.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Database for PostgreSQL -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Database for PostgreSQL' group by 1,2; -status: active -tables: -- Azure Database for PostgreSQL -tags: - category: - - Database diff --git a/analytics/cloud-spend/azure_databricks.yaml b/analytics/cloud-spend/azure_databricks.yaml deleted file mode 100755 index 075b2fd60..000000000 --- a/analytics/cloud-spend/azure_databricks.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Databricks -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Databricks' group by 1,2; -status: active -tables: -- Azure Databricks -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/azure_ddos_protection.yaml b/analytics/cloud-spend/azure_ddos_protection.yaml deleted file mode 100755 index 73b590dda..000000000 --- a/analytics/cloud-spend/azure_ddos_protection.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure DDOS Protection -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure DDOS Protection' group by 1,2; -status: active -tables: -- Azure DDOS Protection -tags: - category: - - Security diff --git a/analytics/cloud-spend/azure_defender.yaml b/analytics/cloud-spend/azure_defender.yaml deleted file mode 100755 index 4ee97a911..000000000 --- a/analytics/cloud-spend/azure_defender.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Defender -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Defender' group by 1,2; -status: active -tables: -- Azure Defender -tags: - category: - - Security diff --git a/analytics/cloud-spend/azure_devops.yaml b/analytics/cloud-spend/azure_devops.yaml deleted file mode 100755 index 34765a74f..000000000 --- a/analytics/cloud-spend/azure_devops.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure DevOps -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure DevOps' group by 1,2; -status: active -tables: -- Azure DevOps -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/azure_dns.yaml b/analytics/cloud-spend/azure_dns.yaml deleted file mode 100755 index 064205575..000000000 --- a/analytics/cloud-spend/azure_dns.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure DNS -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure DNS' group by 1,2; -status: active -tables: -- Azure DNS -tags: - category: - - Network diff --git a/analytics/cloud-spend/azure_firewall.yaml b/analytics/cloud-spend/azure_firewall.yaml deleted file mode 100755 index b89477aa2..000000000 --- a/analytics/cloud-spend/azure_firewall.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Firewall -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Firewall' group by 1,2; -status: active -tables: -- Azure Firewall -tags: - category: - - Network diff --git a/analytics/cloud-spend/azure_front_door_service.yaml b/analytics/cloud-spend/azure_front_door_service.yaml deleted file mode 100755 index f749fe072..000000000 --- a/analytics/cloud-spend/azure_front_door_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Front Door Service -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Front Door Service' group by 1,2; -status: active -tables: -- Azure Front Door Service -tags: - category: - - Network diff --git a/analytics/cloud-spend/azure_grafana_service.yaml b/analytics/cloud-spend/azure_grafana_service.yaml deleted file mode 100755 index b925cf157..000000000 --- a/analytics/cloud-spend/azure_grafana_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Grafana Service -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Grafana Service' group by 1,2; -status: active -tables: -- Azure Grafana Service -tags: - category: - - Observability diff --git a/analytics/cloud-spend/azure_kubernetes_service.yaml b/analytics/cloud-spend/azure_kubernetes_service.yaml deleted file mode 100755 index 49a9026e3..000000000 --- a/analytics/cloud-spend/azure_kubernetes_service.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Kubernetes Service -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Kubernetes Service' group by 1,2; -status: active -tables: -- Azure Kubernetes Service -tags: - category: - - Containers diff --git a/analytics/cloud-spend/azure_lab_services.yaml b/analytics/cloud-spend/azure_lab_services.yaml deleted file mode 100755 index ef384635c..000000000 --- a/analytics/cloud-spend/azure_lab_services.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Lab Services -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Lab Services' group by 1,2; -status: active -tables: -- Azure Lab Services -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/azure_load_testing.yaml b/analytics/cloud-spend/azure_load_testing.yaml deleted file mode 100755 index 6ff98dc5c..000000000 --- a/analytics/cloud-spend/azure_load_testing.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Load Testing -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Load Testing' group by 1,2; -status: active -tables: -- Azure Load Testing -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/azure_marketplace.yaml b/analytics/cloud-spend/azure_marketplace.yaml deleted file mode 100755 index 7d249b90c..000000000 --- a/analytics/cloud-spend/azure_marketplace.yaml +++ /dev/null @@ -1,11 +0,0 @@ -integrationType: -- azure_subscription -finderQuery: SELECT * FROM azure_costmanagement_costbyresourcetype WHERE publisher_type = 'Marketplace'; -name: Azure Marketplace -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE publisher_type = 'Marketplace' group by 1, 2; -status: active -tables: -- Azure Marketplace -tags: - category: - - Marketplace diff --git a/analytics/cloud-spend/azure_monitor.yaml b/analytics/cloud-spend/azure_monitor.yaml deleted file mode 100755 index cf960d7cb..000000000 --- a/analytics/cloud-spend/azure_monitor.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Monitor -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Monitor' group by 1,2; -status: active -tables: -- Azure Monitor -tags: - category: - - Monitoring diff --git a/analytics/cloud-spend/azure_netapp_files.yaml b/analytics/cloud-spend/azure_netapp_files.yaml deleted file mode 100755 index c4ff491b8..000000000 --- a/analytics/cloud-spend/azure_netapp_files.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure NetApp Files -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure NetApp Files' group by 1,2; -status: active -tables: -- Azure NetApp Files -tags: - category: - - Storage diff --git a/analytics/cloud-spend/azure_purview.yaml b/analytics/cloud-spend/azure_purview.yaml deleted file mode 100755 index 85ff9953f..000000000 --- a/analytics/cloud-spend/azure_purview.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Purview -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Purview' group by 1,2; -status: active -tables: -- Azure Purview -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/azure_route_server.yaml b/analytics/cloud-spend/azure_route_server.yaml deleted file mode 100755 index 29ec17d16..000000000 --- a/analytics/cloud-spend/azure_route_server.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Route Server -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Route Server' group by 1,2; -status: active -tables: -- Azure Route Server -tags: - category: - - Network diff --git a/analytics/cloud-spend/azure_site_recovery.yaml b/analytics/cloud-spend/azure_site_recovery.yaml deleted file mode 100755 index 31f9d63a7..000000000 --- a/analytics/cloud-spend/azure_site_recovery.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Site Recovery -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Site Recovery' group by 1,2; -status: active -tables: -- Azure Site Recovery -tags: - category: - - Resiliency diff --git a/analytics/cloud-spend/azure_spring_cloud.yaml b/analytics/cloud-spend/azure_spring_cloud.yaml deleted file mode 100755 index 0f6f878cf..000000000 --- a/analytics/cloud-spend/azure_spring_cloud.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Spring Cloud -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Spring Cloud' group by 1,2; -status: active -tables: -- Azure Spring Cloud -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/azure_synapse_analytics.yaml b/analytics/cloud-spend/azure_synapse_analytics.yaml deleted file mode 100755 index 0fb5fc4b3..000000000 --- a/analytics/cloud-spend/azure_synapse_analytics.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Azure Synapse Analytics -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Azure Synapse Analytics' group by 1,2; -status: active -tables: -- Azure Synapse Analytics -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/backup.yaml b/analytics/cloud-spend/backup.yaml deleted file mode 100755 index 875930cb0..000000000 --- a/analytics/cloud-spend/backup.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Backup -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Backup' group by 1,2; -status: active -tables: -- Backup -tags: - category: - - Backup & Resiliency diff --git a/analytics/cloud-spend/bandwidth.yaml b/analytics/cloud-spend/bandwidth.yaml deleted file mode 100755 index 4b5390bdb..000000000 --- a/analytics/cloud-spend/bandwidth.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Bandwidth -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Bandwidth' group by 1,2; -status: active -tables: -- Bandwidth -tags: - category: - - Network diff --git a/analytics/cloud-spend/cloud_services.yaml b/analytics/cloud-spend/cloud_services.yaml deleted file mode 100755 index f8f2dbf40..000000000 --- a/analytics/cloud-spend/cloud_services.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Cloud Services -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Cloud Services' group by 1,2; -status: active -tables: -- Cloud Services -tags: - category: - - Legacy PaaS diff --git a/analytics/cloud-spend/cloudendure_disaster_recovery_to_aws.yaml b/analytics/cloud-spend/cloudendure_disaster_recovery_to_aws.yaml deleted file mode 100755 index b7da0c12f..000000000 --- a/analytics/cloud-spend/cloudendure_disaster_recovery_to_aws.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: CloudEndure Disaster Recovery to AWS -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'CloudEndure Disaster Recovery to AWS' group by 1,2; -status: active -tables: -- CloudEndure Disaster Recovery to AWS -tags: - category: - - Backup & Resiliency diff --git a/analytics/cloud-spend/cloudwatch_events.yaml b/analytics/cloud-spend/cloudwatch_events.yaml deleted file mode 100755 index efd95ff76..000000000 --- a/analytics/cloud-spend/cloudwatch_events.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: CloudWatch Events -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'CloudWatch Events' group by 1,2; -status: active -tables: -- CloudWatch Events -tags: - category: - - Monitoring diff --git a/analytics/cloud-spend/code_catalyst.yaml b/analytics/cloud-spend/code_catalyst.yaml deleted file mode 100755 index 8f9d0cf2e..000000000 --- a/analytics/cloud-spend/code_catalyst.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: CodeCatalyst -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'CodeCatalyst' group by 1,2; -status: active -tables: -- CodeCatalyst -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/codebuild.yaml b/analytics/cloud-spend/codebuild.yaml deleted file mode 100755 index 7f4485165..000000000 --- a/analytics/cloud-spend/codebuild.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: CodeBuild -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'CodeBuild' group by 1,2; -status: active -tables: -- CodeBuild -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/cognitive_services.yaml b/analytics/cloud-spend/cognitive_services.yaml deleted file mode 100755 index 69d4f7485..000000000 --- a/analytics/cloud-spend/cognitive_services.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Cognitive Services -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Cognitive Services' group by 1,2; -status: active -tables: -- Cognitive Services -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/comprehend_medical.yaml b/analytics/cloud-spend/comprehend_medical.yaml deleted file mode 100755 index 086180ca3..000000000 --- a/analytics/cloud-spend/comprehend_medical.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Comprehend Medical -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Comprehend Medical' group by 1,2; -status: active -tables: -- Comprehend Medical -tags: - category: - - AI + ML diff --git a/analytics/cloud-spend/container_instances.yaml b/analytics/cloud-spend/container_instances.yaml deleted file mode 100755 index 34d01b533..000000000 --- a/analytics/cloud-spend/container_instances.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Container Instances -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Container Instances' group by 1,2; -status: active -tables: -- Container Instances -tags: - category: - - Containers diff --git a/analytics/cloud-spend/container_registry.yaml b/analytics/cloud-spend/container_registry.yaml deleted file mode 100755 index 16031038b..000000000 --- a/analytics/cloud-spend/container_registry.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Container Registry -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Container Registry' group by 1,2; -status: active -tables: -- Container Registry -tags: - category: - - Containers diff --git a/analytics/cloud-spend/content_delivery_network.yaml b/analytics/cloud-spend/content_delivery_network.yaml deleted file mode 100755 index 0f3d4c997..000000000 --- a/analytics/cloud-spend/content_delivery_network.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Content Delivery Network -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Content Delivery Network' group by 1,2; -status: active -tables: -- Content Delivery Network -tags: - category: - - Network diff --git a/analytics/cloud-spend/data_box.yaml b/analytics/cloud-spend/data_box.yaml deleted file mode 100755 index 25b87b171..000000000 --- a/analytics/cloud-spend/data_box.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Data Box -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Data Box' group by 1,2; -status: active -tables: -- Data Box -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/data_lake_store.yaml b/analytics/cloud-spend/data_lake_store.yaml deleted file mode 100755 index abad55367..000000000 --- a/analytics/cloud-spend/data_lake_store.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Data Lake Store -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Data Lake Store' group by 1,2; -status: active -tables: -- Data Lake Store -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/dataverse.yaml b/analytics/cloud-spend/dataverse.yaml deleted file mode 100755 index e9322a6f4..000000000 --- a/analytics/cloud-spend/dataverse.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Dataverse -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Dataverse' group by 1,2; -status: active -tables: -- Dataverse -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/dynamodb_accelerator_(dax).yaml b/analytics/cloud-spend/dynamodb_accelerator_(dax).yaml deleted file mode 100755 index 111254be6..000000000 --- a/analytics/cloud-spend/dynamodb_accelerator_(dax).yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: DynamoDB Accelerator (DAX) -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'DynamoDB Accelerator (DAX)' group by 1,2; -status: active -tables: -- DynamoDB Accelerator (DAX) -tags: - category: - - Database diff --git a/analytics/cloud-spend/ec2___cpu_credits.yaml b/analytics/cloud-spend/ec2___cpu_credits.yaml deleted file mode 100755 index e71ac46bc..000000000 --- a/analytics/cloud-spend/ec2___cpu_credits.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 - CPU Credits -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - CPUCredits' group by 1,2; -status: active -tables: -- EC2 - CPUCredits -tags: - category: - - Compute diff --git a/analytics/cloud-spend/ec2___data_transfer.yaml b/analytics/cloud-spend/ec2___data_transfer.yaml deleted file mode 100755 index 3effd53cd..000000000 --- a/analytics/cloud-spend/ec2___data_transfer.yaml +++ /dev/null @@ -1,12 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 - Data Transfer -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - DataTransfer' OR service = 'EC2 - AWS In' OR service = 'EC2 - AWS Out' group by 1,2; -status: active -tables: -- EC2 - DataTransfer -- EC2 - AWS In -- EC2 - AWS Out -tags: - category: - - Network diff --git a/analytics/cloud-spend/ec2___ebs.yaml b/analytics/cloud-spend/ec2___ebs.yaml deleted file mode 100755 index 563fe0fb5..000000000 --- a/analytics/cloud-spend/ec2___ebs.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EBS Snapshot -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - EBS Snapshot' group by 1,2; -status: active -tables: -- EC2 - EBS Snapshot -tags: - category: - - Storage diff --git a/analytics/cloud-spend/ec2___ebs_optimized.yaml b/analytics/cloud-spend/ec2___ebs_optimized.yaml deleted file mode 100755 index a6df4b7f9..000000000 --- a/analytics/cloud-spend/ec2___ebs_optimized.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 - EBS Optimized Instances -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - EBSOptimized' group by 1,2; -status: active -tables: -- EC2 - EBSOptimized -tags: - category: - - Compute diff --git a/analytics/cloud-spend/ec2___ebs_snapshot.yaml b/analytics/cloud-spend/ec2___ebs_snapshot.yaml deleted file mode 100755 index 64ab6f50c..000000000 --- a/analytics/cloud-spend/ec2___ebs_snapshot.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EBS -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - EBS' group by 1,2; -status: active -tables: -- EC2 - EBS -tags: - category: - - Storage diff --git a/analytics/cloud-spend/ec2___elastic_ip.yaml b/analytics/cloud-spend/ec2___elastic_ip.yaml deleted file mode 100755 index 4560870e2..000000000 --- a/analytics/cloud-spend/ec2___elastic_ip.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 - Elastic IP -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - ElasticIP' group by 1,2; -status: active -tables: -- EC2 - ElasticIP -tags: - category: - - Network diff --git a/analytics/cloud-spend/ec2___nat_gateway.yaml b/analytics/cloud-spend/ec2___nat_gateway.yaml deleted file mode 100755 index c78354591..000000000 --- a/analytics/cloud-spend/ec2___nat_gateway.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 - Nat Gateway -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - NatGateway' group by 1,2; -status: active -tables: -- EC2 - NatGateway -tags: - category: - - Network diff --git a/analytics/cloud-spend/ec2___other.yaml b/analytics/cloud-spend/ec2___other.yaml deleted file mode 100755 index 419d6c263..000000000 --- a/analytics/cloud-spend/ec2___other.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: EC2 - Other -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'EC2 - Other' group by 1,2; -status: active -tables: -- EC2 - Other -tags: - category: - - Compute - Other diff --git a/analytics/cloud-spend/event_grid.yaml b/analytics/cloud-spend/event_grid.yaml deleted file mode 100755 index 172175490..000000000 --- a/analytics/cloud-spend/event_grid.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Event Grid -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Event Grid' group by 1,2; -status: active -tables: -- Event Grid -tags: - category: - - App Integration diff --git a/analytics/cloud-spend/event_hubs.yaml b/analytics/cloud-spend/event_hubs.yaml deleted file mode 100755 index 60256aac5..000000000 --- a/analytics/cloud-spend/event_hubs.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Event Hubs -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Event Hubs' group by 1,2; -status: active -tables: -- Event Hubs -tags: - category: - - App Integration diff --git a/analytics/cloud-spend/expressroute.yaml b/analytics/cloud-spend/expressroute.yaml deleted file mode 100755 index 4a572a8ab..000000000 --- a/analytics/cloud-spend/expressroute.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: ExpressRoute -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'ExpressRoute' group by 1,2; -status: active -tables: -- ExpressRoute -tags: - category: - - Network diff --git a/analytics/cloud-spend/functions.yaml b/analytics/cloud-spend/functions.yaml deleted file mode 100755 index f28f4927c..000000000 --- a/analytics/cloud-spend/functions.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Functions -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Functions' group by 1,2; -status: active -tables: -- Functions -tags: - category: - - Serverless diff --git a/analytics/cloud-spend/hdinsight.yaml b/analytics/cloud-spend/hdinsight.yaml deleted file mode 100755 index a0cdbb4fd..000000000 --- a/analytics/cloud-spend/hdinsight.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: HDInsight -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'HDInsight' group by 1,2; -status: active -tables: -- HDInsight -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/insight_and_analytics.yaml b/analytics/cloud-spend/insight_and_analytics.yaml deleted file mode 100755 index e0d3fd791..000000000 --- a/analytics/cloud-spend/insight_and_analytics.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Insight and Analytics -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Insight and Analytics' group by 1,2; -status: active -tables: -- Insight and Analytics -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/iot_hub.yaml b/analytics/cloud-spend/iot_hub.yaml deleted file mode 100755 index 7c663670a..000000000 --- a/analytics/cloud-spend/iot_hub.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: IoT Hub -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'IoT Hub' group by 1,2; -status: active -tables: -- IoT Hub -tags: - category: - - Devices diff --git a/analytics/cloud-spend/key_vault.yaml b/analytics/cloud-spend/key_vault.yaml deleted file mode 100755 index 1dc6ad211..000000000 --- a/analytics/cloud-spend/key_vault.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Key Vault -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Key Vault' group by 1,2; -status: active -tables: -- Key Vault -tags: - category: - - Security diff --git a/analytics/cloud-spend/load_balancer.yaml b/analytics/cloud-spend/load_balancer.yaml deleted file mode 100755 index 3bf6a1ac9..000000000 --- a/analytics/cloud-spend/load_balancer.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Load Balancer -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Load Balancer' group by 1,2; -status: active -tables: -- Load Balancer -tags: - category: - - Network diff --git a/analytics/cloud-spend/log_analytics.yaml b/analytics/cloud-spend/log_analytics.yaml deleted file mode 100755 index 1bb083427..000000000 --- a/analytics/cloud-spend/log_analytics.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Log Analytics -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Log Analytics' group by 1,2; -status: active -tables: -- Log Analytics -tags: - category: - - Monitoring diff --git a/analytics/cloud-spend/logic_apps.yaml b/analytics/cloud-spend/logic_apps.yaml deleted file mode 100755 index 3556540ab..000000000 --- a/analytics/cloud-spend/logic_apps.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Logic Apps -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Logic Apps' group by 1,2; -status: active -tables: -- Logic Apps -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/microsoft_dev_box.yaml b/analytics/cloud-spend/microsoft_dev_box.yaml deleted file mode 100755 index 1f8c5e2b8..000000000 --- a/analytics/cloud-spend/microsoft_dev_box.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Microsoft Dev Box -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Microsoft Dev Box' group by 1,2; -status: active -tables: -- Microsoft Dev Box -tags: - category: - - DevOps diff --git a/analytics/cloud-spend/nat_gateway.yaml b/analytics/cloud-spend/nat_gateway.yaml deleted file mode 100755 index 05f3dbb89..000000000 --- a/analytics/cloud-spend/nat_gateway.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: NAT Gateway -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'NAT Gateway' group by 1,2; -status: active -tables: -- NAT Gateway -tags: - category: - - Network diff --git a/analytics/cloud-spend/network_watcher.yaml b/analytics/cloud-spend/network_watcher.yaml deleted file mode 100755 index 1b40ee265..000000000 --- a/analytics/cloud-spend/network_watcher.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Network Watcher -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Network Watcher' group by 1,2; -status: active -tables: -- Network Watcher -tags: - category: - - Monitoring diff --git a/analytics/cloud-spend/notification_hubs.yaml b/analytics/cloud-spend/notification_hubs.yaml deleted file mode 100755 index d5526834c..000000000 --- a/analytics/cloud-spend/notification_hubs.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Notification Hubs -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Notification Hubs' group by 1,2; -status: active -tables: -- Notification Hubs -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/ocbfinance_charge.yaml b/analytics/cloud-spend/ocbfinance_charge.yaml deleted file mode 100755 index 3be8c5b14..000000000 --- a/analytics/cloud-spend/ocbfinance_charge.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: OCBFinance Charge -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'OCBFinance Charge' group by 1,2; -status: active -tables: -- OCBFinance Charge -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/phone_numbers.yaml b/analytics/cloud-spend/phone_numbers.yaml deleted file mode 100755 index 79da54843..000000000 --- a/analytics/cloud-spend/phone_numbers.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Phone Numbers -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Phone Numbers' group by 1,2; -status: active -tables: -- Phone Numbers -tags: - category: - - Other diff --git a/analytics/cloud-spend/power_bi.yaml b/analytics/cloud-spend/power_bi.yaml deleted file mode 100755 index 33e4e14f0..000000000 --- a/analytics/cloud-spend/power_bi.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Power BI -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Power BI' group by 1,2; -status: active -tables: -- Power BI -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/power_bi_embedded.yaml b/analytics/cloud-spend/power_bi_embedded.yaml deleted file mode 100755 index 9f8244f10..000000000 --- a/analytics/cloud-spend/power_bi_embedded.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Power BI Embedded -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Power BI Embedded' group by 1,2; -status: active -tables: -- Power BI Embedded -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/redis_cache.yaml b/analytics/cloud-spend/redis_cache.yaml deleted file mode 100755 index ea17ade8f..000000000 --- a/analytics/cloud-spend/redis_cache.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Redis Cache -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Redis Cache' group by 1,2; -status: active -tables: -- Redis Cache -tags: - category: - - Database diff --git a/analytics/cloud-spend/refund.yaml b/analytics/cloud-spend/refund.yaml deleted file mode 100755 index 226d2bfdb..000000000 --- a/analytics/cloud-spend/refund.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Refund -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Refund' group by 1,2; -status: active -tables: -- Refund -tags: - category: - - Administrative & Support diff --git a/analytics/cloud-spend/savings_plans_for_aws_compute_usage.yaml b/analytics/cloud-spend/savings_plans_for_aws_compute_usage.yaml deleted file mode 100755 index 2e16d5ed5..000000000 --- a/analytics/cloud-spend/savings_plans_for_aws_compute_usage.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Savings Plans for AWS Compute usage -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Savings Plans for AWS Compute usage' group by 1,2; -status: active -tables: -- Savings Plans for AWS Compute usage -tags: - category: - - Administration & Support diff --git a/analytics/cloud-spend/savings_plans_for_aws_machine_learning.yaml b/analytics/cloud-spend/savings_plans_for_aws_machine_learning.yaml deleted file mode 100755 index 4c4215840..000000000 --- a/analytics/cloud-spend/savings_plans_for_aws_machine_learning.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Savings Plans for AWS Machine Learning -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Savings Plans for AWS Machine Learning' group by 1,2; -status: active -tables: -- Savings Plans for AWS Machine Learning -tags: - category: - - Administration & Support diff --git a/analytics/cloud-spend/secured_team_foundation_server_2018_on_windows_2016.yaml b/analytics/cloud-spend/secured_team_foundation_server_2018_on_windows_2016.yaml deleted file mode 100755 index 6fd72dc93..000000000 --- a/analytics/cloud-spend/secured_team_foundation_server_2018_on_windows_2016.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Secured Team Foundation Server 2018 on Windows 2016 -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Secured Team Foundation Server 2018 on Windows 2016' group by 1,2; -status: active -tables: -- Secured Team Foundation Server 2018 on Windows 2016 -tags: - category: - - Licensing diff --git a/analytics/cloud-spend/security_center.yaml b/analytics/cloud-spend/security_center.yaml deleted file mode 100755 index 6f4dab560..000000000 --- a/analytics/cloud-spend/security_center.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Security Center -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Security Center' group by 1,2; -status: active -tables: -- Security Center -tags: - category: - - Security diff --git a/analytics/cloud-spend/sentinel.yaml b/analytics/cloud-spend/sentinel.yaml deleted file mode 100755 index c90aacf9a..000000000 --- a/analytics/cloud-spend/sentinel.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Sentinel -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Sentinel' group by 1,2; -status: active -tables: -- Sentinel -tags: - category: - - Security diff --git a/analytics/cloud-spend/service_bus.yaml b/analytics/cloud-spend/service_bus.yaml deleted file mode 100755 index cae5d947c..000000000 --- a/analytics/cloud-spend/service_bus.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Service Bus -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Service Bus' group by 1,2; -status: active -tables: -- Service Bus -tags: - category: - - PaaS diff --git a/analytics/cloud-spend/signalr.yaml b/analytics/cloud-spend/signalr.yaml deleted file mode 100755 index f75403a43..000000000 --- a/analytics/cloud-spend/signalr.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: SignalR -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'SignalR' group by 1,2; -status: active -tables: -- SignalR -tags: - category: - - Data & Analytics diff --git a/analytics/cloud-spend/sql_database.yaml b/analytics/cloud-spend/sql_database.yaml deleted file mode 100755 index e9b464703..000000000 --- a/analytics/cloud-spend/sql_database.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: SQL Database -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'SQL Database' group by 1,2; -status: active -tables: -- SQL Database -tags: - category: - - Database diff --git a/analytics/cloud-spend/sql_managed_instance.yaml b/analytics/cloud-spend/sql_managed_instance.yaml deleted file mode 100755 index aaca4bf51..000000000 --- a/analytics/cloud-spend/sql_managed_instance.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: SQL Managed Instance -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'SQL Managed Instance' group by 1,2; -status: active -tables: -- SQL Managed Instance -tags: - category: - - Database diff --git a/analytics/cloud-spend/storage.yaml b/analytics/cloud-spend/storage.yaml deleted file mode 100755 index 6a82c0389..000000000 --- a/analytics/cloud-spend/storage.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Storage -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Storage' group by 1,2; -status: active -tables: -- Storage -tags: - category: - - Storage diff --git a/analytics/cloud-spend/stream_analytics.yaml b/analytics/cloud-spend/stream_analytics.yaml deleted file mode 100755 index 2fd42422c..000000000 --- a/analytics/cloud-spend/stream_analytics.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Stream Analytics -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Stream Analytics' group by 1,2; -status: active -tables: -- Stream Analytics -tags: - category: - - Security diff --git a/analytics/cloud-spend/tax.yaml b/analytics/cloud-spend/tax.yaml deleted file mode 100755 index 1e481a150..000000000 --- a/analytics/cloud-spend/tax.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- aws_cloud_account -name: Tax -query: SELECT og_account_id, period_start::date::text as date, sum(amortized_cost_amount) FROM aws_cost_by_service_daily WHERE service = 'Tax' group by 1,2; -status: active -tables: -- Tax -tags: - category: - - Tax diff --git a/analytics/cloud-spend/traffic_manager.yaml b/analytics/cloud-spend/traffic_manager.yaml deleted file mode 100755 index e0e78b0f3..000000000 --- a/analytics/cloud-spend/traffic_manager.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Traffic Manager -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Traffic Manager' group by 1,2; -status: active -tables: -- Traffic Manager -tags: - category: - - Network diff --git a/analytics/cloud-spend/virtual_machines.yaml b/analytics/cloud-spend/virtual_machines.yaml deleted file mode 100755 index 5be30d9bd..000000000 --- a/analytics/cloud-spend/virtual_machines.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual Machines -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Virtual Machines' group by 1,2; -status: active -tables: -- Virtual Machines -tags: - category: - - Compute diff --git a/analytics/cloud-spend/virtual_machines_licenses.yaml b/analytics/cloud-spend/virtual_machines_licenses.yaml deleted file mode 100755 index 6b9a6c9f5..000000000 --- a/analytics/cloud-spend/virtual_machines_licenses.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual Machines Licenses -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Virtual Machines Licenses' group by 1,2; -status: active -tables: -- Virtual Machines Licenses -tags: - category: - - Licensing diff --git a/analytics/cloud-spend/virtual_network.yaml b/analytics/cloud-spend/virtual_network.yaml deleted file mode 100755 index 93f7e161a..000000000 --- a/analytics/cloud-spend/virtual_network.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual Network -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Virtual Network' group by 1,2; -status: active -tables: -- Virtual Network -tags: - category: - - Network diff --git a/analytics/cloud-spend/virtual_wan.yaml b/analytics/cloud-spend/virtual_wan.yaml deleted file mode 100755 index 49c1f8ed3..000000000 --- a/analytics/cloud-spend/virtual_wan.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: Virtual WAN -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'Virtual WAN' group by 1,2; -status: active -tables: -- Virtual WAN -tags: - category: - - Network diff --git a/analytics/cloud-spend/vpn_gateway.yaml b/analytics/cloud-spend/vpn_gateway.yaml deleted file mode 100755 index a11ea7ed1..000000000 --- a/analytics/cloud-spend/vpn_gateway.yaml +++ /dev/null @@ -1,10 +0,0 @@ -integrationType: -- azure_subscription -name: VPN Gateway -query: SELECT og_account_id, usage_date::text as date, sum(cost) FROM azure_costmanagement_costbyresourcetype WHERE service_name = 'VPN Gateway' group by 1,2; -status: active -tables: -- VPN Gateway -tags: - category: - - Network diff --git a/compliance/controls/pending/aws/aws_backup_report_plan_configured.yaml b/compliance/controls/pending/aws/aws_backup_report_plan_configured.yaml deleted file mode 100644 index ae4e6488a..000000000 --- a/compliance/controls/pending/aws/aws_backup_report_plan_configured.yaml +++ /dev/null @@ -1,48 +0,0 @@ -Description: Ensure that there is a minimum of one backup report plan in each region. The rule will be considered non-compliant if a region with backup plans does not have any backup report plans. -ID: aws_backup_report_plan_configured -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH backup_plan_configured_regions AS ( - SELECT - DISTINCT region, - account_id - FROM - aws_backup_plan - GROUP BY - region, - account_id - ), backup_report_plan_configured AS ( - SELECT - DISTINCT region, - account_id - FROM - aws_backup_report_plan - GROUP BY - region, - account_id - ) - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN cp.region IS NOT NULL AND rp.region IS NOT NULL THEN 'ok' - WHEN cp.region IS NOT NULL AND rp.region IS NULL THEN 'alarm' - ELSE 'info' - END AS status, - CASE - WHEN cp.region IS NOT NULL AND rp.region IS NOT NULL THEN 'Backup report plan(s) exist in region ' || r.region || '.' - WHEN cp.region IS NOT NULL AND rp.region IS NULL THEN 'No backup report plan(s) exist in region ' || r.region || '.' - ELSE 'No backup plan(s) configured in region ' || r.region || '.' - END AS reason - FROM - aws_region AS r - LEFT JOIN backup_plan_configured_regions AS cp ON r.account_id = cp.account_id AND r.region = cp.region - LEFT JOIN backup_report_plan_configured AS rp ON r.account_id = rp.account_id AND r.region = rp.region; -Severity: low -Tags: {} -Title: Backup report plan should exist in a region where backup plan is enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_compute_service_v100_2_7.yaml b/compliance/controls/pending/aws/aws_cis_compute_service_v100_2_7.yaml deleted file mode 100644 index 0cf68021d..000000000 --- a/compliance/controls/pending/aws/aws_cis_compute_service_v100_2_7.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: When an EC2 instance is launched a specified custom security group should be assigned to the instance. -ID: aws_cis_compute_service_v100_2_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) = 0 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has inbound and outbound rules.' - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) = 0 - THEN 'Default security group ' || group_id || ' has inbound rules.' - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has outbound rules.' - ELSE 'Default security group ' || group_id || ' has no inbound or outbound rules.' - END AS reason - FROM - aws_vpc_security_group - WHERE - group_name = 'default'; -Severity: low -Tags: {} -Title: 2.7 Ensure Default EC2 Security groups are not being used \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_compute_service_v100_3_4.yaml b/compliance/controls/pending/aws/aws_cis_compute_service_v100_3_4.yaml deleted file mode 100644 index 7903da5b5..000000000 --- a/compliance/controls/pending/aws/aws_cis_compute_service_v100_3_4.yaml +++ /dev/null @@ -1,55 +0,0 @@ -Description: Any ports enable within Lightsail by default are open and exposed to the world. For SSH and RDP access you should identify which IP address need access. -ID: aws_cis_compute_service_v100_3_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH open_ports AS ( - SELECT - name, - JSONB_ARRAY_ELEMENTS(networking -> 'Ports') AS port - FROM - aws_lightsail_instance - ), - port_cidrs AS ( - SELECT - op.name, - (op.port ->> 'FromPort')::int AS from_port, - (op.port ->> 'ToPort')::int AS to_port, - op.port ->> 'Protocol' AS protocol, - JSONB_ARRAY_ELEMENTS_TEXT(op.port -> 'Cidrs') AS cidr - FROM - open_ports op - ), - unrestricted_ssh_ports AS ( - SELECT - name - FROM - port_cidrs - WHERE - from_port = 22 - AND to_port = 22 - AND protocol = 'tcp' - AND cidr = '0.0.0.0/0' - ) - SELECT - i.name AS resource, - CASE - WHEN usp.name IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN usp.name IS NULL THEN i.name || ' has SSH (22) restricted to specific IP addresses.' - ELSE i.name || ' has SSH (22) open to the world (0.0.0.0/0).' - END AS reason, - i.tags - FROM - aws_lightsail_instance i - LEFT JOIN unrestricted_ssh_ports usp ON i.name = usp.name; -Severity: low -Tags: {} -Title: 3.4 Ensure SSH is restricted to only IP address that should have this access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_1_10.yaml b/compliance/controls/pending/aws/aws_cis_v120_1_10.yaml deleted file mode 100644 index ce22ab891..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_1_10.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: IAM password policies can prevent the reuse of a given password by the same user. It is recommended that the password policy prevent the reuse of passwords. -ID: aws_cis_v120_1_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN password_reuse_prevention >= 24 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN password_reuse_prevention IS NULL THEN 'Password reuse prevention not set.' - ELSE 'Password reuse prevention set to ' || password_reuse_prevention || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol - ON - a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.10 Ensure IAM password policy prevents password reuse \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_1_14.yaml b/compliance/controls/pending/aws/aws_cis_v120_1_14.yaml deleted file mode 100644 index 82752980a..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_1_14.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: The root account is the most privileged user in an AWS account. MFA adds an extra layer of protection on top of a user name and password. With MFA enabled, when a user signs in to an AWS website, they will be prompted for their user name and password as well as for an authentication code from their AWS MFA device. For Level 2, it is recommended that the root account be protected with a hardware MFA. -ID: aws_cis_v120_1_14 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || s.partition || ':::' || s.account_id AS resource, - CASE - WHEN s.account_mfa_enabled AND d.serial_number IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.account_mfa_enabled = FALSE THEN 'MFA not enabled for root account.' - WHEN d.serial_number IS NOT NULL THEN 'MFA enabled for root account, but the MFA associated is a virtual device.' - ELSE 'Hardware MFA device enabled for root account.' - END AS reason - FROM - aws_iam_account_summary AS s - LEFT JOIN - aws_iam_virtual_mfa_device AS d - ON (d.user ->> 'Arn') = 'arn:' || s.partition || ':iam::' || s.account_id || ':root'; -Severity: low -Tags: {} -Title: 1.14 Ensure hardware MFA is enabled for the "root" account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_1_5.yaml b/compliance/controls/pending/aws/aws_cis_v120_1_5.yaml deleted file mode 100644 index e25c01586..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_1_5.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Password policies are, in part, used to enforce password complexity requirements. IAM password policies can be used to ensure password are comprised of different character sets. It is recommended that the password policy require at least one uppercase letter. -ID: aws_cis_v120_1_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN require_uppercase_characters THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN require_uppercase_characters THEN 'Uppercase character required.' - ELSE 'Uppercase character not required.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol - ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.5 Ensure IAM password policy requires at least one uppercase letter \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_1_6.yaml b/compliance/controls/pending/aws/aws_cis_v120_1_6.yaml deleted file mode 100644 index 517a3eaf0..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_1_6.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: Password policies are, in part, used to enforce password complexity requirements. IAM password policies can be used to ensure password are comprised of different character sets. It is recommended that the password policy require at least one lowercase letter. -ID: aws_cis_v120_1_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN require_lowercase_characters THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN require_lowercase_characters THEN 'Lowercase character required.' - ELSE 'Lowercase character not required.' - END AS reason - FROM - aws_account AS a - LEFT JOIN aws_iam_account_password_policy AS pol ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.6 Ensure IAM password policy require at least one lowercase letter \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_1_7.yaml b/compliance/controls/pending/aws/aws_cis_v120_1_7.yaml deleted file mode 100644 index 5eef1782a..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_1_7.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Password policies are, in part, used to enforce password complexity requirements. IAM password policies can be used to ensure passwords are comprised of different character sets. It is recommended that the password policy require at least one symbol. -ID: aws_cis_v120_1_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN require_symbols THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN require_symbols THEN 'Symbol required.' - ELSE 'Symbol not required.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol - ON - a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.7 Ensure IAM password policy requires at least one symbol \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_1_9.yaml b/compliance/controls/pending/aws/aws_cis_v120_1_9.yaml deleted file mode 100644 index 4c123f9e6..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_1_9.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: Password policies are, in part, used to enforce password complexity requirements. IAM password policies can be used to ensure passwords are at least a given length. It is recommended that the password policy require a minimum password length of 14. -ID: aws_cis_v120_1_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN minimum_password_length >= 14 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - ELSE 'Minimum password length set to ' || minimum_password_length || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.9 Ensure IAM password policy requires minimum length of 14 or greater \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_2_1.yaml b/compliance/controls/pending/aws/aws_cis_v120_2_1.yaml deleted file mode 100644 index 5d7d7c2fc..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_2_1.yaml +++ /dev/null @@ -1,50 +0,0 @@ -Description: AWS CloudTrail is a web service that records AWS API calls for your account and delivers log files to you. The recorded information includes the identity of the API caller, the time of the API call, the source IP address of the API caller, the request parameters, and the response elements returned by the AWS service. CloudTrail provides a history of AWS API calls for an account, including API calls made via the Management Console, SDKs, command line tools, and higher-level AWS services (such as CloudFormation). -ID: aws_cis_v120_2_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH event_selectors_trail_details AS ( - SELECT DISTINCT - account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) AS e - WHERE - is_logging - AND is_multi_region_trail - AND e ->> 'ReadWriteType' = 'All' - ), - advanced_event_selectors_trail_details AS ( - SELECT DISTINCT - account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements_text(advanced_event_selectors) AS a - WHERE - is_logging - AND is_multi_region_trail - AND advanced_event_selectors IS NOT NULL - AND NOT a LIKE '%readOnly%' - ) - SELECT - a.title AS resource, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'cloudtrail disabled.' - ELSE 'cloudtrail enabled.' - END AS reason - FROM - aws_account AS a - LEFT JOIN event_selectors_trail_details AS d ON d.account_id = a.account_id - LEFT JOIN advanced_event_selectors_trail_details AS ad ON ad.account_id = a.account_id; -Severity: low -Tags: {} -Title: 2.1 Ensure CloudTrail is enabled in all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_1.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_1.yaml deleted file mode 100644 index 7eee7c27d..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_1.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for unauthorized API calls. -ID: aws_cis_v120_3_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\$.errorCode\s*=\s*"*UnauthorizedOperation".+\$.errorCode\s*=\s*"AccessDenied*".+\$.sourceIPAddress\s*!=\s*"delivery.logs.amazonaws.com".+\$.eventName\s*!=\s*"HeadBucket"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for unauthorized API calls.' - ELSE filter_name || ' forwards events for unauthorized API calls.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.1 Ensure a log metric filter and alarm exist for unauthorized API calls \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_10.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_10.yaml deleted file mode 100644 index 2b291def3..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_10.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Security Groups are a stateful packet filter that controls ingress and egress traffic within a VPC. It is recommended that a metric filter and alarm be established for changes to Security Groups. -ID: aws_cis_v120_3_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*AuthorizeSecurityGroupIngress.+\$\.eventName\s*=\s*AuthorizeSecurityGroupEgress.+\$\.eventName\s*=\s*RevokeSecurityGroupIngress.+\$\.eventName\s*=\s*RevokeSecurityGroupEgress.+\$\.eventName\s*=\s*CreateSecurityGroup.+\$\.eventName\s*=\s*DeleteSecurityGroup' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for security group changes.' - ELSE filter_name || ' forwards events for security group changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.10 Ensure a log metric filter and alarm exist for security group changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_2.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_2.yaml deleted file mode 100644 index aead5bea6..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_2.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for console logins that are not protected by multi-factor authentication (MFA). -ID: aws_cis_v120_3_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\(\s*\$\.eventName\s*=\s*"ConsoleLogin"\)\s+&&\s+\(\s*\$.additionalEventData\.MFAUsed\s*!=\s*"Yes"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console sign-in without MFA.' - ELSE filter_name || ' forwards events for console sign-in without MFA.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.2 Ensure a log metric filter and alarm exist for Management Console sign-in without MFA \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_3.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_3.yaml deleted file mode 100644 index 7691730ce..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_3.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for root login attempts. -ID: aws_cis_v120_3_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.userIdentity.type\s*=\s*"Root".+\$.userIdentity.invokedBy NOT EXISTS.+\$.eventType\s*!=\s*"AwsServiceEvent"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for usage of "root" account.' - ELSE filter_name || ' forwards events for usage of "root" account.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.3 Ensure a log metric filter and alarm exist for usage of "root" account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_4.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_4.yaml deleted file mode 100644 index 857121aa5..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_4.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v120_3_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*DeleteGroupPolicy.+\$.eventName\s*=\s*DeleteRolePolicy.+\$.eventName\s*=\s*DeleteUserPolicy.+\$.eventName\s*=\s*PutGroupPolicy.+\$.eventName\s*=\s*PutRolePolicy.+\$.eventName\s*=\s*PutUserPolicy.+\$.eventName\s*=\s*CreatePolicy.+\$.eventName\s*=\s*DeletePolicy.+\$.eventName\s*=\s*CreatePolicyVersion.+\$.eventName\s*=\s*DeletePolicyVersion.+\$.eventName\s*=\s*AttachRolePolicy.+\$.eventName\s*=\s*DetachRolePolicy.+\$.eventName\s*=\s*AttachUserPolicy.+\$.eventName\s*=\s*DetachUserPolicy.+\$.eventName\s*=\s*AttachGroupPolicy.+\$.eventName\s*=\s*DetachGroupPolicy' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for IAM policy changes.' - ELSE filter_name || ' forwards events for IAM policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.4 Ensure a log metric filter and alarm exist for IAM policy changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_6.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_6.yaml deleted file mode 100644 index ad19393b9..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_6.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for failed console authentication attempts. -ID: aws_cis_v120_3_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*ConsoleLogin.+\$\..errorMessage\s*=\s*"Failed authentication"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console authentication failures.' - ELSE f.filter_name || ' forwards events for console authentication failures.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.6 Ensure a log metric filter and alarm exist for AWS Management Console authentication failures \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_7.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_7.yaml deleted file mode 100644 index f84a76700..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_7.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for customer created CMKs which have changed state to disabled or scheduled deletion. -ID: aws_cis_v120_3_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventSource\s*=\s*kms.amazonaws.com.+\$\.eventName\s*=\s*DisableKey.+\$\.eventName\s*=\s*ScheduleKeyDeletion' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for disabling/deletion of CMKs.' - ELSE filter_name || ' forwards events for disabling/deletion of CMKs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.7 Ensure a log metric filter and alarm exist for disabling or scheduled deletion of customer created CMKs \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_8.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_8.yaml deleted file mode 100644 index c47cc62c8..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_8.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for changes to S3 bucket policies. -ID: aws_cis_v120_3_8 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*s3.amazonaws.com.+\$.eventName\s*=\s*PutBucketAcl.+\$.eventName\s*=\s*PutBucketPolicy.+\$.eventName\s*=\s*PutBucketCors.+\$.eventName\s*=\s*PutBucketLifecycle.+\$.eventName\s*=\s*PutBucketReplication.+\$.eventName\s*=\s*DeleteBucketPolicy.+\$.eventName\s*=\s*DeleteBucketCors.+\$.eventName\s*=\s*DeleteBucketLifecycle.+\$.eventName\s*=\s*DeleteBucketReplication' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for S3 bucket policy changes.' - ELSE filter_name || ' forwards events for S3 bucket policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.8 Ensure a log metric filter and alarm exist for S3 bucket policy changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_3_9.yaml b/compliance/controls/pending/aws/aws_cis_v120_3_9.yaml deleted file mode 100644 index 34daf0b6e..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_3_9.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to CloudTrail's configurations. -ID: aws_cis_v120_3_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventSource\s*=\s*config.amazonaws.com.+\$\.eventName\s*=\s*StopConfigurationRecorder.+\$\.eventName\s*=\s*DeleteDeliveryChannel.+\$\.eventName\s*=\s*PutDeliveryChannel.+\$\.eventName\s*=\s*PutConfigurationRecorder' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for AWS Config configuration changes.' - ELSE filter_name || ' forwards events for AWS Config configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 3.9 Ensure a log metric filter and alarm exist for AWS Config configuration changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v120_4_3.yaml b/compliance/controls/pending/aws/aws_cis_v120_4_3.yaml deleted file mode 100644 index 8582901dc..000000000 --- a/compliance/controls/pending/aws/aws_cis_v120_4_3.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: A VPC comes with a default security group whose initial settings deny all inbound traffic, allow all outbound traffic, and allow all traffic between instances assigned to the security group. If you don't specify a security group when you launch an instance, the instance is automatically assigned to this default security group. Security groups provide stateful filtering of ingress/egress network traffic to AWS resources. It is recommended that the default security group restrict all traffic. The default VPC in every region should have its default security group updated to comply. Any newly created VPCs will automatically contain a default security group that will need remediation to comply with this recommendation. -ID: aws_cis_v120_4_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) = 0 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) > 0 THEN 'Default security group ' || group_id || ' has inbound and outbound rules.' - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) = 0 THEN 'Default security group ' || group_id || ' has inbound rules.' - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) > 0 THEN 'Default security group ' || group_id || ' has outbound rules.' - ELSE 'Default security group ' || group_id || ' has no inbound or outbound rules.' - END AS reason - FROM - aws_vpc_security_group - WHERE - group_name = 'default'; -Severity: low -Tags: {} -Title: 4.3 Ensure the default security group of every VPC restricts all traffic \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_1_6.yaml b/compliance/controls/pending/aws/aws_cis_v130_1_6.yaml deleted file mode 100644 index c2ed8479f..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_1_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: The root user account is the most privileged user in an AWS account. MFA adds an extra layer of protection on top of a user name and password. With MFA enabled, when a user signs in to an AWS website, they will be prompted for their user name and password as well as for an authentication code from their AWS MFA device. For Level 2, it is recommended that the root user account be protected with a hardware MFA. -ID: aws_cis_v130_1_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || s.partition || ':::' || s.account_id AS resource, - CASE - WHEN s.account_mfa_enabled AND d.serial_number IS NULL THEN 'ok' - ELSE 'alarm' - END status, - CASE - WHEN s.account_mfa_enabled = FALSE THEN 'MFA not enabled for root account.' - WHEN d.serial_number IS NOT NULL THEN 'MFA enabled for root account, but the MFA associated is a virtual device.' - ELSE 'Hardware MFA device enabled for root account.' - END reason - FROM - aws_iam_account_summary AS s - LEFT JOIN - aws_iam_virtual_mfa_device AS d - ON - (d.user ->> 'Arn') = 'arn:' || s.partition || ':iam::' || s.account_id || ':root'; -Severity: low -Tags: {} -Title: 1.6 Ensure hardware MFA is enabled for the "root user" account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_1_9.yaml b/compliance/controls/pending/aws/aws_cis_v130_1_9.yaml deleted file mode 100644 index ed2355d2c..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_1_9.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: IAM password policies can prevent the reuse of a given password by the same user. It is recommended that the password policy prevent the reuse of passwords. -ID: aws_cis_v130_1_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN password_reuse_prevention >= 24 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN password_reuse_prevention IS NULL THEN 'Password reuse prevention not set.' - ELSE 'Password reuse prevention set to ' || password_reuse_prevention || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol - ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.9 Ensure IAM password policy prevents password reuse \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_3_1.yaml b/compliance/controls/pending/aws/aws_cis_v130_3_1.yaml deleted file mode 100644 index b72cb15d6..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_3_1.yaml +++ /dev/null @@ -1,52 +0,0 @@ -Description: AWS CloudTrail is a web service that records AWS API calls for your account and delivers log files to you. The recorded information includes the identity of the API caller, the time of the API call, the source IP address of the API caller, the request parameters, and the response elements returned by the AWS service. CloudTrail provides a history of AWS API calls for an account, including API calls made via the Management Console, SDKs, command line tools, and higher-level AWS services (such as CloudFormation). -ID: aws_cis_v130_3_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH event_selectors_trail_details AS ( - SELECT - DISTINCT account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) AS e - WHERE - is_logging - AND is_multi_region_trail - AND e ->> 'ReadWriteType' = 'All' - ), - advanced_event_selectors_trail_details AS ( - SELECT - DISTINCT account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements_text(advanced_event_selectors) AS a - WHERE - is_logging - AND is_multi_region_trail - AND advanced_event_selectors IS NOT NULL - AND (NOT a LIKE '%readOnly%') - ) - SELECT - a.title AS resource, - CASE - WHEN d.account_id IS NULL - AND ad.account_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN d.account_id IS NULL - AND ad.account_id IS NULL THEN 'cloudtrail disabled.' - ELSE 'cloudtrail enabled.' - END AS reason - FROM - aws_account AS a - LEFT JOIN event_selectors_trail_details AS d ON d.account_id = a.account_id - LEFT JOIN advanced_event_selectors_trail_details AS ad ON ad.account_id = a.account_id -Severity: low -Tags: {} -Title: 3.1 Ensure CloudTrail is enabled in all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_3_9.yaml b/compliance/controls/pending/aws/aws_cis_v130_3_9.yaml deleted file mode 100644 index c297e647c..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_3_9.yaml +++ /dev/null @@ -1,52 +0,0 @@ -Description: VPC Flow Logs is a feature that enables you to capture information about the IP traffic going to and from network interfaces in your VPC. After you've created a flow log, you can view and retrieve its data in Amazon CloudWatch Logs. It is recommended that VPC Flow Logs be enabled for packet "Rejects" for VPCs. -ID: aws_cis_v130_3_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH vpcs AS ( - SELECT - arn, - account_id, - region, - owner_id, - vpc_id, - tags, - _ctx - FROM - aws_vpc - ORDER BY - vpc_id - ), - flowlogs AS ( - SELECT - resource_id, - account_id, - region - FROM - aws_vpc_flow_log - ORDER BY - resource_id - ) - SELECT - v.arn AS resource, - CASE - WHEN v.account_id <> v.owner_id THEN 'skip' - WHEN f.resource_id IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN v.account_id <> v.owner_id THEN v.vpc_id || ' is a shared VPC.' - WHEN f.resource_id IS NOT NULL THEN v.vpc_id || ' flow logging enabled.' - ELSE v.vpc_id || ' flow logging disabled.' - END AS reason - FROM - vpcs AS v - LEFT JOIN flowlogs AS f ON v.vpc_id = f.resource_id; -Severity: low -Tags: {} -Title: 3.9 Ensure VPC flow logging is enabled in all VPCs \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_1.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_1.yaml deleted file mode 100644 index e2f03adb8..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_1.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for unauthorized API calls. -ID: aws_cis_v130_4_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '$.errorCode\s*=\s*"*UnauthorizedOperation".+$.errorCode\s*=\s*"AccessDenied*".+$.sourceIPAddress\s*!=\s*"delivery.logs.amazonaws.com".+$.eventName\s*!=\s*"HeadBucket"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for unauthorized API calls.' - ELSE filter_name || ' forwards events for unauthorized API calls.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.1 Ensure a log metric filter and alarm exist for unauthorized API calls \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_10.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_10.yaml deleted file mode 100644 index c942683b7..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_10.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Security Groups are a stateful packet filter that controls ingress and egress traffic within a VPC. It is recommended that a metric filter and alarm be established for detecting changes to Security Groups. -ID: aws_cis_v130_4_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*AuthorizeSecurityGroupIngress.+\$.eventName\s*=\s*AuthorizeSecurityGroupEgress.+\$.eventName\s*=\s*RevokeSecurityGroupIngress.+\$.eventName\s*=\s*RevokeSecurityGroupEgress.+\$.eventName\s*=\s*CreateSecurityGroup.+\$.eventName\s*=\s*DeleteSecurityGroup' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for security group changes.' - ELSE filter_name || ' forwards events for security group changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.10 Ensure a log metric filter and alarm exist for security group changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_11.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_11.yaml deleted file mode 100644 index 30a116cdf..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_11.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. NACLs are used as a stateless packet filter to control ingress and egress traffic for subnets within a VPC. It is recommended that a metric filter and alarm be established for changes made to NACLs. -ID: aws_cis_v130_4_11 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateNetworkAcl.+\$.eventName\s*=\s*CreateNetworkAclEntry.+\$.eventName\s*=\s*DeleteNetworkAcl.+\$.eventName\s*=\s*DeleteNetworkAclEntry.+\$.eventName\s*=\s*ReplaceNetworkAclEntry.+\$.eventName\s*=\s*ReplaceNetworkAclAssociation' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to NACLs.' - ELSE filter_name || ' forwards events for changes to NACLs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.11 Ensure a log metric filter and alarm exist for changes to Network Access Control Lists (NACL) \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_12.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_12.yaml deleted file mode 100644 index 3a0d80c89..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_12.yaml +++ /dev/null @@ -1,95 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Network gateways are required to send/receive traffic to a destination outside of a VPC. It is recommended that a metric filter and alarm be established for changes to network gateways. -ID: aws_cis_v130_4_12 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ ' - \s*\$\.eventName\s*=\s*CreateCustomerGateway - .+\$\.eventName\s*=\s*DeleteCustomerGateway - .+\$\.eventName\s*=\s*AttachInternetGateway - .+\$\.eventName\s*=\s*CreateInternetGateway - .+\$\.eventName\s*=\s*DeleteInternetGateway - .+\$\.eventName\s*=\s*DetachInternetGateway' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to network gateways.' - ELSE filter_name || ' forwards events for changes to network gateways.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.12 Ensure a log metric filter and alarm exist for changes to network gateways \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_14.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_14.yaml deleted file mode 100644 index bc23221c9..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_14.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is possible to have more than 1 VPC within an account, in addition it is also possible to create a peer connection between 2 VPCs enabling network traffic to route between VPCs. It is recommended that a metric filter and alarm be established for changes made to VPCs. -ID: aws_cis_v130_4_14 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateVpc.+\$.eventName\s*=\s*DeleteVpc.+\$.eventName\s*=\s*ModifyVpcAttribute.+\$.eventName\s*=\s*AcceptVpcPeeringConnection.+\$.eventName\s*=\s*CreateVpcPeeringConnection.+\$.eventName\s*=\s*DeleteVpcPeeringConnection.+\$.eventName\s*=\s*RejectVpcPeeringConnection.+\$.eventName\s*=\s*AttachClassicLinkVpc.+\$.eventName\s*=\s*DetachClassicLinkVpc.+\$.eventName\s*=\s*DisableVpcClassicLink.+\$.eventName\s*=\s*EnableVpcClassicLink' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for VPC changes.' - ELSE filter_name || ' forwards events for VPC changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.14 Ensure a log metric filter and alarm exist for VPC changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_15.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_15.yaml deleted file mode 100644 index 729ad29a1..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_15.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for AWS Organizations changes made in the master AWS Account. -ID: aws_cis_v130_4_15 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ - '\\s*\\$\\.eventSource\\s*=\\s*organizations.amazonaws.com.+\\$\\.eventName\\s*=\\s*"?AcceptHandshake"?.+\\$\\.eventName\\s*=\\s*"?AttachPolicy"?.+\\$\\.eventName\\s*=\\s*"?CreateAccount"?.+\\$\\.eventName\\s*=\\s*"?CreateOrganizationalUnit"?.+\\$\\.eventName\\s*=\\s*"?CreatePolicy"?.+\\$\\.eventName\\s*=\\s*"?DeclineHandshake"?.+\\$\\.eventName\\s*=\\s*"?DeleteOrganization"?.+\\$\\.eventName\\s*=\\s*"?DeleteOrganizationalUnit"?.+\\$\\.eventName\\s*=\\s*"?DeletePolicy"?.+\\$\\.eventName\\s*=\\s*"?DetachPolicy"?.+\\$\\.eventName\\s*=\\s*"?DisablePolicyType"?.+\\$\\.eventName\\s*=\\s*"?EnablePolicyType"?.+\\$\\.eventName\\s*=\\s*"?InviteAccountToOrganization"?.+\\$\\.eventName\\s*=\\s*"?LeaveOrganization"?.+\\$\\.eventName\\s*=\\s*"?MoveAccount"?.+\\$\\.eventName\\s*=\\s*"?RemoveAccountFromOrganization"?.+\\$\\.eventName\\s*=\\s*"?UpdatePolicy"?.+\\$\\.eventName\\s*=\\s*"?UpdateOrganizationalUnit"?' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exists for AWS Organizations changes.' - ELSE filter_name || ' forwards relevant events for AWS Organizations changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.15 Ensure a log metric filter and alarm exists for AWS Organizations changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_2.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_2.yaml deleted file mode 100644 index 35a550024..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_2.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for console logins that are not protected by multi-factor authentication (MFA). -ID: aws_cis_v130_4_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\(\s*\$\.eventName\s*=\s*"ConsoleLogin"\)\s+&&\s+\(\s*\$.additionalEventData\.MFAUsed\s*!=\s*"Yes"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console sign-in without MFA.' - ELSE filter_name || ' forwards events for console sign-in without MFA.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.2 Ensure a log metric filter and alarm exist for Management Console sign-in without MFA \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_4.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_4.yaml deleted file mode 100644 index ac0b1c7e5..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_4.yaml +++ /dev/null @@ -1,86 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v130_4_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*DeleteGroupPolicy.+\$.eventName\s*=\s*DeleteRolePolicy.+\$.eventName\s*=\s*DeleteUserPolicy.+\$.eventName\s*=\s*PutGroupPolicy.+\$.eventName\s*=\s*PutRolePolicy.+\$.eventName\s*=\s*PutUserPolicy.+\$.eventName\s*=\s*CreatePolicy.+\$.eventName\s*=\s*DeletePolicy.+\$.eventName\s*=\s*CreatePolicyVersion.+\$.eventName\s*=\s*DeletePolicyVersion.+\$.eventName\s*=\s*AttachRolePolicy.+\$.eventName\s*=\s*DetachRolePolicy.+\$.eventName\s*=\s*AttachUserPolicy.+\$.eventName\s*=\s*DetachUserPolicy.+\$.eventName\s*=\s*AttachGroupPolicy.+\$.eventName\s*=\s*DetachGroupPolicy' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for IAM policy changes.' - ELSE filter_name || ' forwards events for IAM policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.4 Ensure a log metric filter and alarm exist for IAM policy changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_5.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_5.yaml deleted file mode 100644 index 8199a94ea..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_5.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to CloudTrail's configurations. -ID: aws_cis_v130_4_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateTrail.+\$.eventName\s*=\s*UpdateTrail.+\$.eventName\s*=\s*DeleteTrail.+\$.eventName\s*=\s*StartLogging.+\$.eventName\s*=\s*StopLogging' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for CloudTrail configuration changes.' - ELSE filter_name || ' forwards events for CloudTrail configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.5 Ensure a log metric filter and alarm exist for CloudTrail configuration changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_6.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_6.yaml deleted file mode 100644 index 9cb85f9d0..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_6.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for failed console authentication attempts. -ID: aws_cis_v130_4_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*ConsoleLogin.+\$.errorMessage\s*=\s*"Failed authentication"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console authentication failures.' - ELSE f.filter_name || ' forwards events for console authentication failures.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.6 Ensure a log metric filter and alarm exist for AWS Management Console authentication failures \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_7.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_7.yaml deleted file mode 100644 index 9a7c3fd0e..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_7.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for customer created CMKs which have changed state to disabled or scheduled deletion. -ID: aws_cis_v130_4_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*kms.amazonaws.com.+\$.eventName\s*=\s*DisableKey.+\$.eventName\s*=\s*ScheduleKeyDeletion' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for disabling/deletion of CMKs.' - ELSE filter_name || ' forwards events for disabling/deletion of CMKs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.7 Ensure a log metric filter and alarm exist for disabling or scheduled deletion of customer created CMKs \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_4_9.yaml b/compliance/controls/pending/aws/aws_cis_v130_4_9.yaml deleted file mode 100644 index 44770ee65..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_4_9.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to CloudTrail's configurations. -ID: aws_cis_v130_4_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*config.amazonaws.com.+\$.eventName\s*=\s*StopConfigurationRecorder.+\$.eventName\s*=\s*DeleteDeliveryChannel.+\$.eventName\s*=\s*PutDeliveryChannel.+\$.eventName\s*=\s*PutConfigurationRecorder' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for AWS Config configuration changes.' - ELSE filter_name || ' forwards events for AWS Config configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.9 Ensure a log metric filter and alarm exist for AWS Config configuration changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_5_1.yaml b/compliance/controls/pending/aws/aws_cis_v130_5_1.yaml deleted file mode 100644 index 8aa452cd0..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_5_1.yaml +++ /dev/null @@ -1,84 +0,0 @@ -Description: The Network Access Control List (NACL) function provide stateless filtering of ingress and egress network traffic to AWS resources. It is recommended that no NACL allows unrestricted ingress access to remote server administration ports, such as SSH to port 22 and RDP to port 3389. -ID: aws_cis_v130_5_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH bad_rules AS ( - SELECT - network_acl_id, - COUNT(*) AS num_bad_rules, - tags, - region, - account_id - FROM - aws_vpc_network_acl, - JSONB_ARRAY_ELEMENTS(entries) AS att - WHERE - att ->> 'Egress' = 'false' - AND ( - att ->> 'CidrBlock' = '0.0.0.0/0' - OR att ->> 'Ipv6CidrBlock' = '::/0' - ) - AND att ->> 'RuleAction' = 'allow' - AND ( - ( - att ->> 'Protocol' = '-1' - AND att ->> 'PortRange' IS NULL - ) - OR ( - (att -> 'PortRange' ->> 'From')::INT <= 22 - AND (att -> 'PortRange' ->> 'To')::INT >= 22 - AND att ->> 'Protocol' IN ('6', '17') - ) - OR ( - (att -> 'PortRange' ->> 'From')::INT <= 3389 - AND (att -> 'PortRange' ->> 'To')::INT >= 3389 - AND att ->> 'Protocol' IN ('6', '17') - ) - ) - GROUP BY - network_acl_id, - region, - account_id, - tags - ORDER BY - network_acl_id, - region, - account_id, - tags - ), - aws_vpc_network_acls AS ( - SELECT - network_acl_id, - tags, - partition, - region, - account_id - FROM - aws_vpc_network_acl - ORDER BY - network_acl_id, - region, - account_id - ) - SELECT - 'arn:' || acl.partition || ':ec2:' || acl.region || ':' || acl.account_id || ':network-acl/' || acl.network_acl_id AS resource, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN acl.network_acl_id || ' does not allow ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - ELSE acl.network_acl_id || ' contains ' || bad_rules.num_bad_rules || ' rule(s) allowing ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - END AS reason - FROM - aws_vpc_network_acls AS acl - LEFT JOIN bad_rules ON bad_rules.network_acl_id = acl.network_acl_id; -Severity: low -Tags: {} -Title: 5.1 Ensure no Network ACLs allow ingress from 0.0.0.0/0 to remote server administration ports \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v130_5_3.yaml b/compliance/controls/pending/aws/aws_cis_v130_5_3.yaml deleted file mode 100644 index 754466cc8..000000000 --- a/compliance/controls/pending/aws/aws_cis_v130_5_3.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: A VPC comes with a default security group whose initial settings deny all inbound traffic, allow all outbound traffic, and allow all traffic between instances assigned to the security group. If you don't specify a security group when you launch an instance, the instance is automatically assigned to this default security group. Security groups provide stateful filtering of ingress/egress network traffic to AWS resources. It is recommended that the default security group restrict all traffic. -ID: aws_cis_v130_5_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) = 0 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has inbound and outbound rules.' - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) = 0 - THEN 'Default security group ' || group_id || ' has inbound rules.' - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has outbound rules.' - ELSE 'Default security group ' || group_id || ' has no inbound or outbound rules.' - END AS reason - FROM - aws_vpc_security_group - WHERE - group_name = 'default'; -Severity: low -Tags: {} -Title: 5.3 Ensure the default security group of every VPC restricts all traffic \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_1_6.yaml b/compliance/controls/pending/aws/aws_cis_v140_1_6.yaml deleted file mode 100644 index 9739d6692..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_1_6.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: The 'root' user account is the most privileged user in an AWS account. MFA adds an extra layer of protection on top of a user name and password. With MFA enabled, when a user signs in to an AWS website, they will be prompted for their user name and password as well as for an authentication code from their AWS MFA device. For Level 2, it is recommended that the root user account be protected with a hardware MFA. -ID: aws_cis_v140_1_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || s.partition || ':::' || s.account_id AS resource, - CASE - WHEN s.account_mfa_enabled AND d.serial_number IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.account_mfa_enabled = FALSE THEN 'MFA not enabled for root account.' - WHEN d.serial_number IS NOT NULL THEN 'MFA enabled for root account, but the MFA associated is a virtual device.' - ELSE 'Hardware MFA device enabled for root account.' - END AS reason - FROM - aws_iam_account_summary AS s - LEFT JOIN aws_iam_virtual_mfa_device AS d - ON (d.user ->> 'Arn') = 'arn:' || s.partition || ':iam::' || s.account_id || ':root'; -Severity: low -Tags: {} -Title: 1.6 Ensure hardware MFA is enabled for the 'root' user account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_1_8.yaml b/compliance/controls/pending/aws/aws_cis_v140_1_8.yaml deleted file mode 100644 index 1bfc681e8..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_1_8.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: Password policies are, in part, used to enforce password complexity requirements. IAM password policies can be used to ensure password are at least a given length. It is recommended that the password policy require a minimum password length 14. -ID: aws_cis_v140_1_8 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN minimum_password_length >= 14 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - ELSE 'Minimum password length set to ' || minimum_password_length || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.8 Ensure IAM password policy requires minimum length of 14 or greater \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_1_9.yaml b/compliance/controls/pending/aws/aws_cis_v140_1_9.yaml deleted file mode 100644 index 4ab96142e..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_1_9.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: IAM password policies can prevent the reuse of a given password by the same user. It is recommended that the password policy prevent the reuse of passwords. -ID: aws_cis_v140_1_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN password_reuse_prevention >= 24 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN password_reuse_prevention IS NULL THEN 'Password reuse prevention not set.' - ELSE 'Password reuse prevention set to ' || password_reuse_prevention || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol - ON - a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.9 Ensure IAM password policy prevents password reuse \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_2_1_5.yaml b/compliance/controls/pending/aws/aws_cis_v140_2_1_5.yaml deleted file mode 100644 index 524566110..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_2_1_5.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Description: Amazon S3 provides Block public access (bucket settings) and Block public access (account settings) to help you manage public access to Amazon S3 resources. By default, S3 buckets and objects are created with public access disabled. However, an IAM principle with sufficient S3 permissions can enable public access at the bucket and/or object level. While enabled, Block public access (bucket settings) prevents an individual bucket, and its contained objects, from becoming publicly accessible. Similarly, Block public access (account settings) prevents all buckets, and contained objects, from becoming publicly accessible across the entire account. -ID: aws_cis_v140_2_1_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN (bucket.block_public_acls OR s3account.block_public_acls) - AND (bucket.block_public_policy OR s3account.block_public_policy) - AND (bucket.ignore_public_acls OR s3account.ignore_public_acls) - AND (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) - THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (bucket.block_public_acls OR s3account.block_public_acls) - AND (bucket.block_public_policy OR s3account.block_public_policy) - AND (bucket.ignore_public_acls OR s3account.ignore_public_acls) - AND (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) - THEN name || ' all public access blocks enabled.' - ELSE name || ' not enabled for: ' || - CONCAT_WS(', ', - CASE WHEN NOT (bucket.block_public_acls OR s3account.block_public_acls) THEN 'block_public_acls' END, - CASE WHEN NOT (bucket.block_public_policy OR s3account.block_public_policy) THEN 'block_public_policy' END, - CASE WHEN NOT (bucket.ignore_public_acls OR s3account.ignore_public_acls) THEN 'ignore_public_acls' END, - CASE WHEN NOT (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) THEN 'restrict_public_buckets' END - ) || '.' - END AS reason - FROM - aws_s3_bucket AS bucket, - aws_s3_account_settings AS s3account - WHERE - s3account.account_id = bucket.account_id; -Severity: low -Tags: {} -Title: 2.1.5 Ensure that S3 Buckets are configured with 'Block public access (bucket settings)' \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_3_1.yaml b/compliance/controls/pending/aws/aws_cis_v140_3_1.yaml deleted file mode 100644 index ef180d5a2..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_3_1.yaml +++ /dev/null @@ -1,58 +0,0 @@ -Description: AWS CloudTrail is a web service that records AWS API calls for your account and delivers log files to - you. The recorded information includes the identity of the API caller, the time of the API call, the source IP - address of the API caller, the request parameters, and the response elements returned by the AWS service. - CloudTrail provides a history of AWS API calls for an account, including API calls made via the Management Console, - SDKs, command line tools, and higher-level AWS services (such as CloudFormation). -ID: aws_cis_v140_3_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH event_selectors_trail_details AS ( - SELECT DISTINCT - account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) AS e - WHERE - (is_logging - AND is_multi_region_trail - AND e ->> 'ReadWriteType' = 'All') - ), - advanced_event_selectors_trail_details AS ( - SELECT DISTINCT - account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements_text(advanced_event_selectors) AS a - WHERE - (is_logging - AND is_multi_region_trail - AND advanced_event_selectors IS NOT NULL - AND (NOT a LIKE '%readOnly%')) - ) - SELECT - a.title AS resource, - CASE - WHEN d.account_id IS NULL - AND ad.account_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN d.account_id IS NULL - AND ad.account_id IS NULL THEN 'cloudtrail disabled.' - ELSE 'cloudtrail enabled.' - END AS reason - FROM - aws_account AS a - LEFT JOIN event_selectors_trail_details AS d - ON d.account_id = a.account_id - LEFT JOIN advanced_event_selectors_trail_details AS ad - ON ad.account_id = a.account_id; -Severity: low -Tags: {} -Title: 3.1 Ensure CloudTrail is enabled in all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_1.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_1.yaml deleted file mode 100644 index 31d103561..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_1.yaml +++ /dev/null @@ -1,93 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for unauthorized API calls. -ID: aws_cis_v140_4_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '$.errorCode\\s*=\\s*"*UnauthorizedOperation"' - AND filter.filter_pattern ~ '$.errorCode\\s*=\\s*"AccessDenied*"' - AND filter.filter_pattern ~ '$.sourceIPAddress\\s*!=\\s*"delivery.logs.amazonaws.com"' - AND filter.filter_pattern ~ '$.eventName\\s*!=\\s*"HeadBucket"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for unauthorized API calls.' - ELSE filter_name || ' forwards events for unauthorized API calls.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.1 Ensure a log metric filter and alarm exist for unauthorized API calls \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_10.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_10.yaml deleted file mode 100644 index c6405bc33..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_10.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Security Groups are a stateful packet filter that controls ingress and egress traffic within a VPC. It is recommended that a metric filter and alarm be established for detecting changes to Security Groups. -ID: aws_cis_v140_4_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*AuthorizeSecurityGroupIngress.+\$\.eventName\s*=\s*AuthorizeSecurityGroupEgress.+\$\.eventName\s*=\s*RevokeSecurityGroupIngress.+\$\.eventName\s*=\s*RevokeSecurityGroupEgress.+\$\.eventName\s*=\s*CreateSecurityGroup.+\$\.eventName\s*=\s*DeleteSecurityGroup' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for security group changes.' - ELSE filter_name || ' forwards events for security group changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.10 Ensure a log metric filter and alarm exist for security group changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_11.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_11.yaml deleted file mode 100644 index f2ca03c56..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_11.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. NACLs are used as a stateless packet filter to control ingress and egress traffic for subnets within a VPC. It is recommended that a metric filter and alarm be established for changes made to NACLs. -ID: aws_cis_v140_4_11 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*CreateNetworkAcl.+\$\.eventName\s*=\s*CreateNetworkAclEntry.+\$\.eventName\s*=\s*DeleteNetworkAcl.+\$\.eventName\s*=\s*DeleteNetworkAclEntry.+\$\.eventName\s*=\s*ReplaceNetworkAclEntry.+\$\.eventName\s*=\s*ReplaceNetworkAclAssociation' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to NACLs.' - ELSE filter_name || ' forwards events for changes to NACLs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.11 Ensure a log metric filter and alarm exist for changes to Network Access Control Lists (NACL) \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_12.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_12.yaml deleted file mode 100644 index 24c1e5863..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_12.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Network gateways are required to send/receive traffic to a destination outside of a VPC. It is recommended that a metric filter and alarm be established for changes to network gateways. -ID: aws_cis_v140_4_12 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateCustomerGateway.+\$.eventName\s*=\s*DeleteCustomerGateway.+\$.eventName\s*=\s*AttachInternetGateway.+\$.eventName\s*=\s*CreateInternetGateway.+\$.eventName\s*=\s*DeleteInternetGateway.+\$.eventName\s*=\s*DetachInternetGateway' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to network gateways.' - ELSE filter_name || ' forwards events for changes to network gateways.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.12 Ensure a log metric filter and alarm exist for changes to network gateways \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_13.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_13.yaml deleted file mode 100644 index ed6c8b44d..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_13.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Routing tables are used to route network traffic between subnets and to network gateways. It is recommended that a metric filter and alarm be established for changes to route tables. -ID: aws_cis_v140_4_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\\s*\\$\\.eventName\\s*=\\s*CreateRoute.+\\$\\.eventName\\s*=\\s*CreateRouteTable.+\\$\\.eventName\\s*=\\s*ReplaceRoute.+\\$\\.eventName\\s*=\\s*ReplaceRouteTableAssociation.+\\$\\.eventName\\s*=\\s*DeleteRouteTable.+\\$\\.eventName\\s*=\\s*DeleteRoute.+\\$\\.eventName\\s*=\\s*DisassociateRouteTable' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for route table changes.' - ELSE filter_name || ' forwards events for route table changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.13 Ensure a log metric filter and alarm exist for route table changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_15.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_15.yaml deleted file mode 100644 index 4d6e2242d..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_15.yaml +++ /dev/null @@ -1,109 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for AWS Organizations changes made in the master AWS Account. -ID: aws_cis_v140_4_15 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ ' - \s*\$\.eventSource\s*=\s*organizations.amazonaws.com - .+ \$\.eventName\s*=\s*"?AcceptHandshake"? - .+ \$\.eventName\s*=\s*"?AttachPolicy"? - .+ \$\.eventName\s*=\s*"?CreateAccount"? - .+ \$\.eventName\s*=\s*"?CreateOrganizationalUnit"? - .+ \$\.eventName\s*=\s*"?CreatePolicy"? - .+ \$\.eventName\s*=\s*"?DeclineHandshake"? - .+ \$\.eventName\s*=\s*"?DeleteOrganization"? - .+ \$\.eventName\s*=\s*"?DeleteOrganizationalUnit"? - .+ \$\.eventName\s*=\s*"?DeletePolicy"? - .+ \$\.eventName\s*=\s*"?DetachPolicy"? - .+ \$\.eventName\s*=\s*"?DisablePolicyType"? - .+ \$\.eventName\s*=\s*"?EnablePolicyType"? - .+ \$\.eventName\s*=\s*"?InviteAccountToOrganization"? - .+ \$\.eventName\s*=\s*"?LeaveOrganization"? - .+ \$\.eventName\s*=\s*"?MoveAccount"? - .+ \$\.eventName\s*=\s*"?RemoveAccountFromOrganization"? - .+ \$\.eventName\s*=\s*"?UpdatePolicy"? - .+ \$\.eventName\s*=\s*"?UpdateOrganizationalUnit"? - ' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exists for AWS Organizations changes.' - ELSE filter_name || ' forwards relevant events for AWS Organizations changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.15 Ensure a log metric filter and alarm exists for AWS Organizations changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_2.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_2.yaml deleted file mode 100644 index 969903263..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_2.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for console logins that are not protected by multi-factor authentication (MFA). -ID: aws_cis_v140_4_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\(\s*\$\.eventName\s*=\s*"ConsoleLogin"\)\s+&&\s+\(\s*\$.additionalEventData\.MFAUsed\s*!=\s*"Yes"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console sign-in without MFA.' - ELSE filter_name || ' forwards events for console sign-in without MFA.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.2 Ensure a log metric filter and alarm exist for Management Console sign-in without MFA \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_3.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_3.yaml deleted file mode 100644 index 9a9bed75d..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_3.yaml +++ /dev/null @@ -1,96 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for root login attempts. -ID: aws_cis_v140_4_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.userIdentity.type\s*=\s*"Root".+\$.userIdentity.invokedBy NOT EXISTS.+\$.eventType\s*!=\s*"AwsServiceEvent"' - ORDER BY - filter_name - ), - - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for usage of "root" account.' - ELSE filter_name || ' forwards events for usage of "root" account.' - END AS reason - - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.3 Ensure a log metric filter and alarm exist for usage of 'root' account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_4.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_4.yaml deleted file mode 100644 index 3bdbcf10b..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_4.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v140_4_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*DeleteGroupPolicy.+\$.eventName\s*=\s*DeleteRolePolicy.+\$.eventName\s*=\s*DeleteUserPolicy.+\$.eventName\s*=\s*PutGroupPolicy.+\$.eventName\s*=\s*PutRolePolicy.+\$.eventName\s*=\s*PutUserPolicy.+\$.eventName\s*=\s*CreatePolicy.+\$.eventName\s*=\s*DeletePolicy.+\$.eventName\s*=\s*CreatePolicyVersion.+\$.eventName\s*=\s*DeletePolicyVersion.+\$.eventName\s*=\s*AttachRolePolicy.+\$.eventName\s*=\s*DetachRolePolicy.+\$.eventName\s*=\s*AttachUserPolicy.+\$.eventName\s*=\s*DetachUserPolicy.+\$.eventName\s*=\s*AttachGroupPolicy.+\$.eventName\s*=\s*DetachGroupPolicy' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for IAM policy changes.' - ELSE filter_name || ' forwards events for IAM policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.4 Ensure a log metric filter and alarm exist for IAM policy changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_6.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_6.yaml deleted file mode 100644 index a8bb9bf03..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_6.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for failed console authentication attempts. -ID: aws_cis_v140_4_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*ConsoleLogin.+\$.errorMessage\s*=\s*"Failed authentication"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console authentication failures.' - ELSE f.filter_name || ' forwards events for console authentication failures.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.6 Ensure a log metric filter and alarm exist for AWS Management Console authentication failures \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_4_9.yaml b/compliance/controls/pending/aws/aws_cis_v140_4_9.yaml deleted file mode 100644 index 81997e97c..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_4_9.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to CloudTrail's configurations. -ID: aws_cis_v140_4_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventSource\s*=\s*config.amazonaws.com.+\$\.eventName\s*=\s*StopConfigurationRecorder.+\$\.eventName\s*=\s*DeleteDeliveryChannel.+\$\.eventName\s*=\s*PutDeliveryChannel.+\$\.eventName\s*=\s*PutConfigurationRecorder' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for AWS Config configuration changes.' - ELSE filter_name || ' forwards events for AWS Config configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id -Severity: low -Tags: {} -Title: 4.9 Ensure a log metric filter and alarm exist for AWS Config configuration changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v140_5_3.yaml b/compliance/controls/pending/aws/aws_cis_v140_5_3.yaml deleted file mode 100644 index 3c79cd6aa..000000000 --- a/compliance/controls/pending/aws/aws_cis_v140_5_3.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: A VPC comes with a default security group whose initial settings deny all inbound traffic, allow all outbound traffic, and allow all traffic between instances assigned to the security group. If you don't specify a security group when you launch an instance, the instance is automatically assigned to this default security group. Security groups provide stateful filtering of ingress/egress network traffic to AWS resources. It is recommended that the default security group restrict all traffic. -ID: aws_cis_v140_5_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) = 0 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has inbound and outbound rules.' - WHEN jsonb_array_length(ip_permissions) > 0 AND jsonb_array_length(ip_permissions_egress) = 0 - THEN 'Default security group ' || group_id || ' has inbound rules.' - WHEN jsonb_array_length(ip_permissions) = 0 AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has outbound rules.' - ELSE 'Default security group ' || group_id || ' has no inbound or outbound rules.' - END AS reason - FROM - aws_vpc_security_group - WHERE - group_name = 'default'; -Severity: low -Tags: {} -Title: 5.3 Ensure the default security group of every VPC restricts all traffic \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_1_20.yaml b/compliance/controls/pending/aws/aws_cis_v150_1_20.yaml deleted file mode 100644 index 3c939b1f6..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_1_20.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable IAM Access analyzer for IAM policies about all resources in each region. IAM Access Analyzer is a technology introduced at AWS reinvent 2019. After the Analyzer is enabled in IAM, scan results are displayed on the console showing the accessible resources. Scans show resources that other accounts and federated users can access, such as KMS keys and IAM roles. So the results allow you to determine if an unintended user is allowed, making it easier for administrators to monitor least privileges access. Access Analyzer analyzes only policies that are applied to resources in the same AWS Region. -ID: aws_cis_v150_1_20 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN r.opt_in_status = 'not-opted-in' THEN 'skip' - WHEN aa.arn IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN r.opt_in_status = 'not-opted-in' THEN r.region || ' region is disabled.' - WHEN aa.arn IS NOT NULL THEN aa.name || ' enabled in ' || r.region || '.' - ELSE 'Access Analyzer not enabled in ' || r.region || '.' - END AS reason - FROM - aws_region AS r - LEFT JOIN aws_accessanalyzer_analyzer AS aa - ON r.account_id = aa.account_id AND r.region = aa.region; -Severity: low -Tags: {} -Title: 1.20 Ensure that IAM Access analyzer is enabled for all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_1_6.yaml b/compliance/controls/pending/aws/aws_cis_v150_1_6.yaml deleted file mode 100644 index ae0e004e2..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_1_6.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: The 'root' user account is the most privileged user in an AWS account. MFA adds an extra layer of protection on top of a user name and password. With MFA enabled, when a user signs in to an AWS website, they will be prompted for their user name and password as well as for an authentication code from their AWS MFA device. For Level 2, it is recommended that the root user account be protected with a hardware MFA. -ID: aws_cis_v150_1_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || s.partition || ':::' || s.account_id AS resource, - CASE - WHEN s.account_mfa_enabled AND d.serial_number IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.account_mfa_enabled = FALSE THEN 'MFA not enabled for root account.' - WHEN d.serial_number IS NOT NULL THEN 'MFA enabled for root account, but the MFA associated is a virtual device.' - ELSE 'Hardware MFA device enabled for root account.' - END AS reason - FROM - aws_iam_account_summary AS s - LEFT JOIN - aws_iam_virtual_mfa_device AS d ON (d.user ->> 'Arn') = 'arn:' || s.partition || ':iam::' || s.account_id || ':root'; -Severity: low -Tags: {} -Title: 1.6 Ensure hardware MFA is enabled for the 'root' user account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_2_1_5.yaml b/compliance/controls/pending/aws/aws_cis_v150_2_1_5.yaml deleted file mode 100644 index ca1124c09..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_2_1_5.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Description: Amazon S3 provides Block public access (bucket settings) and Block public access (account settings) to help you manage public access to Amazon S3 resources. By default, S3 buckets and objects are created with public access disabled. However, an IAM principle with sufficient S3 permissions can enable public access at the bucket and/or object level. While enabled, Block public access (bucket settings) prevents an individual bucket, and its contained objects, from becoming publicly accessible. Similarly, Block public access (account settings) prevents all buckets, and contained objects, from becoming publicly accessible across the entire account. -ID: aws_cis_v150_2_1_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN (bucket.block_public_acls OR s3account.block_public_acls) - AND (bucket.block_public_policy OR s3account.block_public_policy) - AND (bucket.ignore_public_acls OR s3account.ignore_public_acls) - AND (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) - THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (bucket.block_public_acls OR s3account.block_public_acls) - AND (bucket.block_public_policy OR s3account.block_public_policy) - AND (bucket.ignore_public_acls OR s3account.ignore_public_acls) - AND (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) - THEN name || ' all public access blocks enabled.' - ELSE name || ' not enabled for: ' || - CONCAT_WS(', ', - CASE WHEN NOT (bucket.block_public_acls OR s3account.block_public_acls) THEN 'block_public_acls' END, - CASE WHEN NOT (bucket.block_public_policy OR s3account.block_public_policy) THEN 'block_public_policy' END, - CASE WHEN NOT (bucket.ignore_public_acls OR s3account.ignore_public_acls) THEN 'ignore_public_acls' END, - CASE WHEN NOT (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) THEN 'restrict_public_buckets' END - ) || '.' - END AS reason - FROM - aws_s3_bucket AS bucket, - aws_s3_account_settings AS s3account - WHERE - s3account.account_id = bucket.account_id; -Severity: low -Tags: {} -Title: 2.1.5 Ensure that S3 Buckets are configured with 'Block public access (bucket settings)' \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_3_1.yaml b/compliance/controls/pending/aws/aws_cis_v150_3_1.yaml deleted file mode 100644 index 2045272a1..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_3_1.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Description: AWS CloudTrail is a web service that records AWS API calls for your account and delivers log files to you. The recorded information includes the identity of the API caller, the time of the API call, the source IP address of the API caller, the request parameters, and the response elements returned by the AWS service. CloudTrail provides a history of AWS API calls for an account, including API calls made via the Management Console, SDKs, command line tools, and higher-level AWS services (such as CloudFormation). -ID: aws_cis_v150_3_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH event_selectors_trail_details AS ( - SELECT - DISTINCT account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) AS e - WHERE - (is_logging AND is_multi_region_trail AND e ->> 'ReadWriteType' = 'All') - ), - advanced_event_selectors_trail_details AS ( - SELECT - DISTINCT account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements_text(advanced_event_selectors) AS a - WHERE - (is_logging AND is_multi_region_trail AND advanced_event_selectors IS NOT NULL AND (NOT a LIKE '%readOnly%')) - ) - SELECT - a.title AS resource, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'cloudtrail disabled.' - ELSE 'cloudtrail enabled.' - END AS reason - FROM - aws_account AS a - LEFT JOIN event_selectors_trail_details AS d ON d.account_id = a.account_id - LEFT JOIN advanced_event_selectors_trail_details AS ad ON ad.account_id = a.account_id; -Severity: low -Tags: {} -Title: 3.1 Ensure CloudTrail is enabled in all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_1.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_1.yaml deleted file mode 100644 index 2ebf0b502..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_1.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for unauthorized API calls. -ID: aws_cis_v150_4_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '$.errorCode\s*=\s*"*UnauthorizedOperation".+$\.errorCode\s*=\s*"AccessDenied*".+$\.sourceIPAddress\s*!=\s*"delivery.logs.amazonaws.com".+$\.eventName\s*!=\s*"HeadBucket"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for unauthorized API calls.' - ELSE filter_name || ' forwards events for unauthorized API calls.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.1 Ensure a log metric filter and alarm exist for unauthorized API calls \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_11.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_11.yaml deleted file mode 100644 index cad25db7a..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_11.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. NACLs are used as a stateless packet filter to control ingress and egress traffic for subnets within a VPC. It is recommended that a metric filter and alarm be established for changes made to NACLs. -ID: aws_cis_v150_4_11 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateNetworkAcl.+\$.eventName\s*=\s*CreateNetworkAclEntry.+\$.eventName\s*=\s*DeleteNetworkAcl.+\$.eventName\s*=\s*DeleteNetworkAclEntry.+\$.eventName\s*=\s*ReplaceNetworkAclEntry.+\$.eventName\s*=\s*ReplaceNetworkAclAssociation' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to NACLs.' - ELSE filter_name || ' forwards events for changes to NACLs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.11 Ensure a log metric filter and alarm exist for changes to Network Access Control Lists (NACL) \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_12.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_12.yaml deleted file mode 100644 index 0a8cac464..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_12.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Network gateways are required to send/receive traffic to a destination outside of a VPC. It is recommended that a metric filter and alarm be established for changes to network gateways. -ID: aws_cis_v150_4_12 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateCustomerGateway.+\$.eventName\s*=\s*DeleteCustomerGateway.+\$.eventName\s*=\s*AttachInternetGateway.+\$.eventName\s*=\s*CreateInternetGateway.+\$.eventName\s*=\s*DeleteInternetGateway.+\$.eventName\s*=\s*DetachInternetGateway' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to network gateways.' - ELSE filter_name || ' forwards events for changes to network gateways.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.12 Ensure a log metric filter and alarm exist for changes to network gateways \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_13.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_13.yaml deleted file mode 100644 index cf42aad0b..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_13.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. Routing tables are used to route network traffic between subnets and to network gateways. It is recommended that a metric filter and alarm be established for changes to route tables. -ID: aws_cis_v150_4_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateRoute.+\$.eventName\s*=\s*CreateRouteTable.+\$.eventName\s*=\s*ReplaceRoute.+\$.eventName\s*=\s*ReplaceRouteTableAssociation.+\$.eventName\s*=\s*DeleteRouteTable.+\$.eventName\s*=\s*DeleteRoute.+\$.eventName\s*=\s*DisassociateRouteTable' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for route table changes.' - ELSE filter_name || ' forwards events for route table changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.13 Ensure a log metric filter and alarm exist for route table changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_15.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_15.yaml deleted file mode 100644 index a3de8c352..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_15.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for AWS Organizations changes made in the master AWS Account. -ID: aws_cis_v150_4_15 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*organizations.amazonaws.com.+\$.eventName\s*=\s*"?AcceptHandshake"?.+\$.eventName\s*=\s*"?AttachPolicy"?.+\$.eventName\s*=\s*"?CreateAccount"?.+\$.eventName\s*=\s*"?CreateOrganizationalUnit"?.+\$.eventName\s*=\s*"?CreatePolicy"?.+\$.eventName\s*=\s*"?DeclineHandshake"?.+\$.eventName\s*=\s*"?DeleteOrganization"?.+\$.eventName\s*=\s*"?DeleteOrganizationalUnit"?.+\$.eventName\s*=\s*"?DeletePolicy"?.+\$.eventName\s*=\s*"?DetachPolicy"?.+\$.eventName\s*=\s*"?DisablePolicyType"?.+\$.eventName\s*=\s*"?EnablePolicyType"?.+\$.eventName\s*=\s*"?InviteAccountToOrganization"?.+\$.eventName\s*=\s*"?LeaveOrganization"?.+\$.eventName\s*=\s*"?MoveAccount"?.+\$.eventName\s*=\s*"?RemoveAccountFromOrganization"?.+\$.eventName\s*=\s*"?UpdatePolicy"?.+\$.eventName\s*=\s*"?UpdateOrganizationalUnit"?' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exists for AWS Organizations changes.' - ELSE filter_name || ' forwards relevant events for AWS Organizations changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.15 Ensure a log metric filter and alarm exists for AWS Organizations changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_2.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_2.yaml deleted file mode 100644 index a03dd5ab3..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_2.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for console logins that are not protected by multi-factor authentication (MFA). -ID: aws_cis_v150_4_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\(\s*\$\.eventName\s*=\s*\"ConsoleLogin\"\)\s+&&\s+\(\s*\$.additionalEventData\.MFAUsed\s*!=\s*\"Yes\"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console sign-in without MFA.' - ELSE filter_name || ' forwards events for console sign-in without MFA.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.2 Ensure a log metric filter and alarm exist for Management Console sign-in without MFA \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_4.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_4.yaml deleted file mode 100644 index 363da1634..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_4.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v150_4_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*DeleteGroupPolicy.+\$.eventName\s*=\s*DeleteRolePolicy.+\$.eventName\s*=\s*DeleteUserPolicy.+\$.eventName\s*=\s*PutGroupPolicy.+\$.eventName\s*=\s*PutRolePolicy.+\$.eventName\s*=\s*PutUserPolicy.+\$.eventName\s*=\s*CreatePolicy.+\$.eventName\s*=\s*DeletePolicy.+\$.eventName\s*=\s*CreatePolicyVersion.+\$.eventName\s*=\s*DeletePolicyVersion.+\$.eventName\s*=\s*AttachRolePolicy.+\$.eventName\s*=\s*DetachRolePolicy.+\$.eventName\s*=\s*AttachUserPolicy.+\$.eventName\s*=\s*DetachUserPolicy.+\$.eventName\s*=\s*AttachGroupPolicy.+\$.eventName\s*=\s*DetachGroupPolicy' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for IAM policy changes.' - ELSE filter_name || ' forwards events for IAM policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.4 Ensure a log metric filter and alarm exist for IAM policy changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_6.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_6.yaml deleted file mode 100644 index d69714a2d..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_6.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for failed console authentication attempts. -ID: aws_cis_v150_4_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\\s*\\$\\.eventName\\s*=\\s*ConsoleLogin.+\\$\\.errorMessage\\s*=\\s*"Failed authentication"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console authentication failures.' - ELSE f.filter_name || ' forwards events for console authentication failures.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.6 Ensure a log metric filter and alarm exist for AWS Management Console authentication failures \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_4_9.yaml b/compliance/controls/pending/aws/aws_cis_v150_4_9.yaml deleted file mode 100644 index 8dcf0c0b6..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_4_9.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to CloudTrail's configurations. -ID: aws_cis_v150_4_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*config.amazonaws.com.+\$.eventName\s*=\s*StopConfigurationRecorder.+\$.eventName\s*=\s*DeleteDeliveryChannel.+\$.eventName\s*=\s*PutDeliveryChannel.+\$.eventName\s*=\s*PutConfigurationRecorder' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for AWS Config configuration changes.' - ELSE filter_name || ' forwards events for AWS Config configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.9 Ensure a log metric filter and alarm exist for AWS Config configuration changes \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v150_5_1.yaml b/compliance/controls/pending/aws/aws_cis_v150_5_1.yaml deleted file mode 100644 index adac2fc0a..000000000 --- a/compliance/controls/pending/aws/aws_cis_v150_5_1.yaml +++ /dev/null @@ -1,85 +0,0 @@ -Description: The Network Access Control List (NACL) function provides stateless filtering of ingress and egress network traffic to AWS resources. It is recommended that no NACL allows unrestricted ingress access to remote server administration ports, such as SSH to port 22 and RDP to port 3389. -ID: aws_cis_v150_5_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH bad_rules AS ( - SELECT - network_acl_id, - COUNT(*) AS num_bad_rules, - tags, - region, - account_id - FROM - aws_vpc_network_acl, - jsonb_array_elements(entries) AS att - WHERE - att ->> 'Egress' = 'false' - AND ( - att ->> 'CidrBlock' = '0.0.0.0/0' - OR att ->> 'Ipv6CidrBlock' = '::/0' - ) - AND att ->> 'RuleAction' = 'allow' - AND ( - ( - att ->> 'Protocol' = '-1' - AND att ->> 'PortRange' IS NULL - ) - OR ( - (att -> 'PortRange' ->> 'From') :: INT <= 22 - AND (att -> 'PortRange' ->> 'To') :: INT >= 22 - AND att ->> 'Protocol' IN ('6', '17') - ) - OR ( - (att -> 'PortRange' ->> 'From') :: INT <= 3389 - AND (att -> 'PortRange' ->> 'To') :: INT >= 3389 - AND att ->> 'Protocol' IN ('6', '17') - ) - ) - GROUP BY - network_acl_id, - region, - account_id, - tags - ORDER BY - network_acl_id, - region, - account_id, - tags - ), - aws_vpc_network_acls AS ( - SELECT - network_acl_id, - tags, - partition, - region, - account_id - FROM - aws_vpc_network_acl - ORDER BY - network_acl_id, - region, - account_id - ) - SELECT - 'arn:' || acl.partition || ':ec2:' || acl.region || ':' || acl.account_id || ':network-acl/' || acl.network_acl_id AS resource, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN acl.network_acl_id || ' does not allow ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - ELSE acl.network_acl_id || ' contains ' || bad_rules.num_bad_rules || ' rule(s) allowing ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - END AS reason - FROM - aws_vpc_network_acls AS acl - LEFT JOIN - bad_rules ON bad_rules.network_acl_id = acl.network_acl_id; -Severity: low -Tags: {} -Title: 5.1 Ensure no Network ACLs allow ingress from 0.0.0.0/0 to remote server administration ports \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_1_22.yaml b/compliance/controls/pending/aws/aws_cis_v200_1_22.yaml deleted file mode 100644 index 76d0efdac..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_1_22.yaml +++ /dev/null @@ -1,51 +0,0 @@ -Description: AWS CloudShell is a convenient way of running CLI commands against AWS services; a managed IAM policy ('AWSCloudShellFullAccess') provides full access to CloudShell, which allows file upload and download capability between a user's local system and the CloudShell environment. Within the CloudShell environment a user has sudo permissions, and can access the internet. So it is feasible to install file transfer software (for example) and move data from CloudShell to external internet servers. -ID: aws_cis_v200_1_22 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN attached_policy_arns @> '[\"arn:aws:iam::aws:policy/AWSCloudShellFullAccess\"]' THEN 'alarm' - ELSE 'ok' - END status, - CASE - WHEN attached_policy_arns @> '[\"arn:aws:iam::aws:policy/AWSCloudShellFullAccess\"]' THEN 'User ' || title || ' has access to AWSCloudShellFullAccess.' - ELSE 'User ' || title || ' access to AWSCloudShellFullAccess is restricted.' - END AS reason - FROM - aws_iam_user - UNION - SELECT - arn AS resource, - CASE - WHEN attached_policy_arns @> '[\"arn:aws:iam::aws:policy/AWSCloudShellFullAccess\"]' THEN 'alarm' - ELSE 'ok' - END status, - CASE - WHEN attached_policy_arns @> '[\"arn:aws:iam::aws:policy/AWSCloudShellFullAccess\"]' THEN 'Role ' || title || ' has access to AWSCloudShellFullAccess.' - ELSE 'Role ' || title || ' access to AWSCloudShellFullAccess is restricted.' - END AS reason - FROM - aws_iam_role - UNION - SELECT - arn AS resource, - CASE - WHEN attached_policy_arns @> '[\"arn:aws:iam::aws:policy/AWSCloudShellFullAccess\"]' THEN 'alarm' - ELSE 'ok' - END status, - CASE - WHEN attached_policy_arns @> '[\"arn:aws:iam::aws:policy/AWSCloudShellFullAccess\"]' THEN 'Group ' || title || ' has access to AWSCloudShellFullAccess.' - ELSE 'Group ' || title || ' access to AWSCloudShellFullAccess is restricted.' - END AS reason - FROM - aws_iam_group; -Severity: low -Tags: {} -Title: 1.22 Ensure access to AWSCloudShellFullAccess is restricted \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_1_6.yaml b/compliance/controls/pending/aws/aws_cis_v200_1_6.yaml deleted file mode 100644 index cba897a9e..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_1_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: The 'root' user account is the most privileged user in an AWS account. MFA adds an extra layer of protection on top of a user name and password. With MFA enabled, when a user signs in to an AWS website, they will be prompted for their user name and password as well as for an authentication code from their AWS MFA device. For Level 2, it is recommended that the root user account be protected with a hardware MFA. -ID: aws_cis_v200_1_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || s.partition || ':::' || s.account_id AS resource, - CASE - WHEN s.account_mfa_enabled AND d.serial_number IS NULL THEN 'ok' - ELSE 'alarm' - END status, - CASE - WHEN s.account_mfa_enabled = FALSE THEN 'MFA not enabled for root account.' - WHEN d.serial_number IS NOT NULL THEN 'MFA enabled for root account, but the MFA associated is a virtual device.' - ELSE 'Hardware MFA device enabled for root account.' - END reason - FROM - aws_iam_account_summary AS s - LEFT JOIN - aws_iam_virtual_mfa_device AS d - ON - (d.user ->> 'Arn') = 'arn:' || s.partition || ':iam::' || s.account_id || ':root'; -Severity: low -Tags: {} -Title: 1.6 Ensure hardware MFA is enabled for the 'root' user account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_1_9.yaml b/compliance/controls/pending/aws/aws_cis_v200_1_9.yaml deleted file mode 100644 index 3168f6950..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_1_9.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: IAM password policies can prevent the reuse of a given password by the same user. It is recommended that the password policy prevent the reuse of passwords. -ID: aws_cis_v200_1_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN password_reuse_prevention >= 24 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN password_reuse_prevention IS NULL THEN 'Password reuse prevention not set.' - ELSE 'Password reuse prevention set to ' || password_reuse_prevention || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol - ON - a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.9 Ensure IAM password policy prevents password reuse \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_3_1.yaml b/compliance/controls/pending/aws/aws_cis_v200_3_1.yaml deleted file mode 100644 index b28878461..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_3_1.yaml +++ /dev/null @@ -1,41 +0,0 @@ -Description: AWS CloudTrail is a web service that records AWS API calls for your account and delivers log files to you. The recorded information includes the identity of the API caller, the time of the API call, the source IP address of the API caller, the request parameters, and the response elements returned by the AWS service. CloudTrail provides a history of AWS API calls for an account, including API calls made via the Management Console, SDKs, command line tools, and higher-level AWS services (such as CloudFormation). -ID: aws_cis_v200_3_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH event_selectors_trail_details AS ( - SELECT DISTINCT account_id - FROM aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) AS e - WHERE is_logging AND is_multi_region_trail AND e ->> 'ReadWriteType' = 'All' - ), - advanced_event_selectors_trail_details AS ( - SELECT DISTINCT account_id - FROM aws_cloudtrail_trail, - jsonb_array_elements_text(advanced_event_selectors) AS a - WHERE is_logging - AND is_multi_region_trail - AND advanced_event_selectors IS NOT NULL - AND NOT a LIKE '%readOnly%' - ) - SELECT - a.title AS resource, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'cloudtrail disabled.' - ELSE 'cloudtrail enabled.' - END AS reason - FROM aws_account AS a - LEFT JOIN event_selectors_trail_details AS d ON d.account_id = a.account_id - LEFT JOIN advanced_event_selectors_trail_details AS ad ON ad.account_id = a.account_id; -Severity: low -Tags: {} -Title: 3.1 Ensure CloudTrail is enabled in all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_1.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_1.yaml deleted file mode 100644 index 952782803..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_1.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. -ID: aws_cis_v200_4_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '$.errorCode\\s*=\\s*"\\*UnauthorizedOperation".+$.errorCode\\s*=\\s*"AccessDenied\\*".+$.sourceIPAddress\\s*!=\\s*"delivery.logs.amazonaws.com".+$.eventName\\s*!=\\s*"HeadBucket"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for unauthorized API calls.' - ELSE filter_name || ' forwards events for unauthorized API calls.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.1 Ensure unauthorized API calls are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_10.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_10.yaml deleted file mode 100644 index f7a8d7f71..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_10.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. Security Groups are a stateful packet filter that controls ingress and egress traffic within a VPC. -ID: aws_cis_v200_4_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se->>'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*AuthorizeSecurityGroupIngress.+\$\.eventName\s*=\s*AuthorizeSecurityGroupEgress.+\$\.eventName\s*=\s*RevokeSecurityGroupIngress.+\$\.eventName\s*=\s*RevokeSecurityGroupEgress.+\$\.eventName\s*=\s*CreateSecurityGroup.+\$\.eventName\s*=\s*DeleteSecurityGroup' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for security group changes.' - ELSE filter_name || ' forwards events for security group changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.10 Ensure security group changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_11.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_11.yaml deleted file mode 100644 index 370f79660..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_11.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. NACLs are used as a stateless packet filter to control ingress and egress traffic for subnets within a VPC. It is recommended that a metric filter and alarm be established for changes made to NACLs. -ID: aws_cis_v200_4_11 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\\s*\\$.eventName\\s*=\\s*CreateNetworkAcl.+\\$.eventName\\s*=\\s*CreateNetworkAclEntry.+\\$.eventName\\s*=\\s*DeleteNetworkAcl.+\\$.eventName\\s*=\\s*DeleteNetworkAclEntry.+\\$.eventName\\s*=\\s*ReplaceNetworkAclEntry.+\\$.eventName\\s*=\\s*ReplaceNetworkAclAssociation' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for changes to NACLs.' - ELSE filter_name || ' forwards events for changes to NACLs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.11 Ensure Network Access Control Lists (NACL) changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_13.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_13.yaml deleted file mode 100644 index e55a1c277..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_13.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. Routing tables are used to route network traffic between subnets and to network gateways. It is recommended that a metric filter and alarm be established for changes to route tables. -ID: aws_cis_v200_4_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*CreateRoute.+\$\.eventName\s*=\s*CreateRouteTable.+\$\.eventName\s*=\s*ReplaceRoute.+\$\.eventName\s*=\s*ReplaceRouteTableAssociation.+\$\.eventName\s*=\s*DeleteRouteTable.+\$\.eventName\s*=\s*DeleteRoute.+\$\.eventName\s*=\s*DisassociateRouteTable' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for route table changes.' - ELSE filter_name || ' forwards events for route table changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.13 Ensure route table changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_14.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_14.yaml deleted file mode 100644 index 1cd562482..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_14.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is possible to have more than 1 VPC within an account, in addition it is also possible to create a peer connection between 2 VPCs enabling network traffic to route between VPCs. It is recommended that a metric filter and alarm be established for changes made to VPCs. -ID: aws_cis_v200_4_14 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*CreateVpc.+\s*\$\.eventName\s*=\s*DeleteVpc.+\s*\$\.eventName\s*=\s*ModifyVpcAttribute.+\s*\$\.eventName\s*=\s*AcceptVpcPeeringConnection.+\s*\$\.eventName\s*=\s*CreateVpcPeeringConnection.+\s*\$\.eventName\s*=\s*DeleteVpcPeeringConnection.+\s*\$\.eventName\s*=\s*RejectVpcPeeringConnection.+\s*\$\.eventName\s*=\s*AttachClassicLinkVpc.+\s*\$\.eventName\s*=\s*DetachClassicLinkVpc.+\s*\$\.eventName\s*=\s*DisableVpcClassicLink.+\s*\$\.eventName\s*=\s*EnableVpcClassicLink' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for VPC changes.' - ELSE filter_name || ' forwards events for VPC changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.14 Ensure VPC changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_15.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_15.yaml deleted file mode 100644 index 1b32dfb25..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_15.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for AWS Organizations changes made in the master AWS Account. -ID: aws_cis_v200_4_15 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*organizations.amazonaws.com.+\$.eventName\s*=\s*"?AcceptHandshake"?.+\$.eventName\s*=\s*"?AttachPolicy"?.+\$.eventName\s*=\s*"?CreateAccount"?.+\$.eventName\s*=\s*"?CreateOrganizationalUnit"?.+\$.eventName\s*=\s*"?CreatePolicy"?.+\$.eventName\s*=\s*"?DeclineHandshake"?.+\$.eventName\s*=\s*"?DeleteOrganization"?.+\$.eventName\s*=\s*"?DeleteOrganizationalUnit"?.+\$.eventName\s*=\s*"?DeletePolicy"?.+\$.eventName\s*=\s*"?DetachPolicy"?.+\$.eventName\s*=\s*"?DisablePolicyType"?.+\$.eventName\s*=\s*"?EnablePolicyType"?.+\$.eventName\s*=\s*"?InviteAccountToOrganization"?.+\$.eventName\s*=\s*"?LeaveOrganization"?.+\$.eventName\s*=\s*"?MoveAccount"?.+\$.eventName\s*=\s*"?RemoveAccountFromOrganization"?.+\$.eventName\s*=\s*"?UpdatePolicy"?.+\$.eventName\s*=\s*"?UpdateOrganizationalUnit"?' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exists for AWS Organizations changes.' - ELSE filter_name || ' forwards relevant events for AWS Organizations changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.15 Ensure AWS Organizations changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_16.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_16.yaml deleted file mode 100644 index d790aaeaa..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_16.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Security Hub collects security data from across AWS accounts, services, and supported third-party partner products and helps you analyze your security trends and identify the highest priority security issues. When you enable Security Hub, it begins to consume, aggregate, organize, and prioritize findings from AWS services that you have enabled, such as Amazon GuardDuty, Amazon Inspector, and Amazon Macie. You can also enable integrations with AWS partner security products. -ID: aws_cis_v200_4_16 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN r.region = ANY(ARRAY['af-south-1', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'ap-northeast-3']) THEN 'skip' - WHEN r.opt_in_status = 'not-opted-in' THEN 'skip' - WHEN h.hub_arn IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN r.region = ANY(ARRAY['af-south-1', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'ap-northeast-3']) THEN r.region || ' region not supported.' - WHEN r.opt_in_status = 'not-opted-in' THEN r.region || ' region is disabled.' - WHEN h.hub_arn IS NOT NULL THEN 'Security Hub enabled in ' || r.region || '.' - ELSE 'Security Hub disabled in ' || r.region || '.' - END AS reason - FROM - aws_region AS r - LEFT JOIN - aws_securityhub_hub AS h - ON r.account_id = h.account_id AND r.name = h.region; -Severity: low -Tags: {} -Title: 4.16 Ensure AWS Security Hub is enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_2.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_2.yaml deleted file mode 100644 index 6214c7da3..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_2.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. -ID: aws_cis_v200_4_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\(\s*\$\.eventName\s*=\s*"ConsoleLogin"\)\s+&&\s+\(\s*\$.additionalEventData\.MFAUsed\s*!=\s*"Yes"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console sign-in without MFA.' - ELSE filter_name || ' forwards events for console sign-in without MFA.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.2 Ensure management console sign-in without MFA is monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_4.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_4.yaml deleted file mode 100644 index 4dc8b63d0..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_4.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v200_4_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventName\s*=\s*DeleteGroupPolicy.+\$\.eventName\s*=\s*DeleteRolePolicy.+\$\.eventName\s*=\s*DeleteUserPolicy.+\$\.eventName\s*=\s*PutGroupPolicy.+\$\.eventName\s*=\s*PutRolePolicy.+\$\.eventName\s*=\s*PutUserPolicy.+\$\.eventName\s*=\s*CreatePolicy.+\$\.eventName\s*=\s*DeletePolicy.+\$\.eventName\s*=\s*CreatePolicyVersion.+\$\.eventName\s*=\s*DeletePolicyVersion.+\$\.eventName\s*=\s*AttachRolePolicy.+\$\.eventName\s*=\s*DetachRolePolicy.+\$\.eventName\s*=\s*AttachUserPolicy.+\$\.eventName\s*=\s*DetachUserPolicy.+\$\.eventName\s*=\s*AttachGroupPolicy.+\$\.eventName\s*=\s*DetachGroupPolicy' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for IAM policy changes.' - ELSE filter_name || ' forwards events for IAM policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.4 Ensure IAM policy changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_5.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_5.yaml deleted file mode 100644 index 1104c1b17..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_5.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, where metric filters and alarms can be established. It is recommended that a metric filter and alarm be established changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v200_4_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateTrail.+\$.eventName\s*=\s*UpdateTrail.+\$.eventName\s*=\s*DeleteTrail.+\$.eventName\s*=\s*StartLogging.+\$.eventName\s*=\s*StopLogging' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for CloudTrail configuration changes.' - ELSE filter_name || ' forwards events for CloudTrail configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.5 Ensure CloudTrail configuration changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_7.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_7.yaml deleted file mode 100644 index eefe3bd67..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_7.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for customer created CMKs which have changed state to disabled or scheduled deletion. -ID: aws_cis_v200_4_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*kms.amazonaws.com.+\$.eventName\s*=\s*DisableKey.+\$.eventName\s*=\s*ScheduleKeyDeletion' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for disabling/deletion of CMKs.' - ELSE filter_name || ' forwards events for disabling/deletion of CMKs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.7 Ensure disabling or scheduled deletion of customer created CMKs is monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_8.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_8.yaml deleted file mode 100644 index 17b178da7..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_8.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for changes to S3 bucket policies. -ID: aws_cis_v200_4_8 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventSource\s*=\s*s3.amazonaws.com.+\$\.eventName\s*=\s*PutBucketAcl.+\$\.eventName\s*=\s*PutBucketPolicy.+\$\.eventName\s*=\s*PutBucketCors.+\$\.eventName\s*=\s*PutBucketLifecycle.+\$\.eventName\s*=\s*PutBucketReplication.+\$\.eventName\s*=\s*DeleteBucketPolicy.+\$\.eventName\s*=\s*DeleteBucketCors.+\$\.eventName\s*=\s*DeleteBucketLifecycle.+\$\.eventName\s*=\s*DeleteBucketReplication' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for S3 bucket policy changes.' - ELSE filter_name || ' forwards events for S3 bucket policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.8 Ensure S3 bucket policy changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_4_9.yaml b/compliance/controls/pending/aws/aws_cis_v200_4_9.yaml deleted file mode 100644 index 1e56222f0..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_4_9.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to AWS Config's configurations. -ID: aws_cis_v200_4_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*config.amazonaws.com.+\$.eventName\s*=\s*StopConfigurationRecorder.+\$.eventName\s*=\s*DeleteDeliveryChannel.+\$.eventName\s*=\s*PutDeliveryChannel.+\$.eventName\s*=\s*PutConfigurationRecorder' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for AWS Config configuration changes.' - ELSE filter_name || ' forwards events for AWS Config configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.9 Ensure AWS Config configuration changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v200_5_1.yaml b/compliance/controls/pending/aws/aws_cis_v200_5_1.yaml deleted file mode 100644 index 708efb045..000000000 --- a/compliance/controls/pending/aws/aws_cis_v200_5_1.yaml +++ /dev/null @@ -1,84 +0,0 @@ -Description: The Network Access Control List (NACL) function provides stateless filtering of ingress and egress network traffic to AWS resources. It is recommended that no NACL allows unrestricted ingress access to remote server administration ports, such as SSH to port 22 and RDP to port 3389, using either the TCP (6), UDP (17), or ALL (-1) protocols. -ID: aws_cis_v200_5_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH bad_rules AS ( - SELECT - network_acl_id, - COUNT(*) AS num_bad_rules, - tags, - region, - account_id - FROM - aws_vpc_network_acl, - jsonb_array_elements(entries) AS att - WHERE - att ->> 'Egress' = 'false' - AND ( - att ->> 'CidrBlock' = '0.0.0.0/0' - OR att ->> 'Ipv6CidrBlock' = '::/0' - ) - AND att ->> 'RuleAction' = 'allow' - AND ( - ( - att ->> 'Protocol' = '-1' - AND att ->> 'PortRange' IS NULL - ) - OR ( - (att -> 'PortRange' ->> 'From')::int <= 22 - AND (att -> 'PortRange' ->> 'To')::int >= 22 - AND att ->> 'Protocol' IN ('6', '17') - ) - OR ( - (att -> 'PortRange' ->> 'From')::int <= 3389 - AND (att -> 'PortRange' ->> 'To')::int >= 3389 - AND att ->> 'Protocol' IN ('6', '17') - ) - ) - GROUP BY - network_acl_id, - region, - account_id, - tags - ORDER BY - network_acl_id, - region, - account_id, - tags - ), - aws_vpc_network_acls AS ( - SELECT - network_acl_id, - tags, - partition, - region, - account_id - FROM - aws_vpc_network_acl - ORDER BY - network_acl_id, - region, - account_id - ) - SELECT - 'arn:' || acl.partition || ':ec2:' || acl.region || ':' || acl.account_id || ':network-acl/' || acl.network_acl_id AS resource, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN acl.network_acl_id || ' does not allow ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - ELSE acl.network_acl_id || ' contains ' || bad_rules.num_bad_rules || ' rule(s) allowing ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - END AS reason - FROM - aws_vpc_network_acls AS acl - LEFT JOIN bad_rules ON bad_rules.network_acl_id = acl.network_acl_id; -Severity: low -Tags: {} -Title: 5.1 Ensure no Network ACLs allow ingress from 0.0.0.0/0 to remote server administration ports \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_1_13.yaml b/compliance/controls/pending/aws/aws_cis_v300_1_13.yaml deleted file mode 100644 index 8b5977704..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_1_13.yaml +++ /dev/null @@ -1,33 +0,0 @@ -Description: Access keys are long-term credentials for an IAM user or the AWS account root user. You can use access keys to sign programmatic requests to the AWS CLI or AWS API (directly or using the AWS SDK). -ID: aws_cis_v300_1_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - u.arn AS resource, - CASE - WHEN COUNT(k.*) > 1 THEN 'alarm' - ELSE 'ok' - END AS status, - u.name || ' has ' || COUNT(k.*) || ' active access key(s).' AS reason - FROM - aws_iam_user AS u - LEFT JOIN aws_iam_access_key AS k - ON u.name = k.user_name - AND u.account_id = k.account_id - WHERE - k.status = 'Active' OR k.status IS NULL - GROUP BY - u.arn, - u.name, - u.account_id, - u.tags, - u._ctx; -Severity: low -Tags: {} -Title: 1.13 Ensure there is only one active access key available for any single IAM user \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_1_22.yaml b/compliance/controls/pending/aws/aws_cis_v300_1_22.yaml deleted file mode 100644 index f8b0dfd5d..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_1_22.yaml +++ /dev/null @@ -1,55 +0,0 @@ -Description: AWS CloudShell is a convenient way of running CLI commands against AWS services; a managed IAM policy ('AWSCloudShellFullAccess') provides full access to CloudShell, which allows file upload and download capability between a user's local system and the CloudShell environment. Within the CloudShell environment a user has sudo permissions, and can access the internet. So it is feasible to install file transfer software (for example) and move data from CloudShell to external internet servers. -ID: aws_cis_v300_1_22 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN attached_policy_arns @> '["arn:aws:iam::aws:policy/AWSCloudShellFullAccess"]' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN attached_policy_arns @> '["arn:aws:iam::aws:policy/AWSCloudShellFullAccess"]' THEN 'User ' || title || ' has access to AWSCloudShellFullAccess.' - ELSE 'User ' || title || ' access to AWSCloudShellFullAccess is restricted.' - END AS reason - FROM - aws_iam_user - - UNION - - SELECT - arn AS resource, - CASE - WHEN attached_policy_arns @> '["arn:aws:iam::aws:policy/AWSCloudShellFullAccess"]' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN attached_policy_arns @> '["arn:aws:iam::aws:policy/AWSCloudShellFullAccess"]' THEN 'Role ' || title || ' has access to AWSCloudShellFullAccess.' - ELSE 'Role ' || title || ' access to AWSCloudShellFullAccess is restricted.' - END AS reason - FROM - aws_iam_role - - UNION - - SELECT - arn AS resource, - CASE - WHEN attached_policy_arns @> '["arn:aws:iam::aws:policy/AWSCloudShellFullAccess"]' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN attached_policy_arns @> '["arn:aws:iam::aws:policy/AWSCloudShellFullAccess"]' THEN 'Group ' || title || ' has access to AWSCloudShellFullAccess.' - ELSE 'Group ' || title || ' access to AWSCloudShellFullAccess is restricted.' - END AS reason - FROM - aws_iam_group; -Severity: low -Tags: {} -Title: 1.22 Ensure access to AWSCloudShellFullAccess is restricted \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_1_9.yaml b/compliance/controls/pending/aws/aws_cis_v300_1_9.yaml deleted file mode 100644 index 549541ac2..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_1_9.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: IAM password policies can prevent the reuse of a given password by the same user. It is recommended that the password policy prevent the reuse of passwords. -ID: aws_cis_v300_1_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN password_reuse_prevention >= 24 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN password_reuse_prevention IS NULL THEN 'Password reuse prevention not set.' - ELSE 'Password reuse prevention set to ' || password_reuse_prevention || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN aws_iam_account_password_policy AS pol ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: 1.9 Ensure IAM password policy prevents password reuse \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_2_1_4.yaml b/compliance/controls/pending/aws/aws_cis_v300_2_1_4.yaml deleted file mode 100644 index 956c572a2..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_2_1_4.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Description: Amazon S3 provides Block public access (bucket settings) and Block public access (account settings) to help you manage public access to Amazon S3 resources. By default, S3 buckets and objects are created with public access disabled. However, an IAM principle with sufficient S3 permissions can enable public access at the bucket and/or object level. While enabled, Block public access (bucket settings) prevents an individual bucket, and its contained objects, from becoming publicly accessible. Similarly, Block public access (account settings) prevents all buckets, and contained objects, from becoming publicly accessible across the entire account. -ID: aws_cis_v300_2_1_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN (bucket.block_public_acls OR s3account.block_public_acls) - AND (bucket.block_public_policy OR s3account.block_public_policy) - AND (bucket.ignore_public_acls OR s3account.ignore_public_acls) - AND (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) - THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (bucket.block_public_acls OR s3account.block_public_acls) - AND (bucket.block_public_policy OR s3account.block_public_policy) - AND (bucket.ignore_public_acls OR s3account.ignore_public_acls) - AND (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) - THEN name || ' all public access blocks enabled.' - ELSE name || ' not enabled for: ' || - CONCAT_WS(', ', - CASE WHEN NOT (bucket.block_public_acls OR s3account.block_public_acls) THEN 'block_public_acls' END, - CASE WHEN NOT (bucket.block_public_policy OR s3account.block_public_policy) THEN 'block_public_policy' END, - CASE WHEN NOT (bucket.ignore_public_acls OR s3account.ignore_public_acls) THEN 'ignore_public_acls' END, - CASE WHEN NOT (bucket.restrict_public_buckets OR s3account.restrict_public_buckets) THEN 'restrict_public_buckets' END - ) || '.' - END AS reason - FROM - aws_s3_bucket AS bucket, - aws_s3_account_settings AS s3account - WHERE - s3account.account_id = bucket.account_id; -Severity: low -Tags: {} -Title: 2.1.4 Ensure that S3 Buckets are configured with 'Block public access (bucket settings)' \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_3_1.yaml b/compliance/controls/pending/aws/aws_cis_v300_3_1.yaml deleted file mode 100644 index 93fdd8e75..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_3_1.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Description: AWS CloudTrail is a web service that records AWS API calls for your account and delivers log files to you. The recorded information includes the identity of the API caller, the time of the API call, the source IP address of the API caller, the request parameters, and the response elements returned by the AWS service. CloudTrail provides a history of AWS API calls for an account, including API calls made via the Management Console, SDKs, command line tools, and higher-level AWS services (such as CloudFormation). -ID: aws_cis_v300_3_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH event_selectors_trail_details AS ( - SELECT - DISTINCT account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) AS e - WHERE - (is_logging AND is_multi_region_trail AND e ->> 'ReadWriteType' = 'All') - ), - advanced_event_selectors_trail_details AS ( - SELECT - DISTINCT account_id - FROM - aws_cloudtrail_trail, - jsonb_array_elements_text(advanced_event_selectors) AS a - WHERE - (is_logging AND is_multi_region_trail AND advanced_event_selectors IS NOT NULL AND (NOT a LIKE '%readOnly%')) - ) - SELECT - a.title AS resource, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN d.account_id IS NULL AND ad.account_id IS NULL THEN 'cloudtrail disabled.' - ELSE 'cloudtrail enabled.' - END AS reason - FROM - aws_account AS a - LEFT JOIN event_selectors_trail_details AS d ON d.account_id = a.account_id - LEFT JOIN advanced_event_selectors_trail_details AS ad ON ad.account_id = a.account_id; -Severity: low -Tags: {} -Title: 3.1 Ensure CloudTrail is enabled in all regions \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_3_7.yaml b/compliance/controls/pending/aws/aws_cis_v300_3_7.yaml deleted file mode 100644 index f8abf42fb..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_3_7.yaml +++ /dev/null @@ -1,53 +0,0 @@ -Description: VPC Flow Logs is a feature that enables you to capture information about the IP traffic going to and from network interfaces in your VPC. After you've created a flow log, you can view and retrieve its data in Amazon CloudWatch Logs. It is recommended that VPC Flow Logs be enabled for packet `Rejects` for VPCs. -ID: aws_cis_v300_3_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH vpcs AS ( - SELECT - arn, - account_id, - region, - owner_id, - vpc_id, - tags, - _ctx - FROM - aws_vpc - ORDER BY - vpc_id - ), - flowlogs AS ( - SELECT - resource_id, - account_id, - region - FROM - aws_vpc_flow_log - ORDER BY - resource_id - ) - SELECT - v.arn AS resource, - CASE - WHEN v.account_id <> v.owner_id THEN 'skip' - WHEN f.resource_id IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN v.account_id <> v.owner_id THEN v.vpc_id || ' is a shared VPC.' - WHEN f.resource_id IS NOT NULL THEN v.vpc_id || ' flow logging enabled.' - ELSE v.vpc_id || ' flow logging disabled.' - END AS reason - FROM - vpcs AS v - LEFT JOIN flowlogs AS f - ON v.vpc_id = f.resource_id; -Severity: low -Tags: {} -Title: 3.7 Ensure VPC flow logging is enabled in all VPCs \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_1.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_1.yaml deleted file mode 100644 index ffa52c045..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_1.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. -ID: aws_cis_v300_4_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '$.errorCode\\s*=\\s*"*UnauthorizedOperation".+$.errorCode\\s*=\\s*"AccessDenied*".+$.sourceIPAddress\\s*!=\\s*"delivery.logs.amazonaws.com".+$.eventName\\s*!=\\s*"HeadBucket"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for unauthorized API calls.' - ELSE filter_name || ' forwards events for unauthorized API calls.' - END AS reason - - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id -Severity: low -Tags: {} -Title: 4.1 Ensure unauthorized API calls are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_10.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_10.yaml deleted file mode 100644 index 71f638de3..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_10.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. Security Groups are a stateful packet filter that controls ingress and egress traffic within a VPC. -ID: aws_cis_v300_4_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*AuthorizeSecurityGroupIngress.+\$.eventName\s*=\s*AuthorizeSecurityGroupEgress.+\$.eventName\s*=\s*RevokeSecurityGroupIngress.+\$.eventName\s*=\s*RevokeSecurityGroupEgress.+\$.eventName\s*=\s*CreateSecurityGroup.+\$.eventName\s*=\s*DeleteSecurityGroup' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for security group changes.' - ELSE filter_name || ' forwards events for security group changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.10 Ensure security group changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_13.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_13.yaml deleted file mode 100644 index 93e0ad1b3..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_13.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. Routing tables are used to route network traffic between subnets and to network gateways. It is recommended that a metric filter and alarm be established for changes to route tables. -ID: aws_cis_v300_4_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateRoute.+\$.eventName\s*=\s*CreateRouteTable.+\$.eventName\s*=\s*ReplaceRoute.+\$.eventName\s*=\s*ReplaceRouteTableAssociation.+\$.eventName\s*=\s*DeleteRouteTable.+\$.eventName\s*=\s*DeleteRoute.+\$.eventName\s*=\s*DisassociateRouteTable' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for route table changes.' - ELSE filter_name || ' forwards events for route table changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.13 Ensure route table changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_15.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_15.yaml deleted file mode 100644 index b43be5fb0..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_15.yaml +++ /dev/null @@ -1,91 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for AWS Organizations changes made in the master AWS Account. -ID: aws_cis_v300_4_15 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\\s*\\$\\.eventSource\\s*=\\s*organizations.amazonaws.com.+\\$\\.eventName\\s*=\\s*"? - AcceptHandshake"?+.\\$\\.eventName\\s*=\\s*"AttachPolicy"?+.\\$\\.eventName\\s*=\\s*"CreateAccount"?+.\\$\\.eventName\\s*=\\s*"CreateOrganizationalUnit"?+.\\$\\.eventName\\s*=\\s*"CreatePolicy"?+.\\$\\.eventName\\s*=\\s*"DeclineHandshake"?+.\\$\\.eventName\\s*=\\s*"DeleteOrganization"?+.\\$\\.eventName\\s*=\\s*"DeleteOrganizationalUnit"?+.\\$\\.eventName\\s*=\\s*"DeletePolicy"?+.\\$\\.eventName\\s*=\\s*"DetachPolicy"?+.\\$\\.eventName\\s*=\\s*"DisablePolicyType"?+.\\$\\.eventName\\s*=\\s*"EnablePolicyType"?+.\\$\\.eventName\\s*=\\s*"InviteAccountToOrganization"?+.\\$\\.eventName\\s*=\\s*"LeaveOrganization"?+.\\$\\.eventName\\s*=\\s*"MoveAccount"?+.\\$\\.eventName\\s*=\\s*"RemoveAccountFromOrganization"?+.\\$\\.eventName\\s*=\\s*"UpdatePolicy"?+.\\$\\.eventName\\s*=\\s*"UpdateOrganizationalUnit"?' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exists for AWS Organizations changes.' - ELSE filter_name || ' forwards relevant events for AWS Organizations changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.15 Ensure AWS Organizations changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_16.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_16.yaml deleted file mode 100644 index d23c31cd2..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_16.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Security Hub collects security data from across AWS accounts, services, and supported third-party partner products and helps you analyze your security trends and identify the highest priority security issues. When you enable Security Hub, it begins to consume, aggregate, organize, and prioritize findings from AWS services that you have enabled, such as Amazon GuardDuty, Amazon Inspector, and Amazon Macie. You can also enable integrations with AWS partner security products. -ID: aws_cis_v300_4_16 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN r.region = ANY(array['af-south-1', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'ap-northeast-3']) THEN 'skip' - WHEN r.opt_in_status = 'not-opted-in' THEN 'skip' - WHEN h.hub_arn IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN r.region = ANY(array['af-south-1', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'ap-northeast-3']) THEN r.region || ' region not supported.' - WHEN r.opt_in_status = 'not-opted-in' THEN r.region || ' region is disabled.' - WHEN h.hub_arn IS NOT NULL THEN 'Security Hub enabled in ' || r.region || '.' - ELSE 'Security Hub disabled in ' || r.region || '.' - END AS reason - FROM - aws_region AS r - LEFT JOIN aws_securityhub_hub AS h ON r.account_id = h.account_id AND r.name = h.region -Severity: low -Tags: {} -Title: 4.16 Ensure AWS Security Hub is enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_2.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_2.yaml deleted file mode 100644 index a43c599d6..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_2.yaml +++ /dev/null @@ -1,90 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. -ID: aws_cis_v300_4_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\(\s*\$\.eventName\s*=\s*"ConsoleLogin"\)\s+&&\s+\(\s*\$.additionalEventData\.MFAUsed\s*!=\s*"Yes"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console sign-in without MFA.' - ELSE filter_name || ' forwards events for console sign-in without MFA.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.2 Ensure management console sign-in without MFA is monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_3.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_3.yaml deleted file mode 100644 index 9f6c3e692..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_3.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. -ID: aws_cis_v300_4_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.userIdentity\.type\s*=\s*"Root".+\$\.userIdentity\.invokedBy NOT EXISTS.+\$\.eventType\s*!=\s*"AwsServiceEvent"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for usage of "root" account.' - ELSE filter_name || ' forwards events for usage of "root" account.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.3 Ensure usage of 'root' account is monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_4.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_4.yaml deleted file mode 100644 index 96b1cc43b..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_4.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established changes made to Identity and Access Management (IAM) policies. -ID: aws_cis_v300_4_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*DeleteGroupPolicy.+\$.eventName\s*=\s*DeleteRolePolicy.+\$.eventName\s*=\s*DeleteUserPolicy.+\$.eventName\s*=\s*PutGroupPolicy.+\$.eventName\s*=\s*PutRolePolicy.+\$.eventName\s*=\s*PutUserPolicy.+\$.eventName\s*=\s*CreatePolicy.+\$.eventName\s*=\s*DeletePolicy.+\$.eventName\s*=\s*CreatePolicyVersion.+\$.eventName\s*=\s*DeletePolicyVersion.+\$.eventName\s*=\s*AttachRolePolicy.+\$.eventName\s*=\s*DetachRolePolicy.+\$.eventName\s*=\s*AttachUserPolicy.+\$.eventName\s*=\s*DetachUserPolicy.+\$.eventName\s*=\s*AttachGroupPolicy.+\$.eventName\s*=\s*DetachGroupPolicy' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for IAM policy changes.' - ELSE filter_name || ' forwards events for IAM policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.4 Ensure IAM policy changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_5.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_5.yaml deleted file mode 100644 index 31583f62e..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_5.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, where metric filters and alarms can be established. It is recommended that a metric filter and alarm be utilized for detecting changes to CloudTrail's configurations. -ID: aws_cis_v300_4_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*CreateTrail.+\$.eventName\s*=\s*UpdateTrail.+\$.eventName\s*=\s*DeleteTrail.+\$.eventName\s*=\s*StartLogging.+\$.eventName\s*=\s*StopLogging' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for CloudTrail configuration changes.' - ELSE filter_name || ' forwards events for CloudTrail configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.5 Ensure CloudTrail configuration changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_6.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_6.yaml deleted file mode 100644 index 022b5a471..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_6.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for failed console authentication attempts. -ID: aws_cis_v300_4_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventName\s*=\s*ConsoleLogin.+\$.errorMessage\s*=\s*"Failed authentication"' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for console authentication failures.' - ELSE f.filter_name || ' forwards events for console authentication failures.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.6 Ensure AWS Management Console authentication failures are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_7.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_7.yaml deleted file mode 100644 index 59c77b360..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_7.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for customer created CMKs which have changed state to disabled or scheduled deletion. -ID: aws_cis_v300_4_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$\.eventSource\s*=\s*kms.amazonaws.com.+\$.eventName\s*=\s*DisableKey.+\$.eventName\s*=\s*ScheduleKeyDeletion' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for disabling/deletion of CMKs.' - ELSE filter_name || ' forwards events for disabling/deletion of CMKs.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.7 Ensure disabling or scheduled deletion of customer created CMKs is monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_8.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_8.yaml deleted file mode 100644 index d0e9e231f..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_8.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for changes to S3 bucket policies. -ID: aws_cis_v300_4_8 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - split_part(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - jsonb_array_elements(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - jsonb_array_elements_text(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*s3.amazonaws.com.+\$.eventName\s*=\s*PutBucketAcl.+\$.eventName\s*=\s*PutBucketPolicy.+\$.eventName\s*=\s*PutBucketCors.+\$.eventName\s*=\s*PutBucketLifecycle.+\$.eventName\s*=\s*PutBucketReplication.+\$.eventName\s*=\s*DeleteBucketPolicy.+\$.eventName\s*=\s*DeleteBucketCors.+\$.eventName\s*=\s*DeleteBucketLifecycle.+\$.eventName\s*=\s*DeleteBucketReplication' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for S3 bucket policy changes.' - ELSE filter_name || ' forwards events for S3 bucket policy changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.8 Ensure S3 bucket policy changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_4_9.yaml b/compliance/controls/pending/aws/aws_cis_v300_4_9.yaml deleted file mode 100644 index 709c17b77..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_4_9.yaml +++ /dev/null @@ -1,89 +0,0 @@ -Description: Real-time monitoring of API calls can be achieved by directing CloudTrail Logs to CloudWatch Logs, or an external Security information and event management (SIEM) environment, and establishing corresponding metric filters and alarms. It is recommended that a metric filter and alarm be established for detecting changes to AWS Config's configurations. -ID: aws_cis_v300_4_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH trails AS ( - SELECT - trail.account_id, - trail.name AS trail_name, - trail.is_logging, - SPLIT_PART(trail.log_group_arn, ':', 7) AS log_group_name - FROM - aws_cloudtrail_trail AS trail, - JSONB_ARRAY_ELEMENTS(trail.event_selectors) AS se - WHERE - trail.is_multi_region_trail IS TRUE - AND trail.is_logging - AND se ->> 'ReadWriteType' = 'All' - AND trail.log_group_arn IS NOT NULL - ORDER BY - trail_name - ), - alarms AS ( - SELECT - metric_name, - action_arn AS topic_arn - FROM - aws_cloudwatch_alarm, - JSONB_ARRAY_ELEMENTS_TEXT(aws_cloudwatch_alarm.alarm_actions) AS action_arn - ORDER BY - metric_name - ), - topic_subscriptions AS ( - SELECT - subscription_arn, - topic_arn - FROM - aws_sns_topic_subscription - ORDER BY - subscription_arn - ), - metric_filters AS ( - SELECT - filter.name AS filter_name, - filter_pattern, - log_group_name, - metric_transformation_name - FROM - aws_cloudwatch_log_metric_filter AS filter - WHERE - filter.filter_pattern ~ '\s*\$.eventSource\s*=\s*config.amazonaws.com.+\$.eventName\s*=\s*StopConfigurationRecorder.+\$.eventName\s*=\s*DeleteDeliveryChannel.+\$.eventName\s*=\s*PutDeliveryChannel.+\$.eventName\s*=\s*PutConfigurationRecorder' - ORDER BY - filter_name - ), - filter_data AS ( - SELECT - t.account_id, - t.trail_name, - f.filter_name - FROM - trails AS t - JOIN - metric_filters AS f ON f.log_group_name = t.log_group_name - JOIN - alarms AS alarm ON alarm.metric_name = f.metric_transformation_name - JOIN - topic_subscriptions AS subscription ON subscription.topic_arn = alarm.topic_arn - ) - SELECT - DISTINCT 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN f.trail_name IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN f.trail_name IS NULL THEN 'No log metric filter and alarm exist for AWS Config configuration changes.' - ELSE filter_name || ' forwards events for AWS Config configuration changes.' - END AS reason - FROM - aws_account AS a - LEFT JOIN filter_data AS f ON a.account_id = f.account_id; -Severity: low -Tags: {} -Title: 4.9 Ensure AWS Config configuration changes are monitored \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_5_1.yaml b/compliance/controls/pending/aws/aws_cis_v300_5_1.yaml deleted file mode 100644 index 7691b6253..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_5_1.yaml +++ /dev/null @@ -1,87 +0,0 @@ -Description: The Network Access Control List (NACL) function provide stateless filtering of ingress and - egress network traffic to AWS resources. It is recommended that no NACL allows unrestricted - ingress access to remote server administration ports, such as SSH to port 22 and RDP to - port 3389, using either the TCP (6), UDP (17) or ALL (-1) protocols. -ID: aws_cis_v300_5_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH bad_rules AS ( - SELECT - network_acl_id, - COUNT(*) AS num_bad_rules, - tags, - region, - account_id - FROM - aws_vpc_network_acl, - jsonb_array_elements(entries) AS att - WHERE - att ->> 'Egress' = 'false' - AND ( - att ->> 'CidrBlock' = '0.0.0.0/0' - OR att ->> 'Ipv6CidrBlock' = '::/0' - ) - AND att ->> 'RuleAction' = 'allow' - AND ( - ( - att ->> 'Protocol' = '-1' - AND att ->> 'PortRange' IS NULL - ) - OR ( - (att -> 'PortRange' ->> 'From')::int <= 22 - AND (att -> 'PortRange' ->> 'To')::int >= 22 - AND att ->> 'Protocol' IN ('6', '17') - ) - OR ( - (att -> 'PortRange' ->> 'From')::int <= 3389 - AND (att -> 'PortRange' ->> 'To')::int >= 3389 - AND att ->> 'Protocol' IN ('6', '17') - ) - ) - GROUP BY - network_acl_id, - region, - account_id, - tags - ORDER BY - network_acl_id, - region, - account_id, - tags - ), - aws_vpc_network_acls AS ( - SELECT - network_acl_id, - tags, - partition, - region, - account_id - FROM - aws_vpc_network_acl - ORDER BY - network_acl_id, - region, - account_id - ) - SELECT - 'arn:' || acl.partition || ':ec2:' || acl.region || ':' || acl.account_id || ':network-acl/' || acl.network_acl_id AS resource, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN acl.network_acl_id || ' does not allow ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - ELSE acl.network_acl_id || ' contains ' || bad_rules.num_bad_rules || ' rule(s) allowing ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - END AS reason - FROM - aws_vpc_network_acls AS acl - LEFT JOIN bad_rules ON bad_rules.network_acl_id = acl.network_acl_id; -Severity: low -Tags: {} -Title: 5.1 Ensure no Network ACLs allow ingress from 0.0.0.0/0 to remote server administration ports \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cis_v300_5_4.yaml b/compliance/controls/pending/aws/aws_cis_v300_5_4.yaml deleted file mode 100644 index 8468a616b..000000000 --- a/compliance/controls/pending/aws/aws_cis_v300_5_4.yaml +++ /dev/null @@ -1,37 +0,0 @@ -Description: A VPC comes with a default security group whose initial settings deny all inbound traffic, allow all outbound traffic, and allow all traffic between instances assigned to the security group. If you don't specify a security group when you launch an instance, the instance is automatically assigned to this default security group. Security groups provide stateful filtering of ingress/egress network traffic to AWS resources. It is recommended that the default security group restrict all traffic. -ID: aws_cis_v300_5_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn resource, - CASE - WHEN jsonb_array_length(ip_permissions) = 0 - AND jsonb_array_length(ip_permissions_egress) = 0 - THEN 'ok' - ELSE 'alarm' - END status, - CASE - WHEN jsonb_array_length(ip_permissions) > 0 - AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has inbound and outbound rules.' - WHEN jsonb_array_length(ip_permissions) > 0 - AND jsonb_array_length(ip_permissions_egress) = 0 - THEN 'Default security group ' || group_id || ' has inbound rules.' - WHEN jsonb_array_length(ip_permissions) = 0 - AND jsonb_array_length(ip_permissions_egress) > 0 - THEN 'Default security group ' || group_id || ' has outbound rules.' - ELSE 'Default security group ' || group_id || ' has no inbound or outbound rules.' - END reason - FROM - aws_vpc_security_group - WHERE - group_name = 'default'; -Severity: low -Tags: {} -Title: 5.4 Ensure the default security group of every VPC restricts all traffic \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_cloudfront_distribution_non_s3_origins_encryption_in_transit_enabled.yaml b/compliance/controls/pending/aws/aws_cloudfront_distribution_non_s3_origins_encryption_in_transit_enabled.yaml deleted file mode 100644 index 84211ddf6..000000000 --- a/compliance/controls/pending/aws/aws_cloudfront_distribution_non_s3_origins_encryption_in_transit_enabled.yaml +++ /dev/null @@ -1,60 +0,0 @@ -Description: This control ensures that connection between CloudFront and the origin server is encrypted. It is recommended to enforce HTTPS-only traffic between a CloudFront distribution and the origin. -ID: aws_cloudfront_distribution_non_s3_origins_encryption_in_transit_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH viewer_protocol_policy_value AS ( - SELECT - DISTINCT arn - FROM - aws_cloudfront_distribution, - jsonb_array_elements( - CASE jsonb_typeof(cache_behaviors -> 'Items') - WHEN 'array' THEN (cache_behaviors -> 'Items') - ELSE NULL - END - ) AS cb - WHERE - cb ->> 'ViewerProtocolPolicy' = 'allow-all' - ), - origin_protocol_policy_value AS ( - SELECT - DISTINCT arn, - o -> 'CustomOriginConfig' ->> 'OriginProtocolPolicy' AS origin_protocol_policy - FROM - aws_cloudfront_distribution, - jsonb_array_elements(origins) AS o - WHERE - o -> 'CustomOriginConfig' ->> 'OriginProtocolPolicy' = 'http-only' - OR o -> 'CustomOriginConfig' ->> 'OriginProtocolPolicy' = 'match-viewer' - AND o -> 'S3OriginConfig' IS NULL - ) - SELECT - b.arn AS resource, - CASE - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'http-only' THEN 'alarm' - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'match-viewer' AND - (v.arn IS NOT NULL OR (default_cache_behavior ->> 'ViewerProtocolPolicy' = 'allow-all')) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'http-only' - THEN title || ' origins traffic not encrypted in transit.' - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'match-viewer' AND - (v.arn IS NOT NULL OR (default_cache_behavior ->> 'ViewerProtocolPolicy' = 'allow-all')) - THEN title || ' origins traffic not encrypted in transit.' - ELSE title || ' origins traffic encrypted in transit.' - END AS reason - FROM - aws_cloudfront_distribution AS b - LEFT JOIN origin_protocol_policy_value AS o ON b.arn = o.arn - LEFT JOIN viewer_protocol_policy_value AS v ON b.arn = v.arn; -Severity: low -Tags: {} -Title: CloudFront distributions should encrypt traffic to non S3 origins \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_codedeploy_deployment_group_lambda_allatonce_traffic_shift_disabled.yaml b/compliance/controls/pending/aws/aws_codedeploy_deployment_group_lambda_allatonce_traffic_shift_disabled.yaml deleted file mode 100644 index b34cfbe34..000000000 --- a/compliance/controls/pending/aws/aws_codedeploy_deployment_group_lambda_allatonce_traffic_shift_disabled.yaml +++ /dev/null @@ -1,67 +0,0 @@ -Description: This control checks if the deployment group for Lambda Compute Platform is not using the default deployment configuration. The rule is non-compliant if the deployment group is using the deployment configuration 'CodeDeployDefault.LambdaAllAtOnce'. -ID: aws_codedeploy_deployment_group_lambda_allatonce_traffic_shift_disabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH codedeployment_groups AS ( - SELECT - arn, - application_name, - deployment_config_name, - tags, - title, - region, - account_id, - _ctx - FROM - aws_codedeploy_deployment_group - GROUP BY - arn, - application_name, - deployment_config_name, - tags, - title, - region, - account_id, - _ctx - ), - codedeploy_apps AS ( - SELECT - application_name, - compute_platform, - region, - account_id, - title - FROM - aws_codedeploy_app - GROUP BY - application_name, - compute_platform, - region, - account_id, - title - ) - SELECT - g.arn AS resource, - CASE - WHEN a.compute_platform <> 'Lambda' THEN 'skip' - WHEN deployment_config_name = 'CodeDeployDefault.LambdaAllAtOnce' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN a.compute_platform <> 'Lambda' THEN g.title || ' using ' || a.compute_platform || ' compute platform.' - ELSE g.title || ' using ' || deployment_config_name || ' deployment config.' - END AS reason - FROM - codedeployment_groups AS g, - codedeploy_apps AS a - WHERE - g.application_name = a.application_name; -Severity: low -Tags: {} -Title: Codedeploy deployment groups lambda allatonce traffic shift should be disabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_dms_replication_task_target_database_logging_enabled.yaml b/compliance/controls/pending/aws/aws_dms_replication_task_target_database_logging_enabled.yaml deleted file mode 100644 index 2003e3f83..000000000 --- a/compliance/controls/pending/aws/aws_dms_replication_task_target_database_logging_enabled.yaml +++ /dev/null @@ -1,51 +0,0 @@ -Description: This control checks whether logging is enabled with the minimum severity level of LOGGER_SEVERITY_DEFAULT for DMS replication tasks TARGET_APPLY and TARGET_LOAD. The control fails if logging isn't enabled for these tasks or if the minimum severity level is less than LOGGER_SEVERITY_DEFAULT. -ID: aws_dms_replication_task_target_database_logging_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH replication_task_target_apply AS ( - SELECT - arn - FROM - aws_dms_replication_task, - jsonb_array_elements(replication_task_settings -> 'Logging' -> 'LogComponents') AS o - WHERE - o ->> 'Id' = 'TARGET_APPLY' - AND o ->> 'Severity' IN ('LOGGER_SEVERITY_DEFAULT', 'LOGGER_SEVERITY_DEBUG', 'LOGGER_SEVERITY_DETAILED_DEBUG') - ), replication_task_target_load AS ( - SELECT - arn - FROM - aws_dms_replication_task, - jsonb_array_elements(replication_task_settings -> 'Logging' -> 'LogComponents') AS o - WHERE - o ->> 'Id' = 'TARGET_LOAD' - AND o ->> 'Severity' IN ('LOGGER_SEVERITY_DEFAULT', 'LOGGER_SEVERITY_DEBUG', 'LOGGER_SEVERITY_DETAILED_DEBUG') - ) - SELECT - t.arn AS resource, - (replication_task_settings -> 'Logging' ->> 'EnableLogging')::bool, - CASE - WHEN (replication_task_settings -> 'Logging' ->> 'EnableLogging')::bool - AND a.arn IS NOT NULL - AND l.arn IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (replication_task_settings -> 'Logging' ->> 'EnableLogging')::bool - AND a.arn IS NOT NULL - AND l.arn IS NOT NULL THEN title || ' target database logging enabled.' - ELSE title || 'target database logging disabled.' - END AS reason - FROM - aws_dms_replication_task AS t - LEFT JOIN replication_task_target_apply AS a ON a.arn = t.arn - LEFT JOIN replication_task_target_load AS l ON l.arn = t.arn; -Severity: low -Tags: {} -Title: DMS replication tasks for the target database should have logging enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_docdb_cluster_snapshot_restrict_public_access.yaml b/compliance/controls/pending/aws/aws_docdb_cluster_snapshot_restrict_public_access.yaml deleted file mode 100644 index cb5340481..000000000 --- a/compliance/controls/pending/aws/aws_docdb_cluster_snapshot_restrict_public_access.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: This control checks whether an Amazon DocumentDB manual cluster snapshot is public. The control fails if the manual cluster snapshot is public. -ID: aws_docdb_cluster_snapshot_restrict_public_access -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN (cluster_snapshot ->> 'AttributeName' = 'restore') - AND cluster_snapshot -> 'AttributeValues' = '["all"]' - THEN 'alarm' - ELSE 'ok' - END status, - CASE - WHEN (cluster_snapshot ->> 'AttributeName' = 'restore') - AND cluster_snapshot -> 'AttributeValues' = '["all"]' - THEN title || ' does not restrict public access.' - ELSE title || ' restrict public access.' - END reason - FROM - aws_docdb_cluster_snapshot, - jsonb_array_elements(db_cluster_snapshot_attributes) AS cluster_snapshot; -Severity: low -Tags: {} -Title: Amazon DocumentDB manual cluster snapshots should not be public \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_ec2_instance_no_high_level_finding_in_inspector_scan.yaml b/compliance/controls/pending/aws/aws_ec2_instance_no_high_level_finding_in_inspector_scan.yaml deleted file mode 100644 index c0f05cd21..000000000 --- a/compliance/controls/pending/aws/aws_ec2_instance_no_high_level_finding_in_inspector_scan.yaml +++ /dev/null @@ -1,49 +0,0 @@ -Description: AWS Inspector scans operating system packages installed on your AWS EC2 instances for vulnerabilities and network reachability issues. Each finding has the name of the detected vulnerability and provides a severity rating, information about the affected resource, and details such as how to remediate the reported vulnerability. -ID: aws_ec2_instance_no_high_level_finding_in_inspector_scan -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH severity_list AS ( - SELECT - DISTINCT title, - a ->> 'Value' AS instance_id - FROM - aws_inspector_finding, - jsonb_array_elements(attributes) AS a - WHERE - severity = 'High' - AND asset_type = 'ec2-instance' - AND a ->> 'Key' = 'INSTANCE_ID' - GROUP BY - a ->> 'Value', - title - ), - - ec2_instance_list AS ( - SELECT - DISTINCT instance_id - FROM - severity_list - ) - - SELECT - arn AS resource, - CASE - WHEN l.instance_id IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN l.instance_id IS NULL THEN i.title || ' has no high level finding in inspector scans.' - ELSE i.title || ' has ' || (SELECT COUNT(*) FROM severity_list WHERE instance_id = i.instance_id) || ' high level findings in inspector scans.' - END AS reason - FROM - aws_ec2_instance AS i - LEFT JOIN ec2_instance_list AS l ON i.instance_id = l.instance_id; -Severity: low -Tags: {} -Title: EC2 instances high level findings should not be there in inspector scans \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_database_management_write_access.yaml b/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_database_management_write_access.yaml deleted file mode 100644 index e7a8b1cbb..000000000 --- a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_database_management_write_access.yaml +++ /dev/null @@ -1,80 +0,0 @@ -Description: This control ensures that EC2 instance IAM role does not allow database management write access. -ID: aws_ec2_instance_no_iam_role_with_database_management_write_access -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH iam_roles AS ( - SELECT - r.arn AS role_arn, - i.arn AS instance_arn - FROM - aws_iam_role AS r, - jsonb_array_elements_text(instance_profile_arns) AS p - LEFT JOIN aws_ec2_instance AS i ON p = i.iam_instance_profile_arn - WHERE - i.arn IS NOT NULL - ), - iam_role_with_permission AS ( - SELECT - arn - FROM - aws_iam_role, - jsonb_array_elements(assume_role_policy_std -> 'Statement') AS s, - jsonb_array_elements_text(s -> 'Principal' -> 'Service') AS service, - jsonb_array_elements_text(s -> 'Action') AS action - WHERE - arn IN (SELECT role_arn FROM iam_roles) - AND s ->> 'Effect' = 'Allow' - AND service = 'ec2.amazonaws.com' - AND ( - action IN ( - 'rds:modifydbcluster', - 'rds:modifydbclusterendpoint', - 'rds:modifydbinstance', - 'rds:modifydbsnapshot', - 'rds:modifyglobalcluster', - 'dynamodb:updateitem', - 'dynamodb:updatetable', - 'memorydb:updatecluster', - 'neptune-db:resetdatabase', - 'neptune-db:writedataviaquery', - 'docdb-elastic:updatecluster', - 'elasticache:modifycachecluster', - 'cassandra:alter', - 'cassandra:modify', - 'qldb:executestatement', - 'qldb:partiqlupdate', - 'qldb:sendcommand', - 'qldb:updateledger', - 'redshift:modifycluster', - 'redshift:modifyclustersnapshot', - 'redshift:modifyendpointaccess', - 'timestream:updatedatabase', - 'timestream:updatetable', - 'timestream:writerecords', - '*:*' - ) - ) - ) - SELECT - i.arn AS resource, - CASE - WHEN p.arn IS NULL THEN 'ok' - ELSE 'alarm' - END status, - CASE - WHEN p.arn IS NULL THEN title || ' has no database management write level access.' - ELSE title || ' has database management write level access.' - END AS reason - FROM - aws_ec2_instance AS i - LEFT JOIN iam_roles AS r ON r.instance_arn = i.arn - LEFT JOIN iam_role_with_permission AS p ON p.arn = r.role_arn; -Severity: low -Tags: {} -Title: EC2 instance IAM role should not allow database management write access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_defense_evasion_impact_of_aws_security_services_access.yaml b/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_defense_evasion_impact_of_aws_security_services_access.yaml deleted file mode 100644 index 842415b51..000000000 --- a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_defense_evasion_impact_of_aws_security_services_access.yaml +++ /dev/null @@ -1,70 +0,0 @@ -Description: This control ensures that EC2 instance IAM role does not allow defense evasion impact of AWS security services access. -ID: aws_ec2_instance_no_iam_role_with_defense_evasion_impact_of_aws_security_services_access -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH iam_roles AS ( - SELECT - r.arn AS role_arn, - i.arn AS instance_arn - FROM - aws_iam_role AS r, - JSONB_ARRAY_ELEMENTS_TEXT(instance_profile_arns) AS p - LEFT JOIN aws_ec2_instance AS i ON p = i.iam_instance_profile_arn - WHERE - i.arn IS NOT NULL - ), iam_role_with_permission AS ( - SELECT - arn - FROM - aws_iam_role, - JSONB_ARRAY_ELEMENTS(assume_role_policy_std -> 'Statement') AS s, - JSONB_ARRAY_ELEMENTS_TEXT(s -> 'Principal' -> 'Service') AS service, - JSONB_ARRAY_ELEMENTS_TEXT(s -> 'Action') AS action - WHERE - arn IN (SELECT role_arn FROM iam_roles) - AND s ->> 'Effect' = 'Allow' - AND service = 'ec2.amazonaws.com' - AND action IN ( - 'guardduty:updatedetector', - 'guardduty:deletedetector', - 'guardduty:deletemembers', - 'guardduty:updatefilter', - 'guardduty:deletefilter', - 'shield:disableapplicationlayerautomaticresponse', - 'shield:updateprotectiongroup', - 'shield:deletesubscription', - 'detective:disassociatemembership', - 'detective:deletemembers', - 'inspector:disable', - 'config:stopconfigurationrecorder', - 'config:deleteconfigurationrecorder', - 'config:deleteconfigrule', - 'config:deleteorganizationconfigrule', - 'cloudwatch:disablealarmactions', - 'cloudwatch:disableinsightrules', - '*:*' - ) - ) - SELECT - i.arn AS resource, - CASE - WHEN p.arn IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN p.arn IS NULL THEN title || ' has no IAM role with defense evasion impact of AWS security services access.' - ELSE title || ' has IAM role with defense evasion impact of AWS security services access.' - END AS reason - FROM - aws_ec2_instance AS i - LEFT JOIN iam_roles AS r ON r.instance_arn = i.arn - LEFT JOIN iam_role_with_permission AS p ON p.arn = r.role_arn; -Severity: low -Tags: {} -Title: EC2 instance IAM role should not allow defense evasion impact of AWS security services access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_new_user_creation_with_attached_policy_access.yaml b/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_new_user_creation_with_attached_policy_access.yaml deleted file mode 100644 index 20e312d47..000000000 --- a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_new_user_creation_with_attached_policy_access.yaml +++ /dev/null @@ -1,52 +0,0 @@ -Description: This control ensures that EC2 instance IAM role does not allow new user creation with attached policy access. -ID: aws_ec2_instance_no_iam_role_with_new_user_creation_with_attached_policy_access -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH iam_roles AS ( - SELECT - r.arn AS role_arn, - i.arn AS instance_arn - FROM - aws_iam_role AS r, - jsonb_array_elements_text(instance_profile_arns) AS p - LEFT JOIN aws_ec2_instance AS i ON p = i.iam_instance_profile_arn - WHERE - i.arn IS NOT NULL - ), iam_role_with_permission AS ( - SELECT - arn - FROM - aws_iam_role, - jsonb_array_elements(assume_role_policy_std -> 'Statement') AS s, - jsonb_array_elements_text(s -> 'Principal' -> 'Service') AS service, - jsonb_array_elements_text(s -> 'Action') AS action - WHERE - arn IN (SELECT role_arn FROM iam_roles) - AND s ->> 'Effect' = 'Allow' - AND service = 'ec2.amazonaws.com' - AND action = 'iam:createuser' - AND action = 'iam:attachuserpolicy' - ) - SELECT - i.arn AS resource, - CASE - WHEN p.arn IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN p.arn IS NULL THEN title || ' has no new user creation access with attached policy.' - ELSE title || ' has new user creation access with attached policy.' - END AS reason - FROM - aws_ec2_instance AS i - LEFT JOIN iam_roles AS r ON r.instance_arn = i.arn - LEFT JOIN iam_role_with_permission AS p ON p.arn = r.role_arn; -Severity: low -Tags: {} -Title: EC2 instance IAM role should not allow new user creation with attached policy access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_write_access_to_resource_based_policies.yaml b/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_write_access_to_resource_based_policies.yaml deleted file mode 100644 index 381a1ea07..000000000 --- a/compliance/controls/pending/aws/aws_ec2_instance_no_iam_role_with_write_access_to_resource_based_policies.yaml +++ /dev/null @@ -1,75 +0,0 @@ -Description: This control ensures that EC2 instance IAM role does not allow write access to resource based policies. -ID: aws_ec2_instance_no_iam_role_with_write_access_to_resource_based_policies -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH iam_roles AS ( - SELECT - r.arn AS role_arn, - i.arn AS instance_arn - FROM - aws_iam_role AS r, - jsonb_array_elements_text(instance_profile_arns) AS p - LEFT JOIN aws_ec2_instance AS i ON p = i.iam_instance_profile_arn - WHERE - i.arn IS NOT NULL - ), - iam_role_with_permission AS ( - SELECT - arn - FROM - aws_iam_role, - jsonb_array_elements(assume_role_policy_std -> 'Statement') AS s, - jsonb_array_elements_text(s -> 'Principal' -> 'Service') AS service, - jsonb_array_elements_text(s -> 'Action') AS action - WHERE - arn IN (SELECT role_arn FROM iam_roles) - AND s ->> 'Effect' = 'Allow' - AND service = 'ec2.amazonaws.com' - AND action IN ( - 'ecr:setrepositorypolicy', - 'serverlessrepo:putapplicationpolicy', - 'backup:putbackupvaultaccesspolicy', - 'efs:putfilesystempolicy', - 'glacier:setvaultaccesspolicy', - 'secretsmanager:putresourcepolicy', - 'events:putpermission', - 'mediastore:putcontainerpolicy', - 'glue:putresourcepolicy', - 'ses:putidentitypolicy', - 'lambda:addpermission', - 'lambda:addlayerversionpermission', - 's3:putbucketpolicy', - 's3:putbucketacl', - 's3:putObject', - 's3:putobjectacl', - 'kms:creategrant', - 'kms:putkeypolicy', - 'es:Updateelasticsearchdomainconfig', - 'sns:addpermission', - 'sqs:addpermission', - '*:*' - ) - ) - SELECT - i.arn AS resource, - CASE - WHEN p.arn IS NULL THEN 'ok' - ELSE 'alarm' - END status, - CASE - WHEN p.arn IS NULL THEN title || ' has no write access permission to resource based policies.' - ELSE title || ' has write access permission to resource based policies.' - END AS reason - FROM - aws_ec2_instance AS i - LEFT JOIN iam_roles AS r ON r.intance_arn = i.arn - LEFT JOIN iam_role_with_permission AS p ON p.arn = r.role_arn; -Severity: low -Tags: {} -Title: EC2 instance IAM role should not allow write access to resource based policies \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_ecs_cluster_instance_in_vpc.yaml b/compliance/controls/pending/aws/aws_ecs_cluster_instance_in_vpc.yaml deleted file mode 100644 index b1e0963de..000000000 --- a/compliance/controls/pending/aws/aws_ecs_cluster_instance_in_vpc.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: Deploy AWS ECS cluster instance within an AWS Virtual Private Cloud (AWS VPC) for a secure communication between a instance and other services within the AWS VPC. -ID: aws_ecs_cluster_instance_in_vpc -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - c.arn AS resource, - CASE - WHEN i.vpc_id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN i.vpc_id IS NULL THEN c.title || ' not in VPC.' - ELSE c.title || ' in VPC.' - END AS reason - FROM - aws_ecs_container_instance AS c - LEFT JOIN aws_ec2_instance AS i - ON c.ec2_instance_id = i.instance_id; -Severity: low -Tags: {} -Title: ECS cluster instances should be in a VPC \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_elb_application_lb_listener_certificate_expire_30_days.yaml b/compliance/controls/pending/aws/aws_elb_application_lb_listener_certificate_expire_30_days.yaml deleted file mode 100644 index 98a91d3db..000000000 --- a/compliance/controls/pending/aws/aws_elb_application_lb_listener_certificate_expire_30_days.yaml +++ /dev/null @@ -1,25 +0,0 @@ -Description: This control ensures that SSL/TLS certificates used in application load balancers are renewed 30 days before their expiration date. -ID: aws_elb_application_lb_listener_certificate_expire_30_days -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - load_balancer_arn AS resource, - CASE - WHEN DATE(not_after) - DATE(current_date) >= 30 THEN 'ok' - ELSE 'alarm' - END AS status, - l.title || ' certificate set to expire in ' || EXTRACT(DAY FROM not_after - current_date) || ' days.' AS reason - FROM - aws_ec2_load_balancer_listener AS l, - jsonb_array_elements(certificates) AS c - LEFT JOIN aws_acm_certificate AS a - ON c ->> 'CertificateArn' = a.certificate_arn; -Severity: low -Tags: {} -Title: ELB application load balancers secured listener certificate should not expire within next 30 days \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_elb_application_lb_listener_certificate_expire_7_days.yaml b/compliance/controls/pending/aws/aws_elb_application_lb_listener_certificate_expire_7_days.yaml deleted file mode 100644 index 2f966285b..000000000 --- a/compliance/controls/pending/aws/aws_elb_application_lb_listener_certificate_expire_7_days.yaml +++ /dev/null @@ -1,24 +0,0 @@ -Description: This control ensures that SSL/TLS certificates used in application load balancers are renewed 7 days before their expiration date. -ID: aws_elb_application_lb_listener_certificate_expire_7_days -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - load_balancer_arn AS resource, - CASE - WHEN DATE(not_after) - DATE(current_date) >= 7 THEN 'ok' - ELSE 'alarm' - END AS status, - l.title || ' certificate set to expire in ' || EXTRACT(day FROM not_after - current_date) || ' days.' AS reason - FROM - aws_ec2_load_balancer_listener AS l, - jsonb_array_elements(certificates) AS c - LEFT JOIN aws_acm_certificate AS a ON c ->> 'CertificateArn' = a.certificate_arn; -Severity: low -Tags: {} -Title: ELB application load balancers secured listener certificate should not expire within next 7 days \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_emr_cluster_encryption_at_rest_enabled.yaml b/compliance/controls/pending/aws/aws_emr_cluster_encryption_at_rest_enabled.yaml deleted file mode 100644 index 409ccc2b5..000000000 --- a/compliance/controls/pending/aws/aws_emr_cluster_encryption_at_rest_enabled.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: This control checks whether EMR clusters have encryption at rest enabled. The check fails if encryption at rest is not enabled as sensitive data should be protected. -ID: aws_emr_cluster_encryption_at_rest_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - cluster_arn AS resource, - CASE - WHEN s.name IS NULL THEN 'alarm' - WHEN s.name IS NOT NULL AND (encryption_configuration -> 'EnableAtRestEncryption')::bool THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.name IS NULL THEN c.title || ' security configuration disabled.' - WHEN s.name IS NOT NULL AND (encryption_configuration -> 'EnableAtRestEncryption')::bool THEN c.title || ' encryption at rest enabled.' - ELSE c.title || ' encryption at rest disabled.' - END AS reason - FROM - aws_emr_cluster AS c - LEFT JOIN aws_emr_security_configuration AS s - ON c.security_configuration = s.name - AND s.region = s.region - AND s.account_id = c.account_id; -Severity: low -Tags: {} -Title: EMR clusters encryption at rest should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_emr_cluster_encryption_at_rest_with_cse_cmk.yaml b/compliance/controls/pending/aws/aws_emr_cluster_encryption_at_rest_with_cse_cmk.yaml deleted file mode 100644 index 2bfdc87ed..000000000 --- a/compliance/controls/pending/aws/aws_emr_cluster_encryption_at_rest_with_cse_cmk.yaml +++ /dev/null @@ -1,35 +0,0 @@ -Description: This control checks whether EMR client side encryption (CSE CMK) is enabled with CMK. The check fails if encryption at rest is not enabled with CSE-CMK. -ID: aws_emr_cluster_encryption_at_rest_with_cse_cmk -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - cluster_arn AS resource, - CASE - WHEN s.name IS NULL THEN 'alarm' - WHEN NOT (encryption_configuration -> 'EnableAtRestEncryption')::bool THEN 'alarm' - WHEN (encryption_configuration -> 'AtRestEncryptionConfiguration' -> 'S3EncryptionConfiguration' ->> 'EncryptionMode') = 'CSE-Custom' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.name IS NULL THEN c.title || ' security configuration disabled.' - WHEN NOT (encryption_configuration -> 'EnableAtRestEncryption')::bool THEN c.title || ' encryption at rest disabled.' - WHEN (encryption_configuration -> 'AtRestEncryptionConfiguration' -> 'S3EncryptionConfiguration' ->> 'EncryptionMode') = 'CSE-Custom' THEN c.title || ' encryption at rest enabled with CSE-CMK.' - ELSE c.title || ' encryption at rest not enabled with CSE-CMK.' - END AS reason - FROM - aws_emr_cluster AS c - LEFT JOIN - aws_emr_security_configuration AS s - ON - c.security_configuration = s.name - AND s.region = s.region - AND s.account_id = c.account_id; -Severity: low -Tags: {} -Title: EMR clusters client side encryption (CSE CMK) enabled with CMK \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_emr_cluster_encryption_in_transit_enabled.yaml b/compliance/controls/pending/aws/aws_emr_cluster_encryption_in_transit_enabled.yaml deleted file mode 100644 index 8dae81b9f..000000000 --- a/compliance/controls/pending/aws/aws_emr_cluster_encryption_in_transit_enabled.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: This control checks whether EMR clusters have encryption in transit enabled. This control fails if an EMR cluster isn't encrypted in transit. -ID: aws_emr_cluster_encryption_in_transit_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - cluster_arn AS resource, - CASE - WHEN s.name IS NULL THEN 'alarm' - WHEN s.name IS NOT NULL AND (encryption_configuration -> 'EnableInTransitEncryption')::bool THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.name IS NULL THEN c.title || ' security configuration disabled.' - WHEN s.name IS NOT NULL AND (encryption_configuration -> 'EnableInTransitEncryption')::bool THEN c.title || ' encryption in transit enabled.' - ELSE c.title || ' encryption in transit disabled.' - END AS reason - FROM - aws_emr_cluster AS c - LEFT JOIN - aws_emr_security_configuration AS s - ON c.security_configuration = s.name - AND s.region = s.region - AND s.account_id = c.account_id; -Severity: low -Tags: {} -Title: EMR clusters encryption in transit should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_emr_cluster_local_disk_encryption_enabled.yaml b/compliance/controls/pending/aws/aws_emr_cluster_local_disk_encryption_enabled.yaml deleted file mode 100644 index 955d46aa3..000000000 --- a/compliance/controls/pending/aws/aws_emr_cluster_local_disk_encryption_enabled.yaml +++ /dev/null @@ -1,32 +0,0 @@ -ID: aws_emr_cluster_local_disk_encryption_enabled -Title: "EMR clusters local disk encryption should be enabled" -Description: "This control checks whether EMR clusters have local disk encryption enabled. This control fails if an EMR cluster's local disk isn't encrypted." -Query: - Engine: CloudQL-v0.0.1 - QueryToExecute: | - SELECT - cluster_arn AS resource, - CASE - WHEN s.name IS NULL THEN 'alarm' - WHEN s.name IS NOT NULL - AND (encryption_configuration -> 'EnableAtRestEncryption')::bool - AND (encryption_configuration -> 'AtRestEncryptionConfiguration' -> 'LocalDiskEncryptionConfiguration') IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.name IS NULL THEN c.title || ' security configuration disabled.' - WHEN s.name IS NOT NULL - AND (encryption_configuration -> 'EnableAtRestEncryption')::bool - AND (encryption_configuration -> 'AtRestEncryptionConfiguration' -> 'LocalDiskEncryptionConfiguration') IS NOT NULL THEN c.title || ' local disk encryption enabled.' - ELSE c.title || ' local disk encryption disabled.' - END AS reason - FROM - aws_emr_cluster AS c - LEFT JOIN aws_emr_security_configuration AS s ON c.security_configuration = s.name AND s.region = s.region AND s.account_id = c.account_id; - PrimaryTable: "" - ListOfTables: [] - Parameters: [] -Severity: low -Tags: {} -IntegrationType: - - aws_cloud_account \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_cloudfront_13.yaml b/compliance/controls/pending/aws/aws_foundational_security_cloudfront_13.yaml deleted file mode 100644 index fd310e4fb..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_cloudfront_13.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: This control checks whether an Amazon CloudFront distribution with an Amazon S3 origin has origin access control (OAC) configured. The control fails if OAC isn't configured for the CloudFront distribution. -ID: aws_foundational_security_cloudfront_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN o ->> 'DomainName' NOT LIKE '%s3.amazonaws.com' THEN 'skip' - WHEN o ->> 'DomainName' LIKE '%s3.amazonaws.com' - AND o -> 'S3OriginConfig' ->> 'OriginAccessIdentity' = '' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN o ->> 'DomainName' NOT LIKE '%s3.amazonaws.com' THEN title || ' origin type is not s3.' - WHEN o ->> 'DomainName' LIKE '%s3.amazonaws.com' - AND o -> 'S3OriginConfig' ->> 'OriginAccessIdentity' = '' THEN title || ' origin access identity not configured.' - ELSE title || ' origin access identity configured.' - END AS reason - FROM - aws_cloudfront_distribution, - jsonb_array_elements(origins) AS o; -Severity: medium -Tags: {} -Title: 13 CloudFront distributions should use origin access control \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_cloudfront_9.yaml b/compliance/controls/pending/aws/aws_foundational_security_cloudfront_9.yaml deleted file mode 100644 index 1e847f2c1..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_cloudfront_9.yaml +++ /dev/null @@ -1,56 +0,0 @@ -Description: This control checks if Amazon CloudFront distributions are encrypting traffic to custom origins. This control fails for a CloudFront distribution whose origin protocol policy allows 'http-only'. This control also fails if the distribution's origin protocol policy is 'match-viewer' while the viewer protocol policy is 'allow-all'. -ID: aws_foundational_security_cloudfront_9 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH viewer_protocol_policy_value AS ( - SELECT - DISTINCT arn - FROM - aws_cloudfront_distribution, - jsonb_array_elements( - CASE jsonb_typeof(cache_behaviors -> 'Items') - WHEN 'array' THEN (cache_behaviors -> 'Items') - ELSE NULL - END - ) AS cb - WHERE - cb ->> 'ViewerProtocolPolicy' = 'allow-all' - ), - origin_protocol_policy_value AS ( - SELECT - DISTINCT arn, - o -> 'CustomOriginConfig' ->> 'OriginProtocolPolicy' AS origin_protocol_policy - FROM - aws_cloudfront_distribution, - jsonb_array_elements(origins) AS o - WHERE - o -> 'CustomOriginConfig' ->> 'OriginProtocolPolicy' = 'http-only' - OR o -> 'CustomOriginConfig' ->> 'OriginProtocolPolicy' = 'match-viewer' - ) - SELECT - b.arn AS resource, - CASE - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'http-only' THEN 'alarm' - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'match-viewer' AND - (v.arn IS NOT NULL OR (default_cache_behavior ->> 'ViewerProtocolPolicy' = 'allow-all')) THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'http-only' THEN title || ' custom origins traffic not encrypted in transit.' - WHEN o.arn IS NOT NULL AND o.origin_protocol_policy = 'match-viewer' AND - (v.arn IS NOT NULL OR (default_cache_behavior ->> 'ViewerProtocolPolicy' = 'allow-all')) THEN title || ' custom origins traffic not encrypted in transit.' - ELSE title || ' custom origins traffic encrypted in transit.' - END AS reason - FROM - aws_cloudfront_distribution AS b - LEFT JOIN origin_protocol_policy_value AS o ON b.arn = o.arn - LEFT JOIN viewer_protocol_policy_value AS v ON b.arn = v.arn -Severity: medium -Tags: {} -Title: 9 CloudFront distributions should encrypt traffic to custom origins \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_dms_7.yaml b/compliance/controls/pending/aws/aws_foundational_security_dms_7.yaml deleted file mode 100644 index 979c25694..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_dms_7.yaml +++ /dev/null @@ -1,52 +0,0 @@ -Description: This control checks whether logging is enabled with the minimum severity level of LOGGER_SEVERITY_DEFAULT for DMS replication tasks TARGET_APPLY and TARGET_LOAD. The control fails if logging isn't enabled for these tasks or if the minimum severity level is less than LOGGER_SEVERITY_DEFAULT. -ID: aws_foundational_security_dms_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH replication_task_target_apply AS ( - SELECT - arn - FROM - aws_dms_replication_task, - jsonb_array_elements(replication_task_settings -> 'Logging' -> 'LogComponents') AS o - WHERE - o ->> 'Id' = 'TARGET_APPLY' - AND o ->> 'Severity' IN ('LOGGER_SEVERITY_DEFAULT', 'LOGGER_SEVERITY_DEBUG', 'LOGGER_SEVERITY_DETAILED_DEBUG') - ), - replication_task_target_load AS ( - SELECT - arn - FROM - aws_dms_replication_task, - jsonb_array_elements(replication_task_settings -> 'Logging' -> 'LogComponents') AS o - WHERE - o ->> 'Id' = 'TARGET_LOAD' - AND o ->> 'Severity' IN ('LOGGER_SEVERITY_DEFAULT', 'LOGGER_SEVERITY_DEBUG', 'LOGGER_SEVERITY_DETAILED_DEBUG') - ) - SELECT - t.arn AS resource, - (replication_task_settings -> 'Logging' ->> 'EnableLogging')::bool, - CASE - WHEN (replication_task_settings -> 'Logging' ->> 'EnableLogging')::bool - AND a.arn IS NOT NULL - AND l.arn IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (replication_task_settings -> 'Logging' ->> 'EnableLogging')::bool - AND a.arn IS NOT NULL - AND l.arn IS NOT NULL THEN title || ' target database logging enabled.' - ELSE title || 'target database logging disabled.' - END AS reason - FROM - aws_dms_replication_task AS t - LEFT JOIN replication_task_target_apply AS a ON a.arn = t.arn - LEFT JOIN replication_task_target_load AS l ON l.arn = t.arn; -Severity: medium -Tags: {} -Title: 7 DMS replication tasks for the target database should have logging enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_docdb_3.yaml b/compliance/controls/pending/aws/aws_foundational_security_docdb_3.yaml deleted file mode 100644 index 66833343f..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_docdb_3.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: This control checks whether an Amazon DocumentDB manual cluster snapshot is public. The control fails if the manual cluster snapshot is public. -ID: aws_foundational_security_docdb_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN (cluster_snapshot->>'AttributeName' = 'restore') - AND cluster_snapshot->'AttributeValues' = '["all"]' THEN 'alarm' - ELSE 'ok' - END status, - CASE - WHEN (cluster_snapshot->>'AttributeName' = 'restore') - AND cluster_snapshot->'AttributeValues' = '["all"]' THEN title || ' does not restrict public access.' - ELSE title || ' restrict public access.' - END reason - FROM - aws_docdb_cluster_snapshot, - jsonb_array_elements(db_cluster_snapshot_attributes) AS cluster_snapshot; -Severity: critical -Tags: {} -Title: 3 Amazon DocumentDB manual cluster snapshots should not be public \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_ec2_10.yaml b/compliance/controls/pending/aws/aws_foundational_security_ec2_10.yaml deleted file mode 100644 index 98c75bcf4..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_ec2_10.yaml +++ /dev/null @@ -1,39 +0,0 @@ -Description: This control checks whether a service endpoint for Amazon EC2 is created for each VPC. The control fails if a VPC does not have a VPC endpoint created for the Amazon EC2 service. -ID: aws_foundational_security_ec2_10 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN vpc_id NOT IN ( - SELECT - vpc_id - FROM - aws_vpc_endpoint - WHERE - service_name LIKE 'com.amazonaws.' || region || '.ec2' - ) THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN vpc_id NOT IN ( - SELECT - vpc_id - FROM - aws_vpc_endpoint - WHERE - service_name LIKE 'com.amazonaws.' || region || '.ec2' - ) THEN title || ' not configured to use VPC endpoints.' - ELSE title || ' configured to use VPC endpoints.' - END AS reason - FROM - aws_vpc; -Severity: medium -Tags: {} -Title: 10 Amazon EC2 should be configured to use VPC endpoints \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_ec2_21.yaml b/compliance/controls/pending/aws/aws_foundational_security_ec2_21.yaml deleted file mode 100644 index ef4f47421..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_ec2_21.yaml +++ /dev/null @@ -1,84 +0,0 @@ -Description: This control checks if default ports for SSH/RDP ingress traffic for network access control lists (NACLs) is unrestricted. The rule fails if a NACL inbound entry allows a source CIDR block of '0.0.0.0/0' or '::/0' for ports 22 or 3389. -ID: aws_foundational_security_ec2_21 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH bad_rules AS ( - SELECT - network_acl_id, - COUNT(*) AS num_bad_rules, - tags, - region, - account_id - FROM - aws_vpc_network_acl, - jsonb_array_elements(entries) AS att - WHERE - att ->> 'Egress' = 'false' - AND ( - att ->> 'CidrBlock' = '0.0.0.0/0' - OR att ->> 'Ipv6CidrBlock' = '::/0' - ) - AND att ->> 'RuleAction' = 'allow' - AND ( - ( - att ->> 'Protocol' = '-1' - AND att ->> 'PortRange' IS NULL - ) - OR ( - (att -> 'PortRange' ->> 'From')::int <= 22 - AND (att -> 'PortRange' ->> 'To')::int >= 22 - AND att ->> 'Protocol' IN ('6', '17') - ) - OR ( - (att -> 'PortRange' ->> 'From')::int <= 3389 - AND (att -> 'PortRange' ->> 'To')::int >= 3389 - AND att ->> 'Protocol' IN ('6', '17') - ) - ) - GROUP BY - network_acl_id, - region, - account_id, - tags - ORDER BY - network_acl_id, - region, - account_id, - tags - ), - aws_vpc_network_acls AS ( - SELECT - network_acl_id, - tags, - partition, - region, - account_id - FROM - aws_vpc_network_acl - ORDER BY - network_acl_id, - region, - account_id - ) - SELECT - 'arn:' || acl.partition || ':ec2:' || acl.region || ':' || acl.account_id || ':network-acl/' || acl.network_acl_id AS resource, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN bad_rules.network_acl_id IS NULL THEN acl.network_acl_id || ' does not allow ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - ELSE acl.network_acl_id || ' contains ' || bad_rules.num_bad_rules || ' rule(s) allowing ingress to port 22 or 3389 from 0.0.0.0/0 or ::/0.' - END AS reason - FROM - aws_vpc_network_acls AS acl - LEFT JOIN bad_rules ON bad_rules.network_acl_id = acl.network_acl_id -Severity: medium -Tags: {} -Title: 21 Network ACLs should not allow ingress from 0.0.0.0/0 to port 22 or port 3389 \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_ec2_25.yaml b/compliance/controls/pending/aws/aws_foundational_security_ec2_25.yaml deleted file mode 100644 index 0d14699a5..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_ec2_25.yaml +++ /dev/null @@ -1,43 +0,0 @@ -Description: This control checks if Amazon EC2 launch templates are configured to assign public IP addresses to network interfaces upon launch. The control fails if an EC2 launch template is configured to assign a public IP address to network interfaces or if there is at least one network interface that has a public IP address. -ID: aws_foundational_security_ec2_25 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH public_launch_templates AS ( - SELECT - i.tags ->> 'aws:ec2launchtemplate:id' AS public_launch_template_id - FROM - aws_ec2_instance AS i, - jsonb_array_elements(launch_template_data -> 'NetworkInterfaces') AS nic - WHERE - (nic -> 'AssociatePublicIpAddress')::bool - ), - launch_templates_associated_instance AS ( - SELECT - DISTINCT tags ->> 'aws:ec2launchtemplate:id' AS launch_template_id - FROM - aws_ec2_instance - ) - SELECT - t.launch_template_id AS resource, - CASE - WHEN i.launch_template_id IS NULL THEN 'skip' - WHEN t.launch_template_id IN (SELECT public_launch_template_id FROM public_launch_templates) THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN i.launch_template_id IS NULL THEN t.title || ' does not launch any instance.' - WHEN t.launch_template_id IN (SELECT public_launch_template_id FROM public_launch_templates) THEN t.title || ' publicly accessible.' - ELSE t.title || ' not publicly accessible.' - END AS reason - FROM - aws_ec2_launch_template AS t - LEFT JOIN launch_templates_associated_instance AS i ON i.launch_template_id = t.launch_template_id -Severity: high -Tags: {} -Title: 25 Amazon EC2 launch templates should not assign public IPs to network interfaces \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_ec2_6.yaml b/compliance/controls/pending/aws/aws_foundational_security_ec2_6.yaml deleted file mode 100644 index f1d63f5ae..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_ec2_6.yaml +++ /dev/null @@ -1,53 +0,0 @@ -Description: This control checks whether Amazon VPC Flow Logs are found and enabled for VPCs. The traffic type is set to Reject. With the VPC Flow Logs feature, you can capture information about the IP address traffic going to and from network interfaces in your VPC. After you create a flow log, you can view and retrieve its data in CloudWatch Logs. To reduce cost, you can also send your flow logs to Amazon S3. -ID: aws_foundational_security_ec2_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH vpcs AS ( - SELECT - arn, - account_id, - region, - owner_id, - vpc_id, - tags, - _ctx - FROM - aws_vpc - ORDER BY - vpc_id - ), - flowlogs AS ( - SELECT - resource_id, - account_id, - region - FROM - aws_vpc_flow_log - ORDER BY - resource_id - ) - SELECT - v.arn AS resource, - CASE - WHEN v.account_id <> v.owner_id THEN 'skip' - WHEN f.resource_id IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN v.account_id <> v.owner_id THEN v.vpc_id || ' is a shared VPC.' - WHEN f.resource_id IS NOT NULL THEN v.vpc_id || ' flow logging enabled.' - ELSE v.vpc_id || ' flow logging disabled.' - END AS reason - FROM - vpcs AS v - LEFT JOIN flowlogs AS f - ON v.vpc_id = f.resource_id; -Severity: medium -Tags: {} -Title: 6 VPC flow logging should be enabled in all VPCs \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_elb_13.yaml b/compliance/controls/pending/aws/aws_foundational_security_elb_13.yaml deleted file mode 100644 index ce9a02d04..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_elb_13.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Description: This control checks whether an Elastic Load Balancer V2 (Application, Network, or Gateway Load Balancer) has registered instances from multiple Availability Zones. The control fails if an Elastic Load Balancer V2 has instances registered in fewer than two Availability Zones. -ID: aws_foundational_security_elb_13 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(availability_zones) < 2 THEN 'alarm' - ELSE 'ok' - END AS status, - title || ' has ' || jsonb_array_length(availability_zones) || ' availability zone(s).' AS reason - FROM - aws_ec2_application_load_balancer - UNION - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(availability_zones) < 2 THEN 'alarm' - ELSE 'ok' - END AS status, - title || ' has ' || jsonb_array_length(availability_zones) || ' availability zone(s).' AS reason - FROM - aws_ec2_network_load_balancer - UNION - SELECT - arn AS resource, - CASE - WHEN jsonb_array_length(availability_zones) < 2 THEN 'alarm' - ELSE 'ok' - END AS status, - title || ' has ' || jsonb_array_length(availability_zones) || ' availability zone(s).' AS reason - FROM - aws_ec2_gateway_load_balancer -Severity: medium -Tags: {} -Title: 13 Application, Network, and Gateway Load Balancers should span multiple Availability Zones \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_elb_3.yaml b/compliance/controls/pending/aws/aws_foundational_security_elb_3.yaml deleted file mode 100644 index 149830f18..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_elb_3.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: This control checks whether your Classic Load Balancer listeners are configured with HTTPS or TLS protocol for front-end (client to load balancer) connections. The control is applicable if a Classic Load Balancer has listeners. If your Classic Load Balancer does not have a listener configured, then the control does not report any findings. The control passes if the Classic Load Balancer listeners are configured with TLS or HTTPS for front-end connections. The control fails if the listener is not configured with TLS or HTTPS for front-end connections. -ID: aws_foundational_security_elb_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || partition || ':elasticloadbalancing:' || region || ':' || account_id || ':loadbalancer/' || title AS resource, - CASE - WHEN listener_description -> 'Listener' ->> 'Protocol' IN ('HTTPS', 'SSL', 'TLS') THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN listener_description -> 'Listener' ->> 'Protocol' = 'HTTPS' THEN title || ' configured with HTTPS protocol.' - WHEN listener_description -> 'Listener' ->> 'Protocol' = 'SSL' THEN title || ' configured with TLS protocol.' - ELSE title || ' configured with ' || (listener_description -> 'Listener' ->> 'Protocol') || ' protocol.' - END AS reason - FROM - aws_ec2_classic_load_balancer, - jsonb_array_elements(listener_descriptions) AS listener_description; -Severity: medium -Tags: {} -Title: 3 Classic Load Balancer listeners should be configured with HTTPS or TLS termination \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_elb_5.yaml b/compliance/controls/pending/aws/aws_foundational_security_elb_5.yaml deleted file mode 100644 index 132c46327..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_elb_5.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Description: This control checks whether the Application Load Balancer and the Classic Load Balancer have logging enabled. The control fails if access_logs.s3.enabled is false. -ID: aws_foundational_security_elb_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - ( - SELECT - arn AS resource, - CASE - WHEN load_balancer_attributes @> '[{"Key": "access_logs.s3.enabled", "Value": "true"}]' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN load_balancer_attributes @> '[{"Key": "access_logs.s3.enabled", "Value": "true"}]' THEN title || ' logging enabled.' - ELSE title || ' logging disabled.' - END AS reason - FROM - aws_ec2_application_load_balancer - ) - UNION - ( - SELECT - 'arn:' || partition || ':elasticloadbalancing:' || region || ':' || account_id || ':loadbalancer/' || title AS resource, - CASE - WHEN access_log_enabled = 'true' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN access_log_enabled = 'true' THEN title || ' logging enabled.' - ELSE title || ' logging disabled.' - END AS reason - FROM - aws_ec2_classic_load_balancer - ); -Severity: medium -Tags: {} -Title: 5 Application and Classic Load Balancers logging should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_guardduty_1.yaml b/compliance/controls/pending/aws/aws_foundational_security_guardduty_1.yaml deleted file mode 100644 index dd20e15a4..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_guardduty_1.yaml +++ /dev/null @@ -1,33 +0,0 @@ -Description: This control checks whether Amazon GuardDuty is enabled in your GuardDuty account and Region. It is highly recommended that you enable GuardDuty in all supported AWS Regions. Doing so allows GuardDuty to generate findings about unauthorized or unusual activity, even in Regions that you do not actively use. This also allows GuardDuty to monitor CloudTrail events for global AWS services such as IAM. -ID: aws_foundational_security_guardduty_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN r.region = ANY(array['af-south-1', 'ap-northeast-3', 'ap-southeast-3', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'me-south-1', 'us-gov-east-1']) THEN 'skip' - WHEN r.opt_in_status = 'not-opted-in' THEN 'skip' - WHEN status = 'ENABLED' AND master_account ->> 'AccountId' IS NULL THEN 'ok' - WHEN status = 'ENABLED' AND master_account ->> 'AccountId' IS NOT NULL THEN 'info' - ELSE 'alarm' - END AS status, - CASE - WHEN r.region = ANY(array['af-south-1', 'ap-northeast-3', 'ap-southeast-3', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'me-south-1', 'us-gov-east-1']) THEN r.region || ' region not supported.' - WHEN r.opt_in_status = 'not-opted-in' THEN r.region || ' region is disabled.' - WHEN status IS NULL THEN 'No GuardDuty detector found in ' || r.region || '.' - WHEN status = 'ENABLED' AND master_account ->> 'AccountId' IS NULL THEN r.region || ' detector ' || d.title || ' enabled.' - WHEN status = 'ENABLED' AND master_account ->> 'AccountId' IS NOT NULL THEN r.region || ' detector ' || d.title || ' is managed by account ' || (master_account ->> 'AccountId') || ' via delegated admin.' - ELSE r.region || ' detector ' || d.title || ' disabled.' - END AS reason - FROM - aws_region AS r - LEFT JOIN aws_guardduty_detector d ON r.account_id = d.account_id AND r.name = d.region; -Severity: high -Tags: {} -Title: 1 GuardDuty should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_iam_6.yaml b/compliance/controls/pending/aws/aws_foundational_security_iam_6.yaml deleted file mode 100644 index b705b3add..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_iam_6.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: This control checks whether your AWS account is enabled to use a hardware multi-factor authentication (MFA) device to sign in with root user credentials. -ID: aws_foundational_security_iam_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || s.partition || ':::' || s.account_id AS resource, - CASE - WHEN s.account_mfa_enabled AND d.serial_number IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN s.account_mfa_enabled = FALSE THEN 'MFA not enabled for root account.' - WHEN d.serial_number IS NOT NULL THEN 'MFA enabled for root account, but the MFA associated is a virtual device.' - ELSE 'Hardware MFA device enabled for root account.' - END AS reason - FROM - aws_iam_account_summary AS s - LEFT JOIN - aws_iam_virtual_mfa_device AS d - ON (d.user ->> 'Arn') = 'arn:' || s.partition || ':iam::' || s.account_id || ':root'; -Severity: critical -Tags: {} -Title: 6 Hardware MFA should be enabled for the root user \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_iam_7.yaml b/compliance/controls/pending/aws/aws_foundational_security_iam_7.yaml deleted file mode 100644 index 09e86c220..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_iam_7.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: This control checks whether the account password policy for IAM users uses the recommended configurations. -ID: aws_foundational_security_iam_7 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN - minimum_password_length >= 8 - AND require_lowercase_characters = 'true' - AND require_uppercase_characters = 'true' - AND require_numbers = 'true' - AND require_symbols = 'true' - THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN minimum_password_length IS NULL THEN 'No password policy set.' - WHEN - minimum_password_length >= 8 - AND require_lowercase_characters = 'true' - AND require_uppercase_characters = 'true' - AND require_numbers = 'true' - AND require_symbols = 'true' - THEN 'Strong password policies configured.' - ELSE 'Password policy ' || - CONCAT_WS(', ', - CASE WHEN minimum_password_length < 8 THEN ('minimum password length set to ' || minimum_password_length) END, - CASE WHEN NOT (require_lowercase_characters = 'true') THEN 'lowercase characters not required' END, - CASE WHEN NOT (require_uppercase_characters = 'true') THEN 'uppercase characters not required' END, - CASE WHEN NOT (require_numbers) THEN 'numbers not required' END, - CASE WHEN NOT (require_symbols) THEN 'symbols not required' END - ) || '.' - END AS reason - FROM - aws_account AS a - LEFT JOIN aws_iam_account_password_policy AS pol ON a.account_id = pol.account_id; -Severity: medium -Tags: {} -Title: 7 Password policies for IAM users should have strong configurations \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_kms_2.yaml b/compliance/controls/pending/aws/aws_foundational_security_kms_2.yaml deleted file mode 100644 index b023b8391..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_kms_2.yaml +++ /dev/null @@ -1,95 +0,0 @@ -Description: Checks whether the inline policies that are embedded in your IAM identities (role, user, or group) - allow the AWS KMS decryption actions on all KMS keys. This control uses Zelkova, an automated reasoning engine, - to validate and warn you about policies that may grant broad access to your secrets across AWS accounts. - This control fails if kms:Decrypt or kms:ReEncryptFrom actions are allowed on all KMS keys in an inline policy. -ID: aws_foundational_security_kms_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH user_with_decrypt_grant AS ( - SELECT - DISTINCT arn - FROM - aws_iam_user, - jsonb_array_elements(inline_policies_std) AS inline_policy, - jsonb_array_elements(inline_policy -> 'PolicyDocument' -> 'Statement') AS statement - WHERE - statement ->> 'Effect' = 'Allow' - AND statement -> 'Resource' ?| ARRAY['*', 'arn:aws:kms:*:' || account_id || ':key/*', 'arn:aws:kms:*:' || account_id || ':alias/*'] - AND statement -> 'Action' ?| ARRAY['*', 'kms:*', 'kms:decrypt', 'kms:deencrypt*', 'kms:reencryptfrom'] - ), - role_with_decrypt_grant AS ( - SELECT - DISTINCT arn - FROM - aws_iam_role, - jsonb_array_elements(inline_policies_std) AS inline_policy, - jsonb_array_elements(inline_policy -> 'PolicyDocument' -> 'Statement') AS statement - WHERE - statement ->> 'Effect' = 'Allow' - AND statement -> 'Resource' ?| ARRAY['*', 'arn:aws:kms:*:' || account_id || ':key/*', 'arn:aws:kms:*:' || account_id || ':alias/*'] - AND statement -> 'Action' ?| ARRAY['*', 'kms:*', 'kms:decrypt', 'kms:deencrypt*', 'kms:reencryptfrom'] - ), - group_with_decrypt_grant AS ( - SELECT - DISTINCT arn - FROM - aws_iam_group, - jsonb_array_elements(inline_policies_std) AS inline_policy, - jsonb_array_elements(inline_policy -> 'PolicyDocument' -> 'Statement') AS statement - WHERE - statement ->> 'Effect' = 'Allow' - AND statement -> 'Resource' ?| ARRAY['*', 'arn:aws:kms:*:' || account_id || ':key/*', 'arn:aws:kms:*:' || account_id || ':alias/*'] - AND statement -> 'Action' ?| ARRAY['*', 'kms:*', 'kms:decrypt', 'kms:deencrypt*', 'kms:reencryptfrom'] - ) - SELECT - i.arn AS resource, - CASE - WHEN d.arn IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN d.arn IS NULL THEN 'User ' || i.title || ' not allowed to perform decryption actions on all keys.' - ELSE 'User ' || i.title || ' allowed to perform decryption actions on all keys.' - END AS reason - FROM - aws_iam_user i - LEFT JOIN user_with_decrypt_grant d ON i.arn = d.arn - UNION - SELECT - r.arn AS resource, - CASE - WHEN d.arn IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN d.arn IS NULL THEN 'Role ' || r.title || ' not allowed to perform decryption actions on all keys.' - ELSE 'Role ' || r.title || ' allowed to perform decryption actions on all keys.' - END AS reason - FROM - aws_iam_role r - LEFT JOIN role_with_decrypt_grant d ON r.arn = d.arn - WHERE - r.arn NOT LIKE '%service-role/%' - UNION - SELECT - g.arn AS resource, - CASE - WHEN d.arn IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN d.arn IS NULL THEN 'Group ' || g.title || ' not allowed to perform decryption actions on all keys.' - ELSE 'Group ' || g.title || ' allowed to perform decryption actions on all keys.' - END AS reason - FROM - aws_iam_group g - LEFT JOIN group_with_decrypt_grant d ON g.arn = d.arn; -Severity: medium -Tags: {} -Title: 2 IAM principals should not have IAM inline policies that allow decryption actions on all KMS keys \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_lambda_5.yaml b/compliance/controls/pending/aws/aws_foundational_security_lambda_5.yaml deleted file mode 100644 index 6884bc573..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_lambda_5.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Description: This control checks if Lambda has more than one availability zone associated. The rule fails if only one availability zone is associated with Lambda. -ID: aws_foundational_security_lambda_5 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - arn AS resource, - CASE - WHEN vpc_id IS NULL OR vpc_id = '' THEN 'skip' - ELSE CASE - WHEN ( - SELECT - COUNT(DISTINCT availability_zone_id) - FROM - aws_vpc_subnet - WHERE - subnet_id IN (SELECT jsonb_array_elements_text(vpc_subnet_ids)) - ) >= 2 - THEN 'ok' - ELSE 'alarm' - END - END AS status, - CASE - WHEN vpc_id IS NULL OR vpc_id = '' THEN title || ' is not in VPC.' - ELSE title || ' has ' || jsonb_array_length(vpc_subnet_ids) || ' availability zone(s).' - END AS reason - FROM - aws_lambda_function; -Severity: medium -Tags: {} -Title: 5 VPC Lambda functions should operate in multiple Availability Zones \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_rds_1.yaml b/compliance/controls/pending/aws/aws_foundational_security_rds_1.yaml deleted file mode 100644 index 77cbc620f..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_rds_1.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: This control checks whether Amazon RDS snapshots are public. This control is intended for RDS instances. It can also return findings for snapshots of Aurora DB instances, Neptune DB instances, and Amazon DocumentDB clusters, even though they are not evaluated for public accessibility. If these findings are not useful, you can suppress them. -ID: aws_foundational_security_rds_1 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - ( - SELECT - arn AS resource, - CASE - WHEN cluster_snapshot -> 'AttributeValues' = '["all"]' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN cluster_snapshot -> 'AttributeValues' = '["all"]' THEN title || ' publicly restorable.' - ELSE title || ' not publicly restorable.' - END AS reason - FROM - aws_rds_db_cluster_snapshot, - jsonb_array_elements(db_cluster_snapshot_attributes) AS cluster_snapshot - ) - UNION - ( - SELECT - arn AS resource, - CASE - WHEN database_snapshot -> 'AttributeValues' = '["all"]' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN database_snapshot -> 'AttributeValues' = '["all"]' THEN title || ' publicly restorable.' - ELSE title || ' not publicly restorable.' - END AS reason - FROM - aws_rds_db_snapshot, - jsonb_array_elements(db_snapshot_attributes) AS database_snapshot - ); -Severity: critical -Tags: {} -Title: 1 RDS snapshots should be private \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_rds_23.yaml b/compliance/controls/pending/aws/aws_foundational_security_rds_23.yaml deleted file mode 100644 index 0ea2e7e9a..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_rds_23.yaml +++ /dev/null @@ -1,54 +0,0 @@ -Description: This control checks whether the RDS cluster or instance uses a port other than the default port of the database engine. -ID: aws_foundational_security_rds_23 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - ( - SELECT - arn AS resource, - CASE - WHEN engine SIMILAR TO '%(aurora|mysql|mariadb)%' AND port = '3306' THEN 'alarm' - WHEN engine LIKE '%postgres%' AND port = '5432' THEN 'alarm' - WHEN engine LIKE 'oracle%' AND port = '1521' THEN 'alarm' - WHEN engine LIKE 'sqlserver%' AND port = '1433' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN engine SIMILAR TO '%(aurora|mysql|mariadb)%' AND port = '3306' THEN title || ' ' || engine || ' uses a default port.' - WHEN engine LIKE '%postgres%' AND port = '5432' THEN title || ' ' || engine || ' uses a default port.' - WHEN engine LIKE 'oracle%' AND port = '1521' THEN title || ' ' || engine || ' uses a default port.' - WHEN engine LIKE 'sqlserver%' AND port = '1433' THEN title || ' ' || engine || ' uses a default port.' - ELSE title || ' doesn\'t use a default port.' - END AS reason - FROM - aws_rds_db_cluster - ) - UNION - ( - SELECT - arn AS resource, - CASE - WHEN engine SIMILAR TO '%(aurora|mysql|mariadb)%' AND port = '3306' THEN 'alarm' - WHEN engine LIKE '%postgres%' AND port = '5432' THEN 'alarm' - WHEN engine LIKE 'oracle%' AND port = '1521' THEN 'alarm' - WHEN engine LIKE 'sqlserver%' AND port = '1433' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN engine SIMILAR TO '%(aurora|mysql|mariadb)%' AND port = '3306' THEN title || ' ' || engine || ' uses a default port.' - WHEN engine LIKE '%postgres%' AND port = '5432' THEN title || ' ' || engine || ' uses a default port.' - WHEN engine LIKE 'oracle%' AND port = '1521' THEN title || ' ' || engine || ' uses a default port.' - WHEN engine LIKE 'sqlserver%' AND port = '1433' THEN title || ' ' || engine || ' uses a default port.' - ELSE title || ' doesn\'t use a default port.' - END AS reason - FROM - aws_rds_db_instance - ); -Severity: low -Tags: {} -Title: 23 RDS databases and clusters should not use a database engine default port \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_rds_4.yaml b/compliance/controls/pending/aws/aws_foundational_security_rds_4.yaml deleted file mode 100644 index 5c3ab6767..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_rds_4.yaml +++ /dev/null @@ -1,42 +0,0 @@ -Description: This control checks whether RDS DB snapshots are encrypted. This control is intended for RDS DB instances. However, it can also generate findings for snapshots of Aurora DB instances, Neptune DB instances, and Amazon DocumentDB clusters. If these findings are not useful, then you can suppress them. -ID: aws_foundational_security_rds_4 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - ( - SELECT - arn AS resource, - CASE - WHEN storage_encrypted THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN storage_encrypted THEN title || ' encrypted at rest.' - ELSE title || ' not encrypted at rest.' - END AS reason - FROM - aws_rds_db_cluster_snapshot - ) - UNION - ( - SELECT - arn AS resource, - CASE - WHEN encrypted THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN encrypted THEN title || ' encrypted at rest.' - ELSE title || ' not encrypted at rest.' - END AS reason - FROM - aws_rds_db_snapshot - ); -Severity: medium -Tags: {} -Title: 4 RDS cluster snapshots and database snapshots should be encrypted at rest \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_rds_6.yaml b/compliance/controls/pending/aws/aws_foundational_security_rds_6.yaml deleted file mode 100644 index 3b0fbd01c..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_rds_6.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: This control checks whether enhanced monitoring is enabled for your RDS DB instances. In Amazon RDS, Enhanced Monitoring enables a more rapid response to performance changes in underlying infrastructure. These performance changes could result in a lack of availability of the data. Enhanced Monitoring provides real-time metrics of the operating system that your RDS DB instance runs on. An agent is installed on the instance. The agent can obtain metrics more accurately than is possible from the hypervisor layer. -ID: aws_foundational_security_rds_6 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - ( - SELECT - arn AS resource, - CASE - WHEN enabled_cloudwatch_logs_exports IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN enabled_cloudwatch_logs_exports IS NOT NULL THEN title || ' enhanced monitoring enabled.' - ELSE title || ' enhanced monitoring not enabled.' - END AS reason - FROM - aws_rds_db_cluster - ) - UNION - ( - SELECT - arn AS resource, - CASE - WHEN class = 'db.m1.small' THEN 'skip' - WHEN enhanced_monitoring_resource_arn IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN class = 'db.m1.small' THEN title || ' enhanced monitoring not supported.' - WHEN enhanced_monitoring_resource_arn IS NOT NULL THEN title || ' enhanced monitoring enabled.' - ELSE title || ' enhanced monitoring not enabled.' - END AS reason - FROM - aws_rds_db_instance - ); -Severity: low -Tags: {} -Title: 6 Enhanced monitoring should be configured for RDS DB instances and clusters \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_s3_2.yaml b/compliance/controls/pending/aws/aws_foundational_security_s3_2.yaml deleted file mode 100644 index ba99cc604..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_s3_2.yaml +++ /dev/null @@ -1,67 +0,0 @@ -Description: This control checks whether your S3 buckets allow public read access. It evaluates the Block Public Access settings, the bucket policy, and the bucket access control list (ACL). -ID: aws_foundational_security_s3_2 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH public_acl AS ( - SELECT - DISTINCT name - FROM - aws_s3_bucket, - jsonb_array_elements(acl -> 'Grants') AS grants - WHERE - (grants -> 'Grantee' ->> 'URI' = 'http://acs.amazonaws.com/groups/global/AllUsers' - OR grants -> 'Grantee' ->> 'URI' = 'http://acs.amazonaws.com/groups/global/AuthenticatedUsers') - AND ( - grants ->> 'Permission' = 'FULL_CONTROL' - OR grants ->> 'Permission' = 'READ_ACP' - OR grants ->> 'Permission' = 'READ' - ) - ), - read_access_policy AS ( - SELECT - DISTINCT name - FROM - aws_s3_bucket, - jsonb_array_elements(policy_std -> 'Statement') AS s, - jsonb_array_elements_text(s -> 'Action') AS action - WHERE - s ->> 'Effect' = 'Allow' - AND ( - s -> 'Principal' -> 'AWS' = '[\"*\"]' - OR s ->> 'Principal' = '*' - ) - AND ( - action = '*' - OR action = '*:*' - OR action = 's3:*' - OR action ILIKE 's3:get%' - OR action ILIKE 's3:list%' - ) - ) - SELECT - b.arn AS resource, - CASE - WHEN (block_public_acls OR a.name IS NULL) AND NOT bucket_policy_is_public THEN 'ok' - WHEN (block_public_acls OR a.name IS NULL) AND (bucket_policy_is_public AND block_public_policy) THEN 'ok' - WHEN (block_public_acls OR a.name IS NULL) AND (bucket_policy_is_public AND p.name IS NULL) THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (block_public_acls OR a.name IS NULL) AND NOT bucket_policy_is_public THEN b.title || ' not publicly readable.' - WHEN (block_public_acls OR a.name IS NULL) AND (bucket_policy_is_public AND block_public_policy) THEN b.title || ' not publicly readable.' - WHEN (block_public_acls OR a.name IS NULL) AND (bucket_policy_is_public AND p.name IS NULL) THEN b.title || ' not publicly readable.' - ELSE b.title || ' publicly readable.' - END AS reason - FROM - aws_s3_bucket AS b - LEFT JOIN public_acl AS a ON b.name = a.name - LEFT JOIN read_access_policy AS p ON b.name = p.name; -Severity: critical -Tags: {} -Title: 2 S3 buckets should prohibit public read access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_foundational_security_s3_3.yaml b/compliance/controls/pending/aws/aws_foundational_security_s3_3.yaml deleted file mode 100644 index 99803dd19..000000000 --- a/compliance/controls/pending/aws/aws_foundational_security_s3_3.yaml +++ /dev/null @@ -1,59 +0,0 @@ -Description: This control checks whether your S3 buckets allow public write access. It evaluates the block public access settings, the bucket policy, and the bucket access control list (ACL). -ID: aws_foundational_security_s3_3 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH public_acl AS ( - SELECT DISTINCT name - FROM aws_s3_bucket, - jsonb_array_elements(acl -> 'Grants') AS grants - WHERE - (grants -> 'Grantee' ->> 'URI' = 'http://acs.amazonaws.com/groups/global/AllUsers' - OR grants -> 'Grantee' ->> 'URI' = 'http://acs.amazonaws.com/groups/global/AuthenticatedUsers') - AND (grants ->> 'Permission' = 'FULL_CONTROL' - OR grants ->> 'Permission' = 'WRITE_ACP' - OR grants ->> 'Permission' = 'WRITE') - ), write_access_policy AS ( - SELECT DISTINCT name - FROM aws_s3_bucket, - jsonb_array_elements(policy_std -> 'Statement') AS s, - jsonb_array_elements_text(s -> 'Action') AS action - WHERE - s ->> 'Effect' = 'Allow' - AND (s -> 'Principal' -> 'AWS' = '[\"*\"]' - OR s ->> 'Principal' = '*') - AND (action = '*' - OR action = '*:*' - OR action = 's3:*' - OR action ILIKE 's3:put%' - OR action ILIKE 's3:delete%' - OR action ILIKE 's3:create%' - OR action ILIKE 's3:update%' - OR action ILIKE 's3:replicate%' - OR action ILIKE 's3:restore%') - ) - SELECT - b.arn AS resource, - CASE - WHEN (block_public_acls OR a.name IS NULL) AND NOT bucket_policy_is_public THEN 'ok' - WHEN (block_public_acls OR a.name IS NULL) AND bucket_policy_is_public AND block_public_policy THEN 'ok' - WHEN bucket_policy_is_public AND p.name IS NULL THEN 'ok' - ELSE 'alarm' - END status, - CASE - WHEN (block_public_acls OR a.name IS NULL) AND NOT bucket_policy_is_public THEN b.title || ' not publicly writable.' - WHEN (block_public_acls OR a.name IS NULL) AND bucket_policy_is_public AND block_public_policy THEN b.title || ' not publicly writable.' - WHEN (block_public_acls OR a.name IS NULL) AND bucket_policy_is_public AND p.name IS NULL THEN b.title || ' not publicly writable.' - ELSE b.title || ' publicly writable.' - END reason - FROM aws_s3_bucket AS b - LEFT JOIN public_acl AS a ON b.name = a.name - LEFT JOIN write_access_policy AS p ON b.name = p.name; -Severity: critical -Tags: {} -Title: 3 S3 buckets should prohibit public write access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_glue_dev_endpoint_cloudwatch_logs_encryption_enabled.yaml b/compliance/controls/pending/aws/aws_glue_dev_endpoint_cloudwatch_logs_encryption_enabled.yaml deleted file mode 100644 index 29d3ec2c7..000000000 --- a/compliance/controls/pending/aws/aws_glue_dev_endpoint_cloudwatch_logs_encryption_enabled.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Ensure Glue dev endpoints have CloudWatch logs encryption enabled to protect sensitive information at rest. -ID: aws_glue_dev_endpoint_cloudwatch_logs_encryption_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - e.arn AS resource, - CASE - WHEN cloud_watch_encryption IS NOT NULL AND cloud_watch_encryption ->> 'CloudWatchEncryptionMode' != 'DISABLED' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN cloud_watch_encryption IS NOT NULL AND cloud_watch_encryption ->> 'CloudWatchEncryptionMode' != 'DISABLED' THEN e.title || ' CloudWatch logs encryption enabled.' - ELSE e.title || ' CloudWatch logs encryption disabled.' - END AS reason - FROM - aws_glue_dev_endpoint AS e - LEFT JOIN - aws_glue_security_configuration AS c - ON - e.security_configuration = c.name; -Severity: low -Tags: {} -Title: Glue dev endpoints CloudWatch logs encryption should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_glue_dev_endpoint_job_bookmarks_encryption_enabled.yaml b/compliance/controls/pending/aws/aws_glue_dev_endpoint_job_bookmarks_encryption_enabled.yaml deleted file mode 100644 index 0c38f6e09..000000000 --- a/compliance/controls/pending/aws/aws_glue_dev_endpoint_job_bookmarks_encryption_enabled.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Ensure Glue dev endpoints have job bookmark encryption enabled to protect sensitive information at rest. -ID: aws_glue_dev_endpoint_job_bookmarks_encryption_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - e.arn AS resource, - CASE - WHEN job_bookmarks_encryption IS NOT NULL - AND job_bookmarks_encryption ->> 'JobBookmarksEncryptionMode' != 'DISABLED' - THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN job_bookmarks_encryption IS NOT NULL - AND job_bookmarks_encryption ->> 'JobBookmarksEncryptionMode' != 'DISABLED' - THEN e.title || ' job bookmark encryption enabled.' - ELSE e.title || ' job bookmark encryption disabled.' - END AS reason - FROM - aws_glue_dev_endpoint AS e - LEFT JOIN aws_glue_security_configuration AS c - ON e.security_configuration = c.name; -Severity: low -Tags: {} -Title: Glue dev endpoints job bookmark encryption should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_glue_dev_endpoint_s3_encryption_enabled.yaml b/compliance/controls/pending/aws/aws_glue_dev_endpoint_s3_encryption_enabled.yaml deleted file mode 100644 index 5632c9257..000000000 --- a/compliance/controls/pending/aws/aws_glue_dev_endpoint_s3_encryption_enabled.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Ensure Glue dev endpoints have S3 encryption enabled to protect sensitive information at rest. -ID: aws_glue_dev_endpoint_s3_encryption_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - d.arn AS resource, - CASE - WHEN e IS NOT NULL AND e ->> 'S3EncryptionMode' != 'DISABLED' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN e IS NOT NULL AND e ->> 'S3EncryptionMode' != 'DISABLED' THEN d.title || ' S3 encryption enabled.' - ELSE d.title || ' S3 encryption disabled.' - END AS reason - FROM - aws_glue_dev_endpoint AS d - LEFT JOIN - aws_glue_security_configuration s - ON d.security_configuration = s.name, - jsonb_array_elements(s.s3_encryption) e; -Severity: low -Tags: {} -Title: Glue dev endpoints S3 encryption should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_glue_job_cloudwatch_logs_encryption_enabled.yaml b/compliance/controls/pending/aws/aws_glue_job_cloudwatch_logs_encryption_enabled.yaml deleted file mode 100644 index 46cb4042b..000000000 --- a/compliance/controls/pending/aws/aws_glue_job_cloudwatch_logs_encryption_enabled.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: Ensure Glue jobs have CloudWatch logs encryption enabled to protect sensitive information at rest. -ID: aws_glue_job_cloudwatch_logs_encryption_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - j.arn AS resource, - CASE - WHEN cloud_watch_encryption IS NOT NULL AND cloud_watch_encryption ->> 'CloudWatchEncryptionMode' != 'DISABLED' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN cloud_watch_encryption IS NOT NULL AND cloud_watch_encryption ->> 'CloudWatchEncryptionMode' != 'DISABLED' THEN j.title || ' CloudWatch logs encryption enabled.' - ELSE j.title || ' CloudWatch logs encryption disabled.' - END AS reason - FROM - aws_glue_job AS j - LEFT JOIN - aws_glue_security_configuration AS c ON j.security_configuration = c.name; -Severity: low -Tags: {} -Title: Glue jobs CloudWatch logs encryption should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_glue_job_s3_encryption_enabled.yaml b/compliance/controls/pending/aws/aws_glue_job_s3_encryption_enabled.yaml deleted file mode 100644 index 405e6ed1c..000000000 --- a/compliance/controls/pending/aws/aws_glue_job_s3_encryption_enabled.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Ensure Glue jobs have S3 encryption enabled to protect sensitive information at rest. -ID: aws_glue_job_s3_encryption_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - j.arn AS resource, - CASE - WHEN e IS NOT NULL AND e ->> 'S3EncryptionMode' != 'DISABLED' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN e IS NOT NULL AND e ->> 'S3EncryptionMode' != 'DISABLED' THEN j.title || ' S3 encryption enabled.' - ELSE j.title || ' S3 encryption disabled.' - END AS reason - FROM - aws_glue_job AS j - LEFT JOIN - aws_glue_security_configuration AS s - ON - j.security_configuration = s.name, - jsonb_array_elements(s.s3_encryption) e; -Severity: low -Tags: {} -Title: Glue jobs S3 encryption should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_guardduty_centrally_configured.yaml b/compliance/controls/pending/aws/aws_guardduty_centrally_configured.yaml deleted file mode 100644 index 58d372a36..000000000 --- a/compliance/controls/pending/aws/aws_guardduty_centrally_configured.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Description: Ensure that GuardDuty is centrally configured, if GuardDuty is not under central management, it becomes impossible to centrally manage GuardDuty findings, settings, and member accounts. -ID: aws_guardduty_centrally_configured -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN r.region = ANY(array['af-south-1', 'ap-northeast-3', 'ap-southeast-3', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'me-south-1', 'us-gov-east-1']) THEN 'skip' - WHEN r.opt_in_status = 'not-opted-in' THEN 'skip' - WHEN status IS NULL THEN 'info' - WHEN status = 'DISABLED' THEN 'alarm' - WHEN status = 'ENABLED' AND master_account ->> 'AccountId' IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN r.region = ANY(array['af-south-1', 'ap-northeast-3', 'ap-southeast-3', 'eu-south-1', 'cn-north-1', 'cn-northwest-1', 'me-south-1', 'us-gov-east-1']) THEN r.region || ' region not supported.' - WHEN r.opt_in_status = 'not-opted-in' THEN r.region || ' region is disabled.' - WHEN status IS NULL THEN 'No GuardDuty detector found in ' || r.region || '.' - WHEN status = 'DISABLED' THEN r.region || ' detector ' || d.title || ' disabled.' - WHEN status = 'ENABLED' AND master_account ->> 'AccountId' IS NOT NULL THEN r.region || ' detector ' || d.title || ' centrally configured.' - ELSE r.region || ' detector ' || d.title || ' not centrally configured.' - END AS reason - FROM - aws_region AS r - LEFT JOIN aws_guardduty_detector d ON r.account_id = d.account_id AND r.name = d.region; -Severity: low -Tags: {} -Title: GuardDuty Detector should be centrally configured \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_iam_access_analyzer_enabled_without_findings.yaml b/compliance/controls/pending/aws/aws_iam_access_analyzer_enabled_without_findings.yaml deleted file mode 100644 index 1fda2a72a..000000000 --- a/compliance/controls/pending/aws/aws_iam_access_analyzer_enabled_without_findings.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: This control checks whether the IAM Access analyzer is enabled without findings. If you grant permissions to an S3 bucket in one of your organization member accounts to a principal in another organization member account, IAM Access Analyzer does not generate a finding. But if you grant permission to a principal in an account that is not a member of the organization, IAM Access Analyzer generates a finding. -ID: aws_iam_access_analyzer_enabled_without_findings -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || r.partition || '::' || r.region || ':' || r.account_id AS resource, - CASE - WHEN r.opt_in_status = 'not-opted-in' THEN 'skip' - WHEN aa.status = 'ACTIVE' AND aa.findings IS NULL THEN 'ok' - WHEN aa.status = 'ACTIVE' AND jsonb_array_length(aa.findings) > 0 THEN 'alarm' - WHEN aa.status = 'NOT_AVAILABLE' THEN 'alarm' - ELSE 'alarm' - END AS status, - CASE - WHEN r.opt_in_status = 'not-opted-in' THEN r.region || ' region is disabled.' - WHEN aa.status = 'ACTIVE' AND aa.findings IS NULL THEN aa.name || ' does not have active findings in region ' || r.region || '.' - WHEN aa.status = 'ACTIVE' AND jsonb_array_length(aa.findings) > 0 THEN aa.name || ' has active findings in region ' || r.region || '.' - WHEN aa.status = 'NOT_AVAILABLE' THEN aa.name || ' is not enabled in region ' || r.region || '.' - ELSE 'IAM Access Analyzer is not active in region ' || r.region || '.' - END AS reason - FROM - aws_region AS r - LEFT JOIN aws_accessanalyzer_analyzer AS aa ON r.account_id = aa.account_id AND r.region = aa.region; -Severity: low -Tags: {} -Title: IAM Access analyzer should be enabled without findings \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_iam_password_policy_expire_90.yaml b/compliance/controls/pending/aws/aws_iam_password_policy_expire_90.yaml deleted file mode 100644 index d73f9daeb..000000000 --- a/compliance/controls/pending/aws/aws_iam_password_policy_expire_90.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Description: IAM password policies can require passwords to be rotated or expired after a given number of days. Security Hub recommends that the password policy expire passwords after 90 days or less. Reducing the password lifetime increases account resiliency against brute force login attempts. -ID: aws_iam_password_policy_expire_90 -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'arn:' || a.partition || ':::' || a.account_id AS resource, - CASE - WHEN max_password_age <= 90 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN max_password_age IS NULL THEN 'Password expiration not set.' - ELSE 'Password expiration set to ' || max_password_age || ' days.' - END AS reason - FROM - aws_account AS a - LEFT JOIN - aws_iam_account_password_policy AS pol ON a.account_id = pol.account_id; -Severity: low -Tags: {} -Title: Ensure IAM password policy expires passwords within 90 days or less \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_iam_role_cross_account_read_only_access_policy.yaml b/compliance/controls/pending/aws/aws_iam_role_cross_account_read_only_access_policy.yaml deleted file mode 100644 index 76f4f4c7c..000000000 --- a/compliance/controls/pending/aws/aws_iam_role_cross_account_read_only_access_policy.yaml +++ /dev/null @@ -1,53 +0,0 @@ -Description: Ensure IAM Roles do not have ReadOnlyAccess access for external AWS account. The AWS-managed ReadOnlyAccess policy carries a high risk of potential data leakage, posing a significant threat to customer security and privacy. -ID: aws_iam_role_cross_account_read_only_access_policy -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH read_only_access_roles AS ( - SELECT - * - FROM - aws_iam_role, - jsonb_array_elements_text(attached_policy_arns) AS a - WHERE - a = 'arn:aws:iam::aws:policy/ReadOnlyAccess' - ), read_only_access_roles_with_cross_account_access AS ( - SELECT - arn - FROM - read_only_access_roles, - jsonb_array_elements(assume_role_policy_std -> 'Statement') AS stmt, - jsonb_array_elements_text(stmt -> 'Principal' -> 'AWS') AS p - WHERE - stmt ->> 'Effect' = 'Allow' - AND ( - p = '*' - OR NOT (p LIKE '%' || account_id || '%') - ) - ) - SELECT - r.arn AS resource, - CASE - WHEN ar.arn IS NULL THEN 'skip' - WHEN c.arn IS NOT NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN ar.arn IS NULL THEN r.title || ' not associated with ReadOnlyAccess policy.' - WHEN c.arn IS NOT NULL THEN r.title || ' associated with ReadOnlyAccess cross account access.' - ELSE r.title || ' associated ReadOnlyAccess without cross account access.' - END AS reason - FROM - aws_iam_role AS r - LEFT JOIN - read_only_access_roles AS ar ON r.arn = ar.arn - LEFT JOIN - read_only_access_roles_with_cross_account_access AS c ON c.arn = r.arn; -Severity: low -Tags: {} -Title: IAM roles should not have read only access for external AWS accounts \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_iam_user_hardware_mfa_enabled.yaml b/compliance/controls/pending/aws/aws_iam_user_hardware_mfa_enabled.yaml deleted file mode 100644 index 2dd4f8e6a..000000000 --- a/compliance/controls/pending/aws/aws_iam_user_hardware_mfa_enabled.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Manage access to resources in the AWS Cloud by ensuring hardware MFA is enabled for the user. -ID: aws_iam_user_hardware_mfa_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - u.arn AS resource, - CASE - WHEN serial_number IS NULL THEN 'alarm' - WHEN serial_number LIKE ANY(ARRAY['%mfa%', '%sms-mfa%']) THEN 'info' - ELSE 'ok' - END AS status, - CASE - WHEN serial_number IS NULL THEN u.name || ' MFA device not configured.' - WHEN serial_number LIKE ANY(ARRAY['%mfa%', '%sms-mfa%']) THEN u.name || ' MFA enabled, but the MFA associated is a virtual device.' - ELSE u.name || ' hardware MFA device enabled.' - END AS reason - FROM - aws_iam_virtual_mfa_device AS m - RIGHT JOIN - aws_iam_user AS u - ON - m.user_id = u.user_id; -Severity: low -Tags: {} -Title: IAM users should have hardware MFA enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_lightsail_instance_rdp_restricted_ip.yaml b/compliance/controls/pending/aws/aws_lightsail_instance_rdp_restricted_ip.yaml deleted file mode 100644 index 7966b56d3..000000000 --- a/compliance/controls/pending/aws/aws_lightsail_instance_rdp_restricted_ip.yaml +++ /dev/null @@ -1,55 +0,0 @@ -Description: Any ports enabled within Lightsail by default are open and exposed to the world. For SSH and RDP access you should identify which IP address need access. -ID: aws_lightsail_instance_rdp_restricted_ip -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH open_ports AS ( - SELECT - name, - jsonb_array_elements(networking -> 'Ports') AS port - FROM - aws_lightsail_instance - ), - port_cidrs AS ( - SELECT - op.name, - (op.port ->> 'FromPort')::INT AS from_port, - (op.port ->> 'ToPort')::INT AS to_port, - op.port ->> 'Protocol' AS protocol, - jsonb_array_elements_text(op.port -> 'Cidrs') AS cidr - FROM - open_ports op - ), - unrestricted_rdp_ports AS ( - SELECT - name - FROM - port_cidrs - WHERE - from_port = 3389 - AND to_port = 3389 - AND protocol = 'tcp' - AND cidr = '0.0.0.0/0' - ) - SELECT - i.name AS resource, - CASE - WHEN urp.name IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN urp.name IS NULL THEN i.name || ' has RDP (3389) restricted to specific IP addresses.' - ELSE i.name || ' has RDP (3389) open to the world (0.0.0.0/0).' - END AS reason, - i.tags - FROM - aws_lightsail_instance i - LEFT JOIN unrestricted_rdp_ports urp ON i.name = urp.name; -Severity: low -Tags: {} -Title: Ensure RDP is restricted to only IP address that should have this access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_lightsail_instance_ssh_rdp_http_ports_disabled.yaml b/compliance/controls/pending/aws/aws_lightsail_instance_ssh_rdp_http_ports_disabled.yaml deleted file mode 100644 index 41a1831bd..000000000 --- a/compliance/controls/pending/aws/aws_lightsail_instance_ssh_rdp_http_ports_disabled.yaml +++ /dev/null @@ -1,56 +0,0 @@ -Description: Any ports enable within Lightsail by default are open and exposed to the world. For SSH and RDP access you should remove and disable these ports when not is use. -ID: aws_lightsail_instance_ssh_rdp_http_ports_disabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH open_ports AS ( - SELECT - i.name, - jsonb_array_elements(i.networking -> 'Ports') AS port - FROM - aws_lightsail_instance i - ), - port_cidrs AS ( - SELECT - op.name, - (op.port ->> 'FromPort')::int AS from_port, - (op.port ->> 'ToPort')::int AS to_port, - op.port ->> 'Protocol' AS protocol, - jsonb_array_elements_text(op.port -> 'Cidrs') AS cidr, - jsonb_array_elements_text(op.port -> 'Ipv6Cidrs') AS ipv6_cidr - FROM - open_ports op - ), - insecure_ports AS ( - SELECT - name - FROM - port_cidrs - WHERE - from_port IN (22, 3389, 80) - AND to_port IN (22, 3389, 80) - AND protocol = 'tcp' - AND (cidr = '0.0.0.0/0' OR ipv6_cidr = '::/0') - ) - SELECT - i.name AS resource, - CASE - WHEN p.name IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN p.name IS NULL THEN i.name || ' does not have SSH (22) or RDP (3389) or HTTP (80) ports open to 0.0.0.0/0 or ::/0.' - ELSE i.name || ' has SSH (22) or RDP (3389) or HTTP (80) ports open to 0.0.0.0/0 or ::/0.' - END AS reason, - i.tags - FROM - aws_lightsail_instance i - LEFT JOIN insecure_ports p ON i.name = p.name; -Severity: low -Tags: {} -Title: Disable SSH and RDP ports for Lightsail instances when not needed \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_lightsail_instance_ssh_restricted_ip.yaml b/compliance/controls/pending/aws/aws_lightsail_instance_ssh_restricted_ip.yaml deleted file mode 100644 index 18448e385..000000000 --- a/compliance/controls/pending/aws/aws_lightsail_instance_ssh_restricted_ip.yaml +++ /dev/null @@ -1,55 +0,0 @@ -Description: Any ports enable within Lightsail by default are open and exposed to the world. For SSH and RDP access you should identify which IP address need access. -ID: aws_lightsail_instance_ssh_restricted_ip -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH open_ports AS ( - SELECT - name, - jsonb_array_elements(networking -> 'Ports') AS port - FROM - aws_lightsail_instance - ), - port_cidrs AS ( - SELECT - op.name, - (op.port ->> 'FromPort')::int AS from_port, - (op.port ->> 'ToPort')::int AS to_port, - op.port ->> 'Protocol' AS protocol, - jsonb_array_elements_text(op.port -> 'Cidrs') AS cidr - FROM - open_ports op - ), - unrestricted_ssh_ports AS ( - SELECT - name - FROM - port_cidrs - WHERE - from_port = 22 - AND to_port = 22 - AND protocol = 'tcp' - AND cidr = '0.0.0.0/0' - ) - SELECT - i.name AS resource, - CASE - WHEN usp.name IS NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN usp.name IS NULL THEN i.name || ' has SSH (22) restricted to specific IP addresses.' - ELSE i.name || ' has SSH (22) open to the world (0.0.0.0/0).' - END AS reason, - i.tags - FROM - aws_lightsail_instance i - LEFT JOIN unrestricted_ssh_ports usp ON i.name = usp.name; -Severity: low -Tags: {} -Title: Ensure SSH is restricted to only IP address that should have this access \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_rds_db_cluster_encrypted_with_cmk.yaml b/compliance/controls/pending/aws/aws_rds_db_cluster_encrypted_with_cmk.yaml deleted file mode 100644 index 1ee2217e3..000000000 --- a/compliance/controls/pending/aws/aws_rds_db_cluster_encrypted_with_cmk.yaml +++ /dev/null @@ -1,48 +0,0 @@ -Description: Ensure RDS DB cluster is encrypted using CMK. The rule is non-compliant if the RDS DB cluster is not encrypted using CMK. -ID: aws_rds_db_cluster_encrypted_with_cmk -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH rds_clusters AS ( - SELECT - arn, - region, - account_id, - kms_key_id, - storage_encrypted, - title, - tags, - _ctx - FROM - aws_rds_db_cluster - ), kms_keys AS ( - SELECT - k.arn, - k.key_manager, - k.enabled - FROM - aws_kms_key AS k - ) - SELECT - r.arn AS resource, - CASE - WHEN NOT storage_encrypted THEN 'alarm' - WHEN storage_encrypted AND c.key_manager = 'CUSTOMER' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN NOT storage_encrypted THEN title || ' not encrypted.' - WHEN storage_encrypted AND c.key_manager = 'CUSTOMER' THEN title || ' encrypted with CMK.' - ELSE title || ' not encrypted with CMK.' - END AS reason - FROM - rds_clusters AS r - LEFT JOIN kms_keys AS c ON r.kms_key_id = c.arn; -Severity: low -Tags: {} -Title: RDS DB clusters should be encrypted with CMK \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_rds_db_instance_no_public_subnet.yaml b/compliance/controls/pending/aws/aws_rds_db_instance_no_public_subnet.yaml deleted file mode 100644 index 3370b84f7..000000000 --- a/compliance/controls/pending/aws/aws_rds_db_instance_no_public_subnet.yaml +++ /dev/null @@ -1,95 +0,0 @@ -Description: This control checks if RDS DB instance is configured with public subnet as there is a risk of exposing sensitive data. -ID: aws_rds_db_instance_no_public_subnet -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH subnets_with_explicit_route AS ( - SELECT DISTINCT - (a ->> 'SubnetId') AS all_sub - FROM - aws_vpc_route_table AS t, - jsonb_array_elements(associations) AS a - WHERE - a ->> 'SubnetId' IS NOT NULL - ), public_subnets_with_explicit_route AS ( - SELECT DISTINCT - a ->> 'SubnetId' AS SubnetId - FROM - aws_vpc_route_table AS t, - jsonb_array_elements(associations) AS a, - jsonb_array_elements(routes) AS r - WHERE - r ->> 'DestinationCidrBlock' = '0.0.0.0/0' - AND ( - r ->> 'GatewayId' LIKE 'igw-%' - OR r ->> 'NatGatewayId' LIKE 'nat-%' - ) - AND a ->> 'SubnetId' IS NOT NULL - ), public_subnets_with_implicit_route AS ( - SELECT DISTINCT - route_table_id, - vpc_id, - region - FROM - aws_vpc_route_table AS t, - jsonb_array_elements(associations) AS a, - jsonb_array_elements(routes) AS r - WHERE - a ->> 'Main' = 'true' - AND r ->> 'DestinationCidrBlock' = '0.0.0.0/0' - AND ( - r ->> 'GatewayId' LIKE 'igw-%' - OR r ->> 'NatGatewayId' LIKE 'nat-%' - ) - ), subnet_accessibility AS ( - SELECT - subnet_id, - vpc_id, - CASE - WHEN s.subnet_id IN ( - SELECT all_sub FROM subnets_with_explicit_route - WHERE all_sub NOT IN ( - SELECT SubnetId FROM public_subnets_with_explicit_route - ) - ) THEN 'private' - WHEN p.SubnetId IS NOT NULL - OR s.vpc_id IN ( - SELECT vpc_id FROM public_subnets_with_implicit_route - ) THEN 'public' - ELSE 'private' - END AS access - FROM aws_vpc_subnet AS s - LEFT JOIN public_subnets_with_explicit_route AS p - ON p.SubnetId = s.subnet_id - ), cluster_public_subnet AS ( - SELECT DISTINCT - arn, - name AS subnet_group_name - FROM - aws_rds_db_subnet_group, - jsonb_array_elements(subnets) AS s - LEFT JOIN subnet_accessibility AS a - ON a.subnet_id = s ->> 'SubnetIdentifier' - WHERE a.access = 'public' - ) - SELECT - c.arn AS resource, - CASE - WHEN s.subnet_group_name IS NOT NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN s.subnet_group_name IS NOT NULL THEN c.title || ' has public subnet.' - ELSE c.title || ' has private subnet.' - END AS reason - FROM aws_rds_db_instance AS c - LEFT JOIN cluster_public_subnet AS s - ON s.subnet_group_name = c.db_subnet_group_name; -Severity: low -Tags: {} -Title: RDS DB instances should not use public subnet \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_redshift_cluster_encrypted_with_cmk.yaml b/compliance/controls/pending/aws/aws_redshift_cluster_encrypted_with_cmk.yaml deleted file mode 100644 index 7e038dabd..000000000 --- a/compliance/controls/pending/aws/aws_redshift_cluster_encrypted_with_cmk.yaml +++ /dev/null @@ -1,47 +0,0 @@ -Description: Ensure Redshift cluster is encrypted using CMK. The rule is non-compliant if the Redshift clusters is not encrypted using CMK. -ID: aws_redshift_cluster_encrypted_with_cmk -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH redshift_clusters AS ( - SELECT - arn, - region, - account_id, - kms_key_id, - encrypted, - title, - tags, - _ctx - FROM - aws_redshift_cluster - ), kms_keys AS ( - SELECT - k.arn, - k.key_manager - FROM - aws_kms_key AS k - ) - SELECT - r.arn AS resource, - CASE - WHEN NOT encrypted THEN 'alarm' - WHEN encrypted AND c.key_manager = 'CUSTOMER' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN NOT encrypted THEN title || ' not encrypted.' - WHEN encrypted AND c.key_manager = 'CUSTOMER' THEN title || ' encrypted with CMK.' - ELSE title || ' not encrypted with CMK.' - END AS reason - FROM - redshift_clusters AS r - LEFT JOIN kms_keys AS c ON r.kms_key_id = c.arn; -Severity: low -Tags: {} -Title: Redshift clusters should be encrypted with CMK \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_s3_bucket_object_logging_enabled.yaml b/compliance/controls/pending/aws/aws_s3_bucket_object_logging_enabled.yaml deleted file mode 100644 index 8a73d22fd..000000000 --- a/compliance/controls/pending/aws/aws_s3_bucket_object_logging_enabled.yaml +++ /dev/null @@ -1,74 +0,0 @@ -Description: Object-Level logging saves events in JSON format in CloudTrail. This is recommended from a security best practice perspective for buckets that contain sensitive data. -ID: aws_s3_bucket_object_logging_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH object_logging_cloudtrails AS ( - SELECT - d ->> 'Type' AS type, - REPLACE(REPLACE(v::text,'\"',''),'/','') AS bucket_arn - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) e, - jsonb_array_elements(e -> 'DataResources') AS d, - jsonb_array_elements(d -> 'Values') v - WHERE - d ->> 'Type' = 'AWS::S3::Object' - ), - object_logging_region AS ( - SELECT - region AS cloudtrail_region, - REPLACE(REPLACE(v::text,'\"',''),'/','') AS bucket_arn - FROM - aws_cloudtrail_trail, - jsonb_array_elements(event_selectors) e, - jsonb_array_elements(e -> 'DataResources') AS d, - jsonb_array_elements(d -> 'Values') v - WHERE - d ->> 'Type' = 'AWS::S3::Object' - AND REPLACE(REPLACE(v::text,'\"',''),'/','') = 'arn:aws:s3' - GROUP BY - region, - bucket_arn - ), - object_logging_region_advance_es AS ( - SELECT - region AS cloudtrail_region - FROM - aws_cloudtrail_trail, - jsonb_array_elements(advanced_event_selectors) a, - jsonb_array_elements(a -> 'FieldSelectors') AS f, - jsonb_array_elements_text(f -> 'Equals') e - WHERE - e = 'AWS::S3::Object' - AND f ->> 'Field' != 'eventCategory' - GROUP BY - region - ) - SELECT - DISTINCT s.arn AS resource, - CASE - WHEN (s.arn = c.bucket_arn) - OR (r.bucket_arn = 'arn:aws:s3' AND r.cloudtrail_region = s.region) - OR a.cloudtrail_region = s.region THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (s.arn = c.bucket_arn) - OR (r.bucket_arn = 'arn:aws:s3' AND r.cloudtrail_region = s.region) - OR a.cloudtrail_region = s.region THEN s.name || ' object logging enabled.' - ELSE s.name || ' object logging not enabled.' - END AS reason - FROM - aws_s3_bucket AS s - LEFT JOIN object_logging_cloudtrails AS c ON s.arn = c.bucket_arn - LEFT JOIN object_logging_region AS r ON r.cloudtrail_region = s.region - LEFT JOIN object_logging_region_advance_es AS a ON a.cloudtrail_region = s.region -Severity: low -Tags: {} -Title: S3 buckets object logging should be enabled \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_vpc_subnet_multi_az_enabled.yaml b/compliance/controls/pending/aws/aws_vpc_subnet_multi_az_enabled.yaml deleted file mode 100644 index 89e5047c7..000000000 --- a/compliance/controls/pending/aws/aws_vpc_subnet_multi_az_enabled.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Ensure that each VPC has subnets spread across multiple availability zones. -ID: aws_vpc_subnet_multi_az_enabled -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH subnet_list AS ( - SELECT - DISTINCT availability_zone, - vpc_id, - COUNT(*) - FROM - aws_vpc_subnet - GROUP BY - vpc_id, availability_zone - ), zone_list AS ( - SELECT - vpc_id, - COUNT(*) AS num - FROM - subnet_list - GROUP BY - vpc_id - ) - SELECT - arn AS resource, - CASE - WHEN l.num IS NULL THEN 'alarm' - WHEN l.num > 1 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN l.num IS NULL THEN v.title || ' no subnet exists.' - WHEN l.num > 1 THEN v.title || ' subnets exist in ' || num || ' availability zones.' - ELSE v.title || ' subnet(s) exist in single availability zone.' - END AS reason - FROM - aws_vpc AS v - LEFT JOIN zone_list AS l ON l.vpc_id = v.vpc_id; -Severity: low -Tags: {} -Title: VPCs subnets should exist in multiple availability zones \ No newline at end of file diff --git a/compliance/controls/pending/aws/aws_vpc_subnet_public_and_private.yaml b/compliance/controls/pending/aws/aws_vpc_subnet_public_and_private.yaml deleted file mode 100644 index 63671aaab..000000000 --- a/compliance/controls/pending/aws/aws_vpc_subnet_public_and_private.yaml +++ /dev/null @@ -1,119 +0,0 @@ -Description: Ensure that all VPCs have both public and private subnets configured. -ID: aws_vpc_subnet_public_and_private -IntegrationType: - - aws_cloud_account -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - WITH subnets_with_explicit_route AS ( - SELECT DISTINCT (a ->> 'SubnetId') AS all_sub - FROM aws_vpc_route_table AS t, - jsonb_array_elements(associations) AS a - WHERE a ->> 'SubnetId' IS NOT NULL - ), public_subnets_with_explicit_route AS ( - SELECT DISTINCT a ->> 'SubnetId' AS SubnetId - FROM aws_vpc_route_table AS t, - jsonb_array_elements(associations) AS a, - jsonb_array_elements(routes) AS r - WHERE r ->> 'DestinationCidrBlock' = '0.0.0.0/0' - AND ( - r ->> 'GatewayId' LIKE 'igw-%' - OR r ->> 'NatGatewayId' LIKE 'nat-%' - ) - AND a ->> 'SubnetId' IS NOT NULL - ), public_subnets_with_implicit_route AS ( - SELECT DISTINCT route_table_id, vpc_id, region - FROM aws_vpc_route_table AS t, - jsonb_array_elements(associations) AS a, - jsonb_array_elements(routes) AS r - WHERE a ->> 'Main' = 'true' - AND r ->> 'DestinationCidrBlock' = '0.0.0.0/0' - AND ( - r ->> 'GatewayId' LIKE 'igw-%' - OR r ->> 'NatGatewayId' LIKE 'nat-%' - ) - ), subnet_accessibility AS ( - SELECT subnet_id, vpc_id, - CASE - WHEN s.subnet_id IN ( - SELECT all_sub - FROM subnets_with_explicit_route - WHERE all_sub NOT IN (SELECT SubnetId FROM public_subnets_with_explicit_route) - ) THEN 'private' - WHEN p.SubnetId IS NOT NULL - OR s.vpc_id IN (SELECT vpc_id FROM public_subnets_with_implicit_route) - THEN 'public' - ELSE 'private' - END AS access - FROM aws_vpc_subnet AS s - LEFT JOIN public_subnets_with_explicit_route AS p - ON p.SubnetId = s.subnet_id - ) - SELECT arn AS resource, - CASE - WHEN v.vpc_id NOT IN (SELECT vpc_id FROM subnet_accessibility) THEN 'alarm' - WHEN 'public' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) AND 'private' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) THEN 'ok' - WHEN 'public' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) AND NOT 'private' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) THEN 'alarm' - WHEN 'private' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) AND NOT 'public' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) THEN 'alarm' - END AS status, - CASE - WHEN v.vpc_id NOT IN (SELECT vpc_id FROM subnet_accessibility) THEN v.title || ' has no subnet.' - WHEN 'public' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) AND 'private' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) THEN v.title || ' having both private and public subnet(s).' - WHEN 'public' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) AND NOT 'private' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) THEN v.title || ' having only public subnet(s).' - WHEN 'private' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) AND NOT 'public' IN ( - SELECT access - FROM subnet_accessibility - WHERE vpc_id = v.vpc_id - ) THEN v.title || ' having only private subnet(s).' - END AS reason - FROM aws_vpc AS v; -Severity: low -Tags: {} -Title: VPCs should have both public and private subnets configured \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_application_insights_linked_to_log_analytics_workspace.yaml b/compliance/controls/pending/azure/azure_application_insights_linked_to_log_analytics_workspace.yaml deleted file mode 100644 index cfc7d34a1..000000000 --- a/compliance/controls/pending/azure/azure_application_insights_linked_to_log_analytics_workspace.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Link the Application Insights component to a Log Analytics workspace for logs encryption. Customer-managed keys are commonly required to meet regulatory compliance and for more control over the access to your data in Azure Monitor. Linking your component to a Log Analytics workspace that's enabled with a customer-managed key, ensures that your Application Insights logs meet this compliance requirement, see https://docs.microsoft.com/azure/azure-monitor/platform/customer-managed-keys. -ID: azure_application_insights_linked_to_log_analytics_workspace -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN type = 'microsoft.insights/components' - AND workspace_resource_id IS NOT NULL THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN type = 'microsoft.insights/components' - AND workspace_resource_id IS NOT NULL THEN a.name || ' linked to log analytics workspace.' - ELSE a.name || ' not linked to log analytics workspace.' - END AS reason - FROM - azure_application_insight AS a - LEFT JOIN azure_subscription sub - ON sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: Azure Monitor Logs for Application Insights should be linked to a Log Analytics workspace \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_appservice_web_app_worker_more_than_one.yaml b/compliance/controls/pending/azure/azure_appservice_web_app_worker_more_than_one.yaml deleted file mode 100644 index 2891546e3..000000000 --- a/compliance/controls/pending/azure/azure_appservice_web_app_worker_more_than_one.yaml +++ /dev/null @@ -1,26 +0,0 @@ -Description: It is recommended to have more than one worker for failover. This control is non-compliant if Web apps have one or less than one worker. -ID: azure_appservice_web_app_worker_more_than_one -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - p ->> 'ID' AS resource, - CASE - WHEN (p -> 'SiteProperties' -> 'siteConfig' ->> 'numberOfWorkers')::int > 1 THEN 'ok' - ELSE 'alarm' - END AS status, - a.name || ' has ' || (p -> 'SiteProperties' -> 'siteConfig' ->> 'numberOfWorkers') || ' no of worker(s).' AS reason - FROM - azure_app_service_plan AS a, - jsonb_array_elements(apps) AS p, - azure_subscription AS sub - WHERE - sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: Web app should have more than one worker \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_3_5.yaml b/compliance/controls/pending/azure/azure_cis_v130_3_5.yaml deleted file mode 100644 index a873a22ba..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_3_5.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Disable anonymous access to blob containers and disallow blob public access on storage account. -ID: azure_cis_v130_3_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - container.id AS resource, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' - THEN account.name || ' container ' || container.name || ' doesn''t allow anonymous access.' - ELSE account.name || ' container ' || container.name || ' allows anonymous access.' - END AS reason - FROM - azure_storage_container container - JOIN azure_storage_account account - ON container.account_name = account.name - JOIN azure_subscription sub - ON sub.subscription_id = account.subscription_id; -Severity: low -Tags: {} -Title: 3.5 Ensure that 'Public access level' is set to Private for blob containers \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_1_1.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_1_1.yaml deleted file mode 100644 index 028114149..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_1_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable auditing on SQL Servers. -ID: azure_cis_v130_4_1_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN name || ' auditing disabled.' - ELSE name || ' auditing enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.1 Ensure that 'Auditing' is set to 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_1_3.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_1_3.yaml deleted file mode 100644 index b7e4058ff..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_1_3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: SQL Server Audit Retention should be configured to be greater than 90 days. -ID: azure_cis_v130_4_1_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN 'ok' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN name || ' audit retention set to unlimited days.' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN name || ' audit retention greater than 90 days.' - ELSE name || ' audit retention less than 90 days.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.3 Ensure that 'Auditing' Retention is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_2_1.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_2_1.yaml deleted file mode 100644 index daba84356..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_2_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable "Azure Defender for SQL" on critical SQL Servers. -ID: azure_cis_v130_4_2_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' Azure defender disabled.' - ELSE s.name || ' Azure defender enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.1 Ensure that Advanced Threat Protection (ATP) on a SQL server is set to 'Enabled' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_2_2.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_2_2.yaml deleted file mode 100644 index 2863d0330..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_2_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) service scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v130_4_2_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' VA setting disabled.' - ELSE s.name || ' VA setting enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.2 Ensure that Vulnerability Assessment (VA) is enabled on a SQL server by setting a Storage Account \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_2_3.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_2_3.yaml deleted file mode 100644 index bfa7486d1..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_2_3.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) Periodic recurring scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v130_4_2_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN s.name || ' VA setting periodic recurring scans disabled.' - ELSE s.name || ' VA setting periodic recurring scans enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.3 Ensure that VA setting Periodic Recurring Scans is enabled on a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_2_4.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_2_4.yaml deleted file mode 100644 index c0062af8a..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_2_4.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: Configure 'Send scan reports to' with email ids of concerned data owners/stakeholders for a critical SQL servers. -ID: azure_cis_v130_4_2_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN s.name || ' VA scan reports and alerts not configured send email.' - ELSE s.name || ' VA scan reports and alerts configured to send email.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.4 Ensure that VA setting Send scan reports to is configured for a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_2_5.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_2_5.yaml deleted file mode 100644 index b9f535a6d..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_2_5.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners'. -ID: azure_cis_v130_4_2_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN s.name || ' VA setting not configured to send email notifications to subscription admins and owners.' - ELSE s.name || ' VA setting configured to send email notifications to subscription admins and owners.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.5 Ensure that VA setting 'Also send email notifications to admins and subscription owners' is set for a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_3_3.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_3_3.yaml deleted file mode 100644 index b82166598..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_3_3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Enable log_checkpoints on PostgreSQL Servers. -ID: azure_cis_v130_4_3_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' - THEN s.name || ' server parameter log_checkpoints off.' - ELSE s.name || ' server parameter log_checkpoints on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_checkpoints' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.3 Ensure server parameter 'log_checkpoints' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_3_4.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_3_4.yaml deleted file mode 100644 index 62e64e289..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_3_4.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Description: Enable log_connections on PostgreSQL Servers. -ID: azure_cis_v130_4_3_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: - - azure_postgresql_server - - azure_subscription - Parameters: [] - PrimaryTable: azure_postgresql_server - QueryToExecute: | - SELECT - s.id AS resource, - s.og_account_id AS og_account_id, - s.og_resource_id AS og_resource_id, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_connections off.' - ELSE s.name || ' server parameter log_connections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_connections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.4 Ensure server parameter 'log_connections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_3_6.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_3_6.yaml deleted file mode 100644 index 0cf146746..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_3_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable connection_throttling on PostgreSQL Servers. -ID: azure_cis_v130_4_3_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter connection_throttling off.' - ELSE s.name || ' server parameter connection_throttling on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'connection_throttling' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.6 Ensure server parameter 'connection_throttling' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_3_7.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_3_7.yaml deleted file mode 100644 index 589913955..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_3_7.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_retention_days on PostgreSQL Servers. -ID: azure_cis_v130_4_3_7 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::integer <= 3 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::integer <= 3 THEN s.name || ' log files are retained for 3 days or lesser.' - ELSE s.name || ' log files are retained for more than 3 days.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) AS config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_retention_days' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.7 Ensure server parameter 'log_retention_days' is greater than 3 days for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_4_5.yaml b/compliance/controls/pending/azure/azure_cis_v130_4_5.yaml deleted file mode 100644 index 27c2b39ba..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_4_5.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Based on business needs or criticality of data/databases hosted on a SQL server, it is recommended that the TDE protector is encrypted by a key that is managed by the data owner (Customer-managed key) -ID: azure_cis_v130_4_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN s.name || ' TDE protector not encrypted with CMK.' - ELSE s.name || ' TDE protector encrypted with CMK.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(encryption_protector) encryption, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.5 Ensure SQL server's TDE protector is encrypted with Customer-managed key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_5_1_4.yaml b/compliance/controls/pending/azure/azure_cis_v130_5_1_4.yaml deleted file mode 100644 index c567e0058..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_5_1_4.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: The storage account with the activity log export container is configured to use BYOK (Use Your Own Key). -ID: azure_cis_v130_5_1_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' - THEN a.name || ' container insights-operational-logs encrypted with BYOK.' - ELSE a.name || ' container insights-operational-logs not encrypted with BYOK.' - END AS reason - FROM - azure_storage_container c, - azure_storage_account a, - azure_subscription sub - WHERE - c.name = 'insights-operational-logs' - AND c.account_name = a.name - AND sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: 5.1.4 Ensure the storage account containing the container with activity logs is encrypted with BYOK (Use Your Own Key) \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_6_4.yaml b/compliance/controls/pending/azure/azure_cis_v130_6_4.yaml deleted file mode 100644 index 2edb6e963..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_6_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Network Security Group Flow Logs should be enabled and the retention period is set to greater than or equal to 90 days. -ID: azure_cis_v130_6_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sg.id AS resource, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled OR fl.retention_policy_days < 90 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled THEN sg.name || ' flowlog not enabled.' - WHEN fl.retention_policy_days < 90 THEN sg.name || ' flowlog ' || fl.title || ' retention period is less than 90 days.' - ELSE sg.name || ' flowlog ' || fl.title || ' retention period is ' || fl.retention_policy_days || ' days.' - END AS reason - FROM - azure_network_security_group sg - LEFT JOIN - azure_network_watcher_flow_log fl ON sg.id = fl.target_resource_id - JOIN - azure_subscription sub ON sub.subscription_id = sg.subscription_id; -Severity: low -Tags: {} -Title: 6.4 Ensure that Network Security Group Flow Log retention period is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_6_5.yaml b/compliance/controls/pending/azure/azure_cis_v130_6_5.yaml deleted file mode 100644 index eef1830a3..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_6_5.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: Enable Network Watcher for Azure subscriptions. -ID: azure_cis_v130_6_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - loc.id AS resource, - CASE - WHEN watcher.id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN watcher.id IS NULL THEN 'Network watcher not enabled in ' || loc.name || '.' - ELSE 'Network watcher enabled in ' || loc.name || '.' - END AS reason, - loc.name - FROM - azure_location loc - LEFT JOIN azure_network_watcher watcher ON watcher.region = loc.name - JOIN azure_subscription sub ON sub.subscription_id = loc.subscription_id; -Severity: low -Tags: {} -Title: 6.5 Ensure that Network Watcher is 'Enabled' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v130_9_10.yaml b/compliance/controls/pending/azure/azure_cis_v130_9_10.yaml deleted file mode 100644 index ab042b5ce..000000000 --- a/compliance/controls/pending/azure/azure_cis_v130_9_10.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: By default, Azure Functions, Web and API Services can be deployed over FTP. If FTP is required for an essential deployment workflow, FTPS should be required for FTP login for all App Service Apps and Functions. -ID: azure_cis_v130_9_10 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - fa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_function_app fa, - azure_subscription sub - WHERE - sub.subscription_id = fa.subscription_id - UNION - SELECT - wa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_web_app AS wa, - azure_subscription AS sub - WHERE - sub.subscription_id = wa.subscription_id; -Severity: low -Tags: {} -Title: 9.10 Ensure FTP deployments are disabled \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_1_6.yaml b/compliance/controls/pending/azure/azure_cis_v140_1_6.yaml deleted file mode 100644 index 7840b2f14..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_1_6.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Description: Ensure that the number of days before users are asked to re-confirm their authentication information is not set to 0. -ID: azure_cis_v140_1_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'active_directory' AS resource, - 'info' AS status, - 'Manual verification required.' AS reason; -Severity: low -Tags: {} -Title: 1.6 Ensure that 'Number of days before users are asked to re-confirm their authentication information' is not set to "0" \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_1_8.yaml b/compliance/controls/pending/azure/azure_cis_v140_1_8.yaml deleted file mode 100644 index a2cdf5973..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_1_8.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Description: Ensure that all administrators are notified if any other administrator resets their password. -ID: azure_cis_v140_1_8 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'active_directory' AS resource, - 'info' AS status, - 'Manual verification required.' AS reason; -Severity: low -Tags: {} -Title: 1.8 Ensure that 'Notify all admins when other admins reset their password?' is set to 'Yes' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_3_5.yaml b/compliance/controls/pending/azure/azure_cis_v140_3_5.yaml deleted file mode 100644 index be987a4d8..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_3_5.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: Disable anonymous access to blob containers and disallow blob public access on storage account. -ID: azure_cis_v140_3_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - container.id AS resource, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' - THEN account.name || ' container ' || container.name || ' doesn''t allow anonymous access.' - ELSE account.name || ' container ' || container.name || ' allows anonymous access.' - END AS reason - FROM - azure_storage_container container - JOIN azure_storage_account account ON container.account_name = account.name - JOIN azure_subscription sub ON sub.subscription_id = account.subscription_id; -Severity: low -Tags: {} -Title: 3.5 Ensure that 'Public access level' is set to Private for blob containers \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_1_1.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_1_1.yaml deleted file mode 100644 index 2777c4b1b..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_1_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable auditing on SQL Servers. -ID: azure_cis_v140_4_1_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN name || ' auditing disabled.' - ELSE name || ' auditing enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.1 Ensure that 'Auditing' is set to 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_1_3.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_1_3.yaml deleted file mode 100644 index 649ab5b4d..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_1_3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: SQL Server Audit Retention should be configured to be greater than 90 days. -ID: azure_cis_v140_4_1_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN 'ok' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN name || ' audit retention set to unlimited days.' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN name || ' audit retention greater than 90 days.' - ELSE name || ' audit retention less than 90 days.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.3 Ensure that 'Auditing' Retention is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_2_1.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_2_1.yaml deleted file mode 100644 index 9d20a1fde..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_2_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable "Azure Defender for SQL" on critical SQL Servers. -ID: azure_cis_v140_4_2_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' Azure defender disabled.' - ELSE s.name || ' Azure defender enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.1 Ensure that Advanced Threat Protection (ATP) on a SQL server is set to 'Enabled' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_2_2.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_2_2.yaml deleted file mode 100644 index b1b2a327f..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_2_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) service scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v140_4_2_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' VA setting disabled.' - ELSE s.name || ' VA setting enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.2 Ensure that Vulnerability Assessment (VA) is enabled on a SQL server by setting a Storage Account \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_2_3.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_2_3.yaml deleted file mode 100644 index 64653266b..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_2_3.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) Periodic recurring scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v140_4_2_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN s.name || ' VA setting periodic recurring scans disabled.' - ELSE s.name || ' VA setting periodic recurring scans enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.3 Ensure that VA setting Periodic Recurring Scans is enabled on a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_2_4.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_2_4.yaml deleted file mode 100644 index d1e8553b5..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_2_4.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Configure 'Send scan reports to' with email ids of concerned data owners/stakeholders for a critical SQL servers. -ID: azure_cis_v140_4_2_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN s.name || ' VA scan reports and alerts not configured send email.' - ELSE s.name || ' VA scan reports and alerts configured to send email.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.4 Ensure that VA setting 'Send scan reports to' is configured for a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_2_5.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_2_5.yaml deleted file mode 100644 index ae8889b5e..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_2_5.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners'. -ID: azure_cis_v140_4_2_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN s.name || ' VA setting not configured to send email notifications to subscription admins and owners.' - ELSE s.name || ' VA setting configured to send email notifications to subscription admins and owners.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.5 Ensure that Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners' is set for each SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_3_2.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_3_2.yaml deleted file mode 100644 index 4661d9084..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_3_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_checkpoints on PostgreSQL Servers. -ID: azure_cis_v140_4_3_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_checkpoints off.' - ELSE s.name || ' server parameter log_checkpoints on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_checkpoints' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.2 Ensure server parameter 'log_checkpoints' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_3_3.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_3_3.yaml deleted file mode 100644 index e131a4a9b..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_3_3.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_connections on PostgreSQL Servers. -ID: azure_cis_v140_4_3_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_connections off.' - ELSE s.name || ' server parameter log_connections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_connections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.3 Ensure server parameter 'log_connections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_3_4.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_3_4.yaml deleted file mode 100644 index 24bfb5e2b..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_3_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_disconnections on PostgreSQL Servers. -ID: azure_cis_v140_4_3_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN name || ' server parameter log_disconnections off.' - ELSE name || ' server parameter log_disconnections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_disconnections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.4 Ensure server parameter 'log_disconnections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_3_5.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_3_5.yaml deleted file mode 100644 index 0c516f674..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_3_5.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable connection_throttling on PostgreSQL Servers. -ID: azure_cis_v140_4_3_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter connection_throttling off.' - ELSE s.name || ' server parameter connection_throttling on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'connection_throttling' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.5 Ensure server parameter 'connection_throttling' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_3_6.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_3_6.yaml deleted file mode 100644 index 06ddc4b62..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_3_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_retention_days on PostgreSQL Servers. -ID: azure_cis_v140_4_3_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::INTEGER <= 3 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::INTEGER <= 3 THEN s.name || ' log files are retained for 3 days or lesser.' - ELSE s.name || ' log files are retained for more than 3 days.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) AS config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_retention_days' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.6 Ensure server parameter 'log_retention_days' is greater than 3 days for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_4_6.yaml b/compliance/controls/pending/azure/azure_cis_v140_4_6.yaml deleted file mode 100644 index bc20856ce..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_4_6.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Based on business needs or criticality of data/databases hosted a SQL server, it is recommended that the TDE protector is encrypted by a key that is managed by the data owner (Customer-managed key) -ID: azure_cis_v140_4_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN s.name || ' TDE protector not encrypted with CMK.' - ELSE s.name || ' TDE protector encrypted with CMK.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(encryption_protector) encryption, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.6 Ensure SQL server's TDE protector is encrypted with Customer-managed key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_5_1_4.yaml b/compliance/controls/pending/azure/azure_cis_v140_5_1_4.yaml deleted file mode 100644 index d62a14a7d..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_5_1_4.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: The storage account with the activity log export container is configured to use BYOK (Use Your Own Key). -ID: azure_cis_v140_5_1_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' - THEN a.name || ' container insights-operational-logs encrypted with BYOK.' - ELSE a.name || ' container insights-operational-logs not encrypted with BYOK.' - END AS reason - FROM - azure_storage_container c, - azure_storage_account a, - azure_subscription sub - WHERE - c.name = 'insights-operational-logs' - AND c.account_name = a.name - AND sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: 5.1.4 Ensure the storage account containing the container with activity logs is encrypted with BYOK (Use Your Own Key) \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_6_4.yaml b/compliance/controls/pending/azure/azure_cis_v140_6_4.yaml deleted file mode 100644 index 07611ac01..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_6_4.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Network Security Group Flow Logs should be enabled and the retention period is set to greater than or equal to 90 days. -ID: azure_cis_v140_6_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sg.id AS resource, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled OR fl.retention_policy_days < 90 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled - THEN sg.name || ' flowlog not enabled.' - WHEN fl.retention_policy_days < 90 - THEN sg.name || ' flowlog ' || fl.title || ' retention period is less than 90 days.' - ELSE sg.name || ' flowlog ' || fl.title || ' retention period is ' || fl.retention_policy_days || ' days.' - END AS reason - FROM - azure_network_security_group sg - LEFT JOIN - azure_network_watcher_flow_log fl ON sg.id = fl.target_resource_id - JOIN - azure_subscription sub ON sub.subscription_id = sg.subscription_id; -Severity: low -Tags: {} -Title: 6.4 Ensure that Network Security Group Flow Log retention period is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_6_5.yaml b/compliance/controls/pending/azure/azure_cis_v140_6_5.yaml deleted file mode 100644 index bf0b84afc..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_6_5.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable Network Watcher for Azure subscriptions. -ID: azure_cis_v140_6_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - loc.id AS resource, - CASE - WHEN watcher.id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN watcher.id IS NULL THEN 'Network watcher not enabled in ' || loc.name || '.' - ELSE 'Network watcher enabled in ' || loc.name || '.' - END AS reason, - loc.name - FROM - azure_location loc - LEFT JOIN - azure_network_watcher watcher ON watcher.region = loc.name - JOIN - azure_subscription sub ON sub.subscription_id = loc.subscription_id; -Severity: low -Tags: {} -Title: 6.5 Ensure that Network Watcher is 'Enabled' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v140_9_10.yaml b/compliance/controls/pending/azure/azure_cis_v140_9_10.yaml deleted file mode 100644 index 0a78109f9..000000000 --- a/compliance/controls/pending/azure/azure_cis_v140_9_10.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: By default, Azure Functions, Web and API Services can be deployed over FTP. If FTP is required for an essential deployment workflow, FTPS should be required for FTP login for all App Service Apps and Functions. -ID: azure_cis_v140_9_10 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - fa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_function_app fa, - azure_subscription sub - WHERE - sub.subscription_id = fa.subscription_id - UNION - SELECT - wa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_web_app AS wa, - azure_subscription AS sub - WHERE - sub.subscription_id = wa.subscription_id; -Severity: low -Tags: {} -Title: 9.10 Ensure FTP deployments are disabled \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_1_13.yaml b/compliance/controls/pending/azure/azure_cis_v150_1_13.yaml deleted file mode 100644 index ebd845c15..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_1_13.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Description: Require administrators to provide consent for the apps before use. -ID: azure_cis_v150_1_13 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'active_directory' AS resource, - 'info' AS status, - 'Manual verification required.' AS reason; -Severity: low -Tags: {} -Title: 1.13 Ensure that 'Users can add gallery apps to My Apps' is set to 'No' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_1_18.yaml b/compliance/controls/pending/azure/azure_cis_v150_1_18.yaml deleted file mode 100644 index e10cae5c2..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_1_18.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Description: Restricts group creation to administrators with permissions only. -ID: azure_cis_v150_1_18 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'active_directory' AS resource, - 'info' AS status, - 'Manual verification required.' AS reason; -Severity: low -Tags: {} -Title: 1.18 Ensure that 'Restrict user ability to access groups features in the Access Pane' is Set to 'Yes' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_3_13.yaml b/compliance/controls/pending/azure/azure_cis_v150_3_13.yaml deleted file mode 100644 index 84bc45d9d..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_3_13.yaml +++ /dev/null @@ -1,37 +0,0 @@ -Description: 'The Storage Blob service provides scalable, cost-efficient object storage in the cloud. Storage Logging happens server-side and allows details for both successful and failed requests to be recorded in the storage account. These logs allow users to see the details of read, write, and delete operations against the blobs. Storage Logging log entries contain the following information about individual requests: timing information such as start time, end-to-end latency, and server latency; authentication details; concurrency information; and the sizes of the request and response messages.' -ID: azure_cis_v150_3_13 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sa.id AS resource, - CASE - WHEN NOT (sa.blob_service_logging ->> 'Read')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Write')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Delete')::BOOLEAN THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN NOT (sa.blob_service_logging ->> 'Read')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Write')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Delete')::BOOLEAN THEN name || ' blob service logging not enabled for ' || - CONCAT_WS(', ', - CASE WHEN NOT (sa.blob_service_logging ->> 'Write')::BOOLEAN THEN 'write' END, - CASE WHEN NOT (sa.blob_service_logging ->> 'Read')::BOOLEAN THEN 'read' END, - CASE WHEN NOT (sa.blob_service_logging ->> 'Delete')::BOOLEAN THEN 'delete' END - ) || ' requests.' - ELSE name || ' blob service logging enabled for read, write, delete requests.' - END AS reason - FROM - azure_storage_account sa, - azure_subscription sub - WHERE - sub.subscription_id = sa.subscription_id; -Severity: low -Tags: {} -Title: 3.13 Ensure Storage logging is Enabled for Blob Service for 'Read', 'Write', and 'Delete' requests \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_1_1.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_1_1.yaml deleted file mode 100644 index e80a7b5b1..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_1_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable auditing on SQL Servers. -ID: azure_cis_v150_4_1_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN name || ' auditing disabled.' - ELSE name || ' auditing enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.1 Ensure that 'Auditing' is set to 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_1_3.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_1_3.yaml deleted file mode 100644 index 339735c41..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_1_3.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Transparent Data Encryption (TDE) with Customer-managed key support provides increased transparency and control over the TDE Protector, increased security with an HSM-backed external service, and promotion of separation of duties. -ID: azure_cis_v150_4_1_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN s.name || ' TDE protector not encrypted with CMK.' - ELSE s.name || ' TDE protector encrypted with CMK.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(encryption_protector) encryption, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.3 Ensure SQL server's Transparent Data Encryption (TDE) protector is encrypted with Customer-managed key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_1_6.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_1_6.yaml deleted file mode 100644 index 7e80f78b5..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_1_6.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: SQL Server Audit Retention should be configured to be greater than 90 days. -ID: azure_cis_v150_4_1_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN 'ok' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN name || ' audit retention set to unlimited days.' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN name || ' audit retention greater than 90 days.' - ELSE name || ' audit retention less than 90 days.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.6 Ensure that 'Auditing' Retention is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_2_1.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_2_1.yaml deleted file mode 100644 index 82ab206af..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_2_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable "Azure Defender for SQL" on critical SQL Servers. -ID: azure_cis_v150_4_2_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' Azure defender disabled.' - ELSE s.name || ' Azure defender enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.1 Ensure that Microsoft Defender for SQL is set to 'On' for critical SQL Servers \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_2_2.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_2_2.yaml deleted file mode 100644 index 97a3eeca3..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_2_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) service scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v150_4_2_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' VA setting disabled.' - ELSE s.name || ' VA setting enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.2 Ensure that Vulnerability Assessment (VA) is enabled on a SQL server by setting a Storage Account \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_2_3.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_2_3.yaml deleted file mode 100644 index 61fe3d455..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_2_3.yaml +++ /dev/null @@ -1,47 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) Periodic recurring scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v150_4_2_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN s.name || ' VA setting periodic recurring scans disabled.' - ELSE s.name || ' VA setting periodic recurring scans enabled.' - END AS reason - - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.3 Ensure that Vulnerability Assessment (VA) setting 'Periodic recurring scans' is set to 'on' for each SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_2_4.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_2_4.yaml deleted file mode 100644 index 63c627401..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_2_4.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Configure 'Send scan reports to' with email ids of concerned data owners/stakeholders for a critical SQL servers. -ID: azure_cis_v150_4_2_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN s.name || ' VA scan reports and alerts not configured send email.' - ELSE s.name || ' VA scan reports and alerts configured to send email.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.4 Ensure that Vulnerability Assessment (VA) setting 'Send scan reports to' is configured for a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_2_5.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_2_5.yaml deleted file mode 100644 index 39f2184b1..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_2_5.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners'. -ID: azure_cis_v150_4_2_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN s.name || ' VA setting not configured to send email notifications to subscription admins and owners.' - ELSE s.name || ' VA setting configured to send email notifications to subscription admins and owners.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.5 Ensure that Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners' is set for each SQL Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_3_2.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_3_2.yaml deleted file mode 100644 index 5425796ef..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_3_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_checkpoints on PostgreSQL Servers. -ID: azure_cis_v150_4_3_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_checkpoints off.' - ELSE s.name || ' server parameter log_checkpoints on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_checkpoints' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.2 Ensure Server Parameter 'log_checkpoints' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_3_3.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_3_3.yaml deleted file mode 100644 index d5117059a..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_3_3.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_connections on PostgreSQL Servers. -ID: azure_cis_v150_4_3_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_connections off.' - ELSE s.name || ' server parameter log_connections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_connections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.3 Ensure server parameter 'log_connections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_3_4.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_3_4.yaml deleted file mode 100644 index 0a53b01b5..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_3_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_disconnections on PostgreSQL Servers. -ID: azure_cis_v150_4_3_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN name || ' server parameter log_disconnections off.' - ELSE name || ' server parameter log_disconnections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_disconnections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.4 Ensure server parameter 'log_disconnections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_3_5.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_3_5.yaml deleted file mode 100644 index 29ea089ed..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_3_5.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable connection_throttling on PostgreSQL Servers. -ID: azure_cis_v150_4_3_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter connection_throttling off.' - ELSE s.name || ' server parameter connection_throttling on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'connection_throttling' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.5 Ensure server parameter 'connection_throttling' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_3_6.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_3_6.yaml deleted file mode 100644 index f88e3f90f..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_3_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_retention_days on PostgreSQL Servers. -ID: azure_cis_v150_4_3_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::INTEGER <= 3 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::INTEGER <= 3 THEN s.name || ' log files are retained for 3 days or lesser.' - ELSE s.name || ' log files are retained for more than 3 days.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) AS config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_retention_days' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.6 Ensure Server Parameter 'log_retention_days' is greater than 3 days for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_4_4_4.yaml b/compliance/controls/pending/azure/azure_cis_v150_4_4_4.yaml deleted file mode 100644 index 5d2c0fb70..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_4_4_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Set audit_log_enabled to include CONNECTION on MySQL Servers. -ID: azure_cis_v150_4_4_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') = 'connection' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') = 'connection' THEN s.name || ' server parameter audit_log_events has connection set.' - ELSE s.name || ' server parameter audit_log_events connection not set.' - END AS reason - FROM - azure_mysql_server AS s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'audit_log_events' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.4.4 Ensure server parameter 'audit_log_events' has 'CONNECTION' set for MySQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_5_1_4.yaml b/compliance/controls/pending/azure/azure_cis_v150_5_1_4.yaml deleted file mode 100644 index 7c64fe821..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_5_1_4.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Storage accounts with the activity log exports can be configured to use Customer Managed Keys (CMK). -ID: azure_cis_v150_5_1_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' - THEN a.name || ' container insights-operational-logs encrypted with BYOK.' - ELSE a.name || ' container insights-operational-logs not encrypted with BYOK.' - END AS reason - FROM - azure_storage_container c, - azure_storage_account a, - azure_subscription sub - WHERE - c.name = 'insights-operational-logs' - AND c.account_name = a.name - AND sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: 5.1.4 Ensure the storage account containing the container with activity logs is encrypted with Customer Managed Key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_6_5.yaml b/compliance/controls/pending/azure/azure_cis_v150_6_5.yaml deleted file mode 100644 index 2c3633d80..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_6_5.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Network Security Group Flow Logs should be enabled and the retention period is set to greater than or equal to 90 days. -ID: azure_cis_v150_6_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sg.id AS resource, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled OR fl.retention_policy_days < 90 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled - THEN sg.name || ' flowlog not enabled.' - WHEN fl.retention_policy_days < 90 - THEN sg.name || ' flowlog ' || fl.title || ' retention period is less than 90 days.' - ELSE sg.name || ' flowlog ' || fl.title || ' retention period is ' || fl.retention_policy_days || ' days.' - END AS reason - FROM - azure_network_security_group sg - LEFT JOIN - azure_network_watcher_flow_log fl ON sg.id = fl.target_resource_id - JOIN - azure_subscription sub ON sub.subscription_id = sg.subscription_id; -Severity: low -Tags: {} -Title: 6.5 Ensure that Network Security Group Flow Log retention period is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_6_6.yaml b/compliance/controls/pending/azure/azure_cis_v150_6_6.yaml deleted file mode 100644 index 2c6389980..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_6_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable Network Watcher for Azure subscriptions. -ID: azure_cis_v150_6_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - loc.id AS resource, - CASE - WHEN watcher.id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN watcher.id IS NULL THEN 'Network watcher not enabled in ' || loc.name || '.' - ELSE 'Network watcher enabled in ' || loc.name || '.' - END AS reason, - loc.name - FROM - azure_location loc - LEFT JOIN azure_network_watcher watcher - ON watcher.region = loc.name - JOIN azure_subscription sub - ON sub.subscription_id = loc.subscription_id; -Severity: low -Tags: {} -Title: 6.6 Ensure that Network Watcher is 'Enabled' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_8_7.yaml b/compliance/controls/pending/azure/azure_cis_v150_8_7.yaml deleted file mode 100644 index d90102f24..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_8_7.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Private endpoints will secure network traffic from Azure Key Vault to the resources requesting secrets and keys. -ID: azure_cis_v150_8_7 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN network_acls IS NULL OR network_acls ->> 'defaultAction' = 'Allow' THEN 'alarm' - WHEN private_endpoint_connections IS NULL THEN 'info' - WHEN private_endpoint_connections @> '[{"PrivateLinkServiceConnectionStateStatus": "Approved"}]' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN network_acls IS NULL OR network_acls ->> 'defaultAction' = 'Allow' THEN a.name || ' using public networks.' - WHEN private_endpoint_connections IS NULL THEN a.name || ' no private link exists.' - WHEN private_endpoint_connections @> '[{"PrivateLinkServiceConnectionStateStatus": "Approved"}]' - THEN a.name || ' using private link.' - ELSE a.name || ' private link not enabled.' - END AS reason - FROM - azure_key_vault a, - azure_subscription sub; -Severity: low -Tags: {} -Title: 8.7 Ensure that Private Endpoints are Used for Azure Key Vault \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_9_10.yaml b/compliance/controls/pending/azure/azure_cis_v150_9_10.yaml deleted file mode 100644 index 75c2be56f..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_9_10.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: By default, Azure Functions, Web and API Services can be deployed over FTP. If FTP is required for an essential deployment workflow, FTPS should be required for FTP login for all App Service Apps and Functions. -ID: azure_cis_v150_9_10 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - fa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_function_app fa, - azure_subscription sub - WHERE - sub.subscription_id = fa.subscription_id - UNION - SELECT - wa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_web_app AS wa, - azure_subscription AS sub - WHERE - sub.subscription_id = wa.subscription_id; -Severity: low -Tags: {} -Title: 9.10 Ensure FTP deployments are disabled \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v150_9_3.yaml b/compliance/controls/pending/azure/azure_cis_v150_9_3.yaml deleted file mode 100644 index eebe5ed70..000000000 --- a/compliance/controls/pending/azure/azure_cis_v150_9_3.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: The TLS(Transport Layer Security) protocol secures transmission of data over the internet using standard encryption technology. Encryption should be set with the latest version of TLS. App service allows TLS 1.2 by default, which is the recommended TLS level by industry standards, such as PCI DSS. -ID: azure_cis_v150_9_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - app.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'minTlsVersion' < '1.2' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'minTlsVersion' < '1.2' THEN name || ' not using the latest version of TLS encryption.' - ELSE name || ' using the latest version of TLS encryption.' - END AS reason - FROM - azure_app_service_web_app AS app, - azure_subscription AS sub - WHERE - sub.subscription_id = app.subscription_id; -Severity: low -Tags: {} -Title: 9.3 Ensure web app is using the latest version of TLS encryption \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_1_11.yaml b/compliance/controls/pending/azure/azure_cis_v200_1_11.yaml deleted file mode 100644 index 0d261f7e9..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_1_11.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Description: Require administrators to provide consent for applications before use. -ID: azure_cis_v200_1_11 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'active_directory' AS resource, - 'info' AS status, - 'Manual verification required.' AS reason; -Severity: low -Tags: {} -Title: 1.11 Ensure 'User consent for applications' is set to 'Do not allow user consent' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_2_1_10.yaml b/compliance/controls/pending/azure/azure_cis_v200_2_1_10.yaml deleted file mode 100644 index c547eb524..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_2_1_10.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: Turning on Microsoft Defender for Key Vault enables threat detection for Key Vault, providing threat intelligence, anomaly detection, and behavior analytics in the Microsoft Defender for Cloud. -ID: azure_cis_v200_2_1_10 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sub_pricing.id AS resource, - CASE - WHEN pricing_tier = 'Standard' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN pricing_tier = 'Standard' THEN 'Azure Defender on for Key Vaults.' - ELSE 'Azure Defender off for Key Vaults.' - END AS reason - FROM - azure_security_center_subscription_pricing sub_pricing - RIGHT JOIN azure_subscription sub ON sub_pricing.subscription_id = sub.subscription_id - WHERE - name = 'KeyVaults'; -Severity: low -Tags: {} -Title: 2.1.10 Ensure That Microsoft Defender for Key Vault Is Set To 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_3_13.yaml b/compliance/controls/pending/azure/azure_cis_v200_3_13.yaml deleted file mode 100644 index bfaecd45c..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_3_13.yaml +++ /dev/null @@ -1,37 +0,0 @@ -Description: 'The Storage Blob service provides scalable, cost-efficient object storage in the cloud. Storage Logging happens server-side and allows details for both successful and failed requests to be recorded in the storage account. These logs allow users to see the details of read, write, and delete operations against the blobs. Storage Logging log entries contain the following information about individual requests: timing information such as start time, end-to-end latency, and server latency; authentication details; concurrency information; and the sizes of the request and response messages.' -ID: azure_cis_v200_3_13 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sa.id AS resource, - CASE - WHEN NOT (sa.blob_service_logging ->> 'Read')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Write')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Delete')::BOOLEAN THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN NOT (sa.blob_service_logging ->> 'Read')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Write')::BOOLEAN - OR NOT (sa.blob_service_logging ->> 'Delete')::BOOLEAN THEN name || ' blob service logging not enabled for ' || - CONCAT_WS(', ', - CASE WHEN NOT (sa.blob_service_logging ->> 'Write')::BOOLEAN THEN 'write' END, - CASE WHEN NOT (sa.blob_service_logging ->> 'Read')::BOOLEAN THEN 'read' END, - CASE WHEN NOT (sa.blob_service_logging ->> 'Delete')::BOOLEAN THEN 'delete' END - ) || ' requests.' - ELSE name || ' blob service logging enabled for read, write, delete requests.' - END AS reason - FROM - azure_storage_account sa, - azure_subscription sub - WHERE - sub.subscription_id = sa.subscription_id; -Severity: low -Tags: {} -Title: 3.13 Ensure Storage logging is Enabled for Blob Service for 'Read', 'Write', and 'Delete' requests \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_3_7.yaml b/compliance/controls/pending/azure/azure_cis_v200_3_7.yaml deleted file mode 100644 index 90858a70f..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_3_7.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Disallowing public access for a storage account overrides the public access settings for individual containers in that storage account. -ID: azure_cis_v200_3_7 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - container.id AS resource, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' - THEN account.name || ' container ' || container.name || ' doesn''t allow anonymous access.' - ELSE account.name || ' container ' || container.name || ' allows anonymous access.' - END AS reason - FROM - azure_storage_container container - JOIN azure_storage_account account - ON container.account_name = account.name - JOIN azure_subscription sub - ON sub.subscription_id = account.subscription_id; -Severity: low -Tags: {} -Title: 3.7 Ensure that 'Public access level' is disabled for storage accounts with blob containers \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_1_1.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_1_1.yaml deleted file mode 100644 index 86757eaa9..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_1_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable auditing on SQL Servers. -ID: azure_cis_v200_4_1_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN name || ' auditing disabled.' - ELSE name || ' auditing enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.1 Ensure that 'Auditing' is set to 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_1_3.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_1_3.yaml deleted file mode 100644 index a7bc72237..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_1_3.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Transparent Data Encryption (TDE) with Customer-managed key support provides increased transparency and control over the TDE Protector, increased security with an HSM-backed external service, and promotion of separation of duties. -ID: azure_cis_v200_4_1_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN s.name || ' TDE protector not encrypted with CMK.' - ELSE s.name || ' TDE protector encrypted with CMK.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(encryption_protector) encryption, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.3 Ensure SQL server's Transparent Data Encryption (TDE) protector is encrypted with Customer-managed key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_1_5.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_1_5.yaml deleted file mode 100644 index e27f8d6b9..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_1_5.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Enable Transparent Data Encryption on every SQL server. -ID: azure_cis_v200_4_1_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.database_id resource, - CASE - WHEN transparent_data_encryption ->> 'status' = 'Enabled' - OR transparent_data_encryption ->> 'state' = 'Enabled' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN transparent_data_encryption ->> 'status' = 'Enabled' - OR transparent_data_encryption ->> 'state' = 'Enabled' THEN s.title || ' transparent data encryption enabled.' - ELSE s.title || ' transparent data encryption disabled.' - END AS reason - FROM - azure_sql_database AS s, - azure_subscription AS sub - WHERE - sub.subscription_id = s.subscription_id - AND s.name <> 'master'; -Severity: low -Tags: {} -Title: 4.1.5 Ensure that 'Data encryption' is set to 'On' on a SQL Database \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_1_6.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_1_6.yaml deleted file mode 100644 index 5106d1cc1..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_1_6.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: SQL Server Audit Retention should be configured to be greater than 90 days. -ID: azure_cis_v200_4_1_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN 'ok' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN name || ' audit retention set to unlimited days.' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN name || ' audit retention greater than 90 days.' - ELSE name || ' audit retention less than 90 days.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.6 Ensure that 'Auditing' Retention is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_2_1.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_2_1.yaml deleted file mode 100644 index 21196d095..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_2_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable "Azure Defender for SQL" on critical SQL Servers. -ID: azure_cis_v200_4_2_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' Azure defender disabled.' - ELSE s.name || ' Azure defender enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.1 Ensure that Microsoft Defender for SQL is set to 'On' for critical SQL Servers \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_2_2.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_2_2.yaml deleted file mode 100644 index a8dbf000a..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_2_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) service scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v200_4_2_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN security -> 'properties' ->> 'state' = 'Disabled' THEN s.name || ' VA setting disabled.' - ELSE s.name || ' VA setting enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.2 Ensure that Vulnerability Assessment (VA) is enabled on a SQL server by setting a Storage Account \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_2_3.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_2_3.yaml deleted file mode 100644 index a56af4909..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_2_3.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) Periodic recurring scans for critical SQL servers and corresponding SQL databases. -ID: azure_cis_v200_4_2_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'isEnabled' = 'false' - ) - THEN s.name || ' VA setting periodic recurring scans disabled.' - ELSE s.name || ' VA setting periodic recurring scans enabled.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.3 Ensure that Vulnerability Assessment (VA) setting 'Periodic recurring scans' is set to 'on' for each SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_2_4.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_2_4.yaml deleted file mode 100644 index 69f5bf842..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_2_4.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: Configure 'Send scan reports to' with email ids of concerned data owners/stakeholders for a critical SQL servers. -ID: azure_cis_v200_4_2_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emails' = '[]' - ) - THEN s.name || ' VA scan reports and alerts not configured, send email.' - ELSE s.name || ' VA scan reports and alerts configured to send email.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.4 Ensure that Vulnerability Assessment (VA) setting 'Send scan reports to' is configured for a SQL server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_2_5.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_2_5.yaml deleted file mode 100644 index add041b7a..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_2_5.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: Enable Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners'. -ID: azure_cis_v200_4_2_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN - security -> 'properties' ->> 'state' = 'Disabled' - OR - ( - security -> 'properties' ->> 'state' = 'Enabled' - AND assessment -> 'properties' ->> 'storageContainerPath' IS NOT NULL - AND assessment -> 'properties' -> 'recurringScans' ->> 'emailSubscriptionAdmins' = 'false' - ) - THEN s.name || ' VA setting not configured to send email notifications to subscription admins and owners.' - ELSE s.name || ' VA setting configured to send email notifications to subscription admins and owners.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_security_alert_policy) security, - jsonb_array_elements(server_vulnerability_assessment) assessment, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.2.5 Ensure that Vulnerability Assessment (VA) setting 'Also send email notifications to admins and subscription owners' is set for each SQL Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_3_2.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_3_2.yaml deleted file mode 100644 index e3ee12b1b..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_3_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_checkpoints on PostgreSQL Servers. -ID: azure_cis_v200_4_3_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_checkpoints off.' - ELSE s.name || ' server parameter log_checkpoints on.' - END AS reason - FROM - azure_postgresql_server s, - JSONB_ARRAY_ELEMENTS(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_checkpoints' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.2 Ensure Server Parameter 'log_checkpoints' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_3_3.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_3_3.yaml deleted file mode 100644 index 95de67c38..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_3_3.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_connections on PostgreSQL Servers. -ID: azure_cis_v200_4_3_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_connections off.' - ELSE s.name || ' server parameter log_connections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_connections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.3 Ensure server parameter 'log_connections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_3_4.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_3_4.yaml deleted file mode 100644 index 61ad9b201..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_3_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_disconnections on PostgreSQL Servers. -ID: azure_cis_v200_4_3_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN name || ' server parameter log_disconnections off.' - ELSE name || ' server parameter log_disconnections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_disconnections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.4 Ensure server parameter 'log_disconnections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_3_6.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_3_6.yaml deleted file mode 100644 index 16ed8152f..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_3_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Ensure log_retention_days on PostgreSQL Servers is set to an appropriate value. -ID: azure_cis_v200_4_3_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::integer <= 3 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::integer <= 3 THEN s.name || ' log files are retained for 3 days or lesser.' - ELSE s.name || ' log files are retained for more than 3 days.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) AS config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_retention_days' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.6 Ensure Server Parameter 'log_retention_days' is greater than 3 days for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_4_3.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_4_3.yaml deleted file mode 100644 index 9166475ca..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_4_3.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable audit_log_enabled on MySQL Servers. -ID: azure_cis_v200_4_4_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter audit_log_enabled off.' - ELSE s.name || ' server parameter audit_log_enabled on.' - END AS reason - FROM - azure_mysql_server AS s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'audit_log_enabled' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.4.3 Ensure server parameter 'audit_log_enabled' is set to 'ON' for MySQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_4_4_4.yaml b/compliance/controls/pending/azure/azure_cis_v200_4_4_4.yaml deleted file mode 100644 index 6e6503e53..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_4_4_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Set audit_log_enabled to include CONNECTION on MySQL Servers. -ID: azure_cis_v200_4_4_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') = 'connection' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') = 'connection' THEN s.name || ' server parameter audit_log_events has connection set.' - ELSE s.name || ' server parameter audit_log_events connection not set.' - END AS reason - FROM - azure_mysql_server AS s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'audit_log_events' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.4.4 Ensure server parameter 'audit_log_events' has 'CONNECTION' set for MySQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_5_1_4.yaml b/compliance/controls/pending/azure/azure_cis_v200_5_1_4.yaml deleted file mode 100644 index 9445117e1..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_5_1_4.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Storage accounts with the activity log exports can be configured to use Customer Managed Keys (CMK). -ID: azure_cis_v200_5_1_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' - THEN a.name || ' container insights-activity-logs encrypted with BYOK.' - ELSE a.name || ' container insights-activity-logs not encrypted with BYOK.' - END AS reason - FROM - azure_storage_container c, - azure_storage_account a, - azure_subscription sub - WHERE - c.name = 'insights-activity-logs' - AND c.account_name = a.name - AND sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: 5.1.4 Ensure the storage account containing the container with activity logs is encrypted with Customer Managed Key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_6_5.yaml b/compliance/controls/pending/azure/azure_cis_v200_6_5.yaml deleted file mode 100644 index e60d245a6..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_6_5.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Network Security Group Flow Logs should be enabled and the retention period set to greater than or equal to 90 days. -ID: azure_cis_v200_6_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sg.id AS resource, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled OR fl.retention_policy_days < 90 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled - THEN sg.name || ' flowlog not enabled.' - WHEN fl.retention_policy_days < 90 - THEN sg.name || ' flowlog ' || fl.title || ' retention period is less than 90 days.' - ELSE sg.name || ' flowlog ' || fl.title || ' retention period is ' || fl.retention_policy_days || ' days.' - END AS reason - FROM - azure_network_security_group sg - LEFT JOIN - azure_network_watcher_flow_log fl ON sg.id = fl.target_resource_id - JOIN - azure_subscription sub ON sub.subscription_id = sg.subscription_id; -Severity: low -Tags: {} -Title: 6.5 Ensure that Network Security Group Flow Log retention period is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_6_6.yaml b/compliance/controls/pending/azure/azure_cis_v200_6_6.yaml deleted file mode 100644 index 5252ed6dc..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_6_6.yaml +++ /dev/null @@ -1,28 +0,0 @@ -Description: Enable Network Watcher for Azure subscriptions. -ID: azure_cis_v200_6_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - loc.id AS resource, - CASE - WHEN watcher.id IS NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN watcher.id IS NULL THEN 'Network watcher not enabled in ' || loc.name || '.' - ELSE 'Network watcher enabled in ' || loc.name || '.' - END AS reason, - loc.name - FROM - azure_location loc - LEFT JOIN azure_network_watcher watcher ON watcher.region = loc.name - JOIN azure_subscription sub ON sub.subscription_id = loc.subscription_id; -Severity: low -Tags: {} -Title: 6.6 Ensure that Network Watcher is 'Enabled' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_8_7.yaml b/compliance/controls/pending/azure/azure_cis_v200_8_7.yaml deleted file mode 100644 index aa62f3f2c..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_8_7.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Private endpoints will secure network traffic from Azure Key Vault to the resources requesting secrets and keys. -ID: azure_cis_v200_8_7 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN network_acls IS NULL OR network_acls ->> 'defaultAction' = 'Allow' THEN 'alarm' - WHEN private_endpoint_connections IS NULL THEN 'info' - WHEN private_endpoint_connections @> '[{"PrivateLinkServiceConnectionStateStatus": "Approved"}]' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN network_acls IS NULL OR network_acls ->> 'defaultAction' = 'Allow' THEN a.name || ' using public networks.' - WHEN private_endpoint_connections IS NULL THEN a.name || ' no private link exists.' - WHEN private_endpoint_connections @> '[{"PrivateLinkServiceConnectionStateStatus": "Approved"}]' - THEN a.name || ' using private link.' - ELSE a.name || ' private link not enabled.' - END AS reason - FROM - azure_key_vault a, - azure_subscription sub; -Severity: low -Tags: {} -Title: 8.7 Ensure that Private Endpoints are Used for Azure Key Vault \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v200_9_10.yaml b/compliance/controls/pending/azure/azure_cis_v200_9_10.yaml deleted file mode 100644 index a9dc46b2f..000000000 --- a/compliance/controls/pending/azure/azure_cis_v200_9_10.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Description: By default, Azure Functions, Web, and API Services can be deployed over FTP. If FTP is required for an essential deployment workflow, FTPS should be required for FTP login for all App Service Apps and Functions. -ID: azure_cis_v200_9_10 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - fa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_function_app fa, - azure_subscription sub - WHERE - sub.subscription_id = fa.subscription_id - UNION - SELECT - wa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_web_app AS wa, - azure_subscription AS sub - WHERE - sub.subscription_id = wa.subscription_id; -Severity: low -Tags: {} -Title: 9.10 Ensure FTP deployments are Disabled \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_1_3.yaml b/compliance/controls/pending/azure/azure_cis_v210_1_3.yaml deleted file mode 100644 index 05ee3ef63..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_1_3.yaml +++ /dev/null @@ -1,17 +0,0 @@ -Description: Require administrators or appropriately delegated users to create new tenants. -ID: azure_cis_v210_1_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - 'active_directory' AS resource, - 'info' AS status, - 'Manual verification required.' AS reason; -Severity: low -Tags: {} -Title: 1.3 Ensure that 'Restrict non-admin users from creating tenants' is set to 'Yes' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_2_1_9.yaml b/compliance/controls/pending/azure/azure_cis_v210_2_1_9.yaml deleted file mode 100644 index 87630c388..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_2_1_9.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Turning on Microsoft Defender for Key Vault enables threat detection for Key Vault, providing threat intelligence, anomaly detection, and behavior analytics in the Microsoft Defender for Cloud. -ID: azure_cis_v210_2_1_9 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sub_pricing.id AS resource, - CASE - WHEN pricing_tier = 'Standard' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN pricing_tier = 'Standard' THEN 'Azure Defender on for Key Vaults.' - ELSE 'Azure Defender off for Key Vaults.' - END AS reason - FROM - azure_security_center_subscription_pricing sub_pricing - RIGHT JOIN - azure_subscription sub - ON - sub_pricing.subscription_id = sub.subscription_id - WHERE - name = 'KeyVaults'; -Severity: low -Tags: {} -Title: 2.1.9 Ensure That Microsoft Defender for Key Vault Is Set To 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_3_17.yaml b/compliance/controls/pending/azure/azure_cis_v210_3_17.yaml deleted file mode 100644 index 6191d4bae..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_3_17.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: The Azure Storage setting 'Allow Blob Anonymous Access' (aka 'allowBlobPublicAccess') controls whether anonymous access is allowed for blob data in a storage account. When this property is set to True, it enables public read access to blob data, which can be convenient for sharing data but may carry security risks. When set to False, it disallows public access to blob data, providing a more secure storage environment. -ID: azure_cis_v210_3_17 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - container.id AS resource, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN NOT account.allow_blob_public_access AND container.public_access = 'None' THEN - account.name || ' container ' || container.name || ' doesn''t allow anonymous access.' - ELSE - account.name || ' container ' || container.name || ' allows anonymous access.' - END AS reason - FROM - azure_storage_container container - JOIN - azure_storage_account account ON container.account_name = account.name - JOIN - azure_subscription sub ON sub.subscription_id = account.subscription_id; -Severity: low -Tags: {} -Title: 3.17 Ensure that `Allow Blob Anonymous Access` is set to `Disabled` \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_1_1.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_1_1.yaml deleted file mode 100644 index deebee921..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_1_1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Enable auditing on SQL Servers. -ID: azure_cis_v210_4_1_1 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN audit -> 'properties' ->> 'state' = 'Disabled' THEN name || ' auditing disabled.' - ELSE name || ' auditing enabled.' - END AS reason - FROM - azure_sql_server s, - JSONB_ARRAY_ELEMENTS(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.1 Ensure that 'Auditing' is set to 'On' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_1_3.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_1_3.yaml deleted file mode 100644 index 6bbd3744b..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_1_3.yaml +++ /dev/null @@ -1,29 +0,0 @@ -Description: Transparent Data Encryption (TDE) with Customer-managed key support provides increased transparency and control over the TDE Protector, increased security with an HSM-backed external service, and promotion of separation of duties. -ID: azure_cis_v210_4_1_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN encryption ->> 'kind' = 'servicemanaged' THEN s.name || ' TDE protector not encrypted with CMK.' - ELSE s.name || ' TDE protector encrypted with CMK.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(encryption_protector) encryption, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.3 Ensure SQL server's Transparent Data Encryption (TDE) protector is encrypted with Customer-managed key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_1_6.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_1_6.yaml deleted file mode 100644 index 47d214fce..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_1_6.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: SQL Server Audit Retention should be configured to be greater than 90 days. -ID: azure_cis_v210_4_1_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN 'ok' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN (audit -> 'properties' ->> 'retentionDays')::integer = 0 THEN name || ' audit retention set to unlimited days.' - WHEN (audit -> 'properties' ->> 'retentionDays')::integer >= 90 THEN name || ' audit retention greater than 90 days.' - ELSE name || ' audit retention less than 90 days.' - END AS reason - FROM - azure_sql_server s, - jsonb_array_elements(server_audit_policy) audit, - azure_subscription sub - WHERE - sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.1.6 Ensure that 'Auditing' Retention is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_3_2.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_3_2.yaml deleted file mode 100644 index 9e8fd0890..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_3_2.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_checkpoints on PostgreSQL Servers. -ID: azure_cis_v210_4_3_2 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_checkpoints off.' - ELSE s.name || ' server parameter log_checkpoints on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_checkpoints' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.2 Ensure Server Parameter 'log_checkpoints' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_3_3.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_3_3.yaml deleted file mode 100644 index 2f72971ab..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_3_3.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_connections on PostgreSQL Servers. -ID: azure_cis_v210_4_3_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter log_connections off.' - ELSE s.name || ' server parameter log_connections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_connections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.3 Ensure server parameter 'log_connections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_3_4.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_3_4.yaml deleted file mode 100644 index 5d659f1cd..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_3_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_disconnections on PostgreSQL Servers. -ID: azure_cis_v210_4_3_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN name || ' server parameter log_disconnections off.' - ELSE name || ' server parameter log_disconnections on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_disconnections' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.4 Ensure server parameter 'log_disconnections' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_3_5.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_3_5.yaml deleted file mode 100644 index a6c360983..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_3_5.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable connection_throttling on PostgreSQL Servers. -ID: azure_cis_v210_4_3_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN s.name || ' server parameter connection_throttling off.' - ELSE s.name || ' server parameter connection_throttling on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'connection_throttling' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.5 Ensure server parameter 'connection_throttling' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_3_6.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_3_6.yaml deleted file mode 100644 index 5c38d88d6..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_3_6.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Ensure log_retention_days on PostgreSQL Servers is set to an appropriate value. -ID: azure_cis_v210_4_3_6 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::integer <= 3 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN (config -> 'ConfigurationProperties' ->> 'value')::integer <= 3 THEN s.name || ' log files are retained for 3 days or lesser.' - ELSE s.name || ' log files are retained for more than 3 days.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) AS config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_retention_days' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.3.6 Ensure Server Parameter 'log_retention_days' is greater than 3 days for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_4_3.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_4_3.yaml deleted file mode 100644 index 6fc0a50cf..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_4_3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Enable audit_log_enabled on MySQL Servers. -ID: azure_cis_v210_4_4_3 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' - THEN s.name || ' server parameter audit_log_enabled off.' - ELSE s.name || ' server parameter audit_log_enabled on.' - END AS reason - FROM - azure_mysql_server AS s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'audit_log_enabled' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.4.3 Ensure server parameter 'audit_log_enabled' is set to 'ON' for MySQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_4_4_4.yaml b/compliance/controls/pending/azure/azure_cis_v210_4_4_4.yaml deleted file mode 100644 index 4c3bdd6c5..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_4_4_4.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Set audit_log_enabled to include CONNECTION on MySQL Servers. -ID: azure_cis_v210_4_4_4 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') = 'connection' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') = 'connection' THEN s.name || ' server parameter audit_log_events has connection set.' - ELSE s.name || ' server parameter audit_log_events connection not set.' - END AS reason - FROM - azure_mysql_server AS s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'audit_log_events' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: 4.4.4 Ensure server parameter 'audit_log_events' has 'CONNECTION' set for MySQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_6_5.yaml b/compliance/controls/pending/azure/azure_cis_v210_6_5.yaml deleted file mode 100644 index 040aeffb9..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_6_5.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Description: Network Security Group Flow Logs should be enabled and the retention period set to greater than or equal to 90 days. -ID: azure_cis_v210_6_5 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sg.id AS resource, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled OR fl.retention_policy_days < 90 THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN fl.id IS NULL OR NOT fl.enabled - THEN sg.name || ' flowlog not enabled.' - WHEN fl.retention_policy_days < 90 - THEN sg.name || ' flowlog ' || fl.title || ' retention period is less than 90 days.' - ELSE sg.name || ' flowlog ' || fl.title || ' retention period is ' || fl.retention_policy_days || ' days.' - END AS reason - FROM - azure_network_security_group sg - LEFT JOIN - azure_network_watcher_flow_log fl - ON - sg.id = fl.target_resource_id - JOIN - azure_subscription sub - ON - sub.subscription_id = sg.subscription_id; -Severity: low -Tags: {} -Title: 6.5 Ensure that Network Security Group Flow Log retention period is 'greater than 90 days' \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_8_7.yaml b/compliance/controls/pending/azure/azure_cis_v210_8_7.yaml deleted file mode 100644 index 5f58d10d2..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_8_7.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Private endpoints will secure network traffic from Azure Key Vault to the resources requesting secrets and keys. -ID: azure_cis_v210_8_7 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN network_acls IS NULL OR network_acls ->> 'defaultAction' = 'Allow' THEN 'alarm' - WHEN private_endpoint_connections IS NULL THEN 'info' - WHEN private_endpoint_connections @> '[{"PrivateLinkServiceConnectionStateStatus": "Approved"}]' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN network_acls IS NULL OR network_acls ->> 'defaultAction' = 'Allow' THEN a.name || ' using public networks.' - WHEN private_endpoint_connections IS NULL THEN a.name || ' no private link exists.' - WHEN private_endpoint_connections @> '[{"PrivateLinkServiceConnectionStateStatus": "Approved"}]' - THEN a.name || ' using private link.' - ELSE a.name || ' private link not enabled.' - END AS reason - FROM - azure_key_vault a, - azure_subscription sub; -Severity: low -Tags: {} -Title: 8.7 Ensure that Private Endpoints are Used for Azure Key Vault \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_cis_v210_9_9.yaml b/compliance/controls/pending/azure/azure_cis_v210_9_9.yaml deleted file mode 100644 index 805f12761..000000000 --- a/compliance/controls/pending/azure/azure_cis_v210_9_9.yaml +++ /dev/null @@ -1,46 +0,0 @@ -Description: By default, Azure Functions, Web, and API Services can be deployed over FTP. If FTP is required for an essential deployment workflow, FTPS should be required for FTP login for all App Service Apps and Functions. -ID: azure_cis_v210_9_9 -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - fa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_function_app fa, - azure_subscription sub - WHERE - sub.subscription_id = fa.subscription_id - - UNION - - SELECT - wa.id AS resource, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN configuration -> 'properties' ->> 'ftpsState' = 'AllAllowed' THEN name || ' FTP deployments enabled.' - ELSE name || ' FTP deployments disabled.' - END AS reason - FROM - azure_app_service_web_app wa, - azure_subscription sub - WHERE - sub.subscription_id = wa.subscription_id; -Severity: low -Tags: {} -Title: 9.9 Ensure FTP deployments are Disabled \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_compute_windows_vm_secure_boot_enabled.yaml b/compliance/controls/pending/azure/azure_compute_windows_vm_secure_boot_enabled.yaml deleted file mode 100644 index 3894a429c..000000000 --- a/compliance/controls/pending/azure/azure_compute_windows_vm_secure_boot_enabled.yaml +++ /dev/null @@ -1,37 +0,0 @@ -Description: Enable Secure Boot on supported Windows virtual machines to mitigate against malicious and unauthorized changes to the boot chain. Once enabled, only trusted bootloaders, kernel and kernel drivers will be allowed to run. This assessment applies to Trusted Launch and Confidential Windows virtual machines. -ID: azure_compute_windows_vm_secure_boot_enabled -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN image_offer NOT LIKE '%Windows%' OR os_type NOT LIKE 'Windows%' THEN 'skip' - WHEN security_profile ->> 'securityType' IN ('TrustedLaunch', 'ConfidentialVM') - AND security_profile ->> 'uefiSettings' IS NOT NULL - AND security_profile -> 'uefiSettings' ->> 'secureBootEnabled' = 'true' - THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN image_offer NOT LIKE '%Windows%' OR os_type NOT LIKE 'Windows%' - THEN a.title || ' is not a Windows VM.' - WHEN security_profile ->> 'securityType' IN ('TrustedLaunch', 'ConfidentialVM') - AND security_profile ->> 'uefiSettings' IS NOT NULL - AND security_profile -> 'uefiSettings' ->> 'secureBootEnabled' = 'true' - THEN a.title || ' secure boot enabled.' - ELSE a.title || ' secure boot disabled.' - END AS reason - FROM - azure_compute_virtual_machine AS a, - azure_subscription AS sub - WHERE - sub.subscription_id = a.subscription_id -Severity: low -Tags: {} -Title: Secure Boot should be enabled on supported Windows virtual machines \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_iot_hub_private_link_used.yaml b/compliance/controls/pending/azure/azure_iot_hub_private_link_used.yaml deleted file mode 100644 index 5b959043c..000000000 --- a/compliance/controls/pending/azure/azure_iot_hub_private_link_used.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Description: Azure Private Link lets you connect your virtual network to Azure services without a public IP address at the source or destination. The Private Link platform handles the connectivity between the consumer and services over the Azure backbone network. By mapping private endpoints to the IoT Hub device provisioning service, data leakage risks are reduced. -ID: azure_iot_hub_private_link_used -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN sku_tier = 'Basic' THEN 'skip' - WHEN pec -> 'properties' -> 'privateLinkServiceConnectionState' ->> 'status' = 'Approved' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN sku_tier = 'Basic' THEN a.name || ' is of ' || sku_tier || ' tier.' - WHEN pec -> 'properties' -> 'privateLinkServiceConnectionState' ->> 'status' = 'Approved' THEN a.name || ' using private link.' - ELSE a.name || ' not using private link.' - END AS reason - FROM - azure_iothub a, - jsonb_array_elements(private_endpoint_connections) AS pec, - azure_subscription sub - WHERE - sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: IoT Hub device provisioning service instances should use private link \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_mariadb_server_private_link_used.yaml b/compliance/controls/pending/azure/azure_mariadb_server_private_link_used.yaml deleted file mode 100644 index 6e5c697e5..000000000 --- a/compliance/controls/pending/azure/azure_mariadb_server_private_link_used.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Description: Private endpoint connections enforce secure communication by enabling private connectivity to Azure Database for MariaDB. Configure a private endpoint connection to enable access to traffic coming only from known networks and prevent access from all other IP addresses, including within Azure. -ID: azure_mariadb_server_private_link_used -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: - - azure_mariadb_server - - azure_subscription - Parameters: [] - PrimaryTable: azure_mariadb_server - QueryToExecute: | - SELECT - a.id AS resource, - a.og_account_id AS og_account_id, - a.og_resource_id AS og_resource_id, - CASE - WHEN sku_tier = 'Basic' THEN 'skip' - WHEN private_endpoint_connections @> '[{"privateLinkServiceConnectionStateStatus": "Approved"}]'::jsonb THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN sku_tier = 'Basic' THEN a.name || ' is of ' || sku_tier || ' tier.' - WHEN private_endpoint_connections @> '[{"privateLinkServiceConnectionStateStatus": "Approved"}]'::jsonb THEN a.name || ' using private link.' - ELSE a.name || ' not using private link.' - END AS reason - FROM - azure_mariadb_server a, - azure_subscription sub - WHERE - sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: Private endpoint should be enabled for MariaDB servers \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_monitor_logs_storage_container_insights_activity_logs_encrypted_with_byok.yaml b/compliance/controls/pending/azure/azure_monitor_logs_storage_container_insights_activity_logs_encrypted_with_byok.yaml deleted file mode 100644 index 8687e07e3..000000000 --- a/compliance/controls/pending/azure/azure_monitor_logs_storage_container_insights_activity_logs_encrypted_with_byok.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Storage accounts with the activity log exports can be configured to use Customer Managed Keys (CMK). -ID: azure_monitor_logs_storage_container_insights_activity_logs_encrypted_with_byok -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' - THEN a.name || ' container insights-activity-logs encrypted with BYOK.' - ELSE a.name || ' container insights-activity-logs not encrypted with BYOK.' - END AS reason - FROM - azure_storage_container c, - azure_storage_account a, - azure_subscription sub - WHERE - c.name = 'insights-activity-logs' - AND c.account_name = a.name - AND sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: Ensure the storage account containing the container with activity logs is encrypted with Customer Managed Key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_monitor_logs_storage_container_insights_operational_logs_encrypted_with_byok.yaml b/compliance/controls/pending/azure/azure_monitor_logs_storage_container_insights_operational_logs_encrypted_with_byok.yaml deleted file mode 100644 index 8273bd205..000000000 --- a/compliance/controls/pending/azure/azure_monitor_logs_storage_container_insights_operational_logs_encrypted_with_byok.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: Storage accounts with the activity log exports can be configured to use Customer Managed Keys (CMK). -ID: azure_monitor_logs_storage_container_insights_operational_logs_encrypted_with_byok -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - a.id AS resource, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN a.encryption_key_source = 'Microsoft.Keyvault' - THEN a.name || ' container insights-operational-logs encrypted with BYOK.' - ELSE a.name || ' container insights-operational-logs not encrypted with BYOK.' - END AS reason - FROM - azure_storage_container c, - azure_storage_account a, - azure_subscription sub - WHERE - c.name = 'insights-operational-logs' - AND c.account_name = a.name - AND sub.subscription_id = a.subscription_id; -Severity: low -Tags: {} -Title: Ensure the storage account containing the container with activity logs is encrypted with Customer Managed Key \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_postgres_db_server_log_duration_on.yaml b/compliance/controls/pending/azure/azure_postgres_db_server_log_duration_on.yaml deleted file mode 100644 index 66e48329e..000000000 --- a/compliance/controls/pending/azure/azure_postgres_db_server_log_duration_on.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable log_duration on PostgreSQL Servers. -ID: azure_postgres_db_server_log_duration_on -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - s.id AS resource, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN LOWER(config -> 'ConfigurationProperties' ->> 'value') != 'on' THEN name || ' server parameter log_duration off.' - ELSE name || ' server parameter log_duration on.' - END AS reason - FROM - azure_postgresql_server s, - jsonb_array_elements(server_configurations) config, - azure_subscription sub - WHERE - config ->> 'Name' = 'log_duration' - AND sub.subscription_id = s.subscription_id; -Severity: low -Tags: {} -Title: Ensure server parameter 'log_duration' is set to 'ON' for PostgreSQL Database Server \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_storage_account_containing_vhd_os_disk_cmk_encrypted.yaml b/compliance/controls/pending/azure/azure_storage_account_containing_vhd_os_disk_cmk_encrypted.yaml deleted file mode 100644 index a78c15b78..000000000 --- a/compliance/controls/pending/azure/azure_storage_account_containing_vhd_os_disk_cmk_encrypted.yaml +++ /dev/null @@ -1,32 +0,0 @@ -Description: This policy identifies Azure Storage account containing VHD OS disk which are not encrypted with CMK. VHD's attached to Virtual Machines are stored in Azure storage. By default Azure Storage account is encrypted using Microsoft Managed Keys. It is recommended to use Customer Managed Keys to encrypt data in Azure Storage accounts for better control on the data. -ID: azure_storage_account_containing_vhd_os_disk_cmk_encrypted -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sa.id AS resource, - CASE - WHEN sa.encryption_key_source = 'Microsoft.Storage' - AND vm.os_disk_vhd_uri IS NOT NULL THEN 'alarm' - ELSE 'ok' - END AS status, - CASE - WHEN sa.encryption_key_source = 'Microsoft.Storage' - AND vm.os_disk_vhd_uri IS NOT NULL THEN sa.name || ' storage account containing VHD OS disk not encrypted with CMK.' - ELSE sa.name || ' storage account containing VHD OS disk encrypted with CMK.' - END AS reason - FROM - azure_storage_account sa, - azure_compute_virtual_machine vm, - azure_subscription sub - WHERE - sub.subscription_id = sa.subscription_id - AND vm.os_disk_vhd_uri LIKE '%' || sa.name || '%'; -Severity: low -Tags: {} -Title: Storage account containing VHD OS disk not encrypted with CMK \ No newline at end of file diff --git a/compliance/controls/pending/azure/azure_storage_account_queues_logging_enabled.yaml b/compliance/controls/pending/azure/azure_storage_account_queues_logging_enabled.yaml deleted file mode 100644 index 302f3f78e..000000000 --- a/compliance/controls/pending/azure/azure_storage_account_queues_logging_enabled.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Description: Storage Logging records details of requests (read, write, and delete operations) against your Azure queues. This policy identifies Azure storage accounts that do not have logging enabled for queues. As a best practice, enable logging for read, write, and delete request types on queues. -ID: azure_storage_account_queues_logging_enabled -IntegrationType: - - azure_subscription -Query: - Engine: CloudQL-v0.0.1 - ListOfTables: [] - Parameters: [] - PrimaryTable: "" - QueryToExecute: | - SELECT - sa.id AS resource, - CASE - WHEN LOWER(sa.sku_tier) = 'standard' - AND (queue_logging_write AND queue_logging_read AND queue_logging_delete) THEN 'ok' - ELSE 'alarm' - END AS status, - CASE - WHEN LOWER(sa.sku_tier) = 'standard' - AND (queue_logging_write AND queue_logging_read AND queue_logging_delete) - THEN sa.name || ' storage account logging for queues is enabled.' - ELSE sa.name || ' storage account logging for queues is disabled for ' || - CONCAT_WS(', ', - CASE WHEN NOT queue_logging_write THEN 'write' END, - CASE WHEN NOT queue_logging_read THEN 'read' END, - CASE WHEN NOT queue_logging_delete THEN 'delete' END - ) || ' requests.' - END AS reason - FROM - azure_storage_account sa, - azure_subscription sub - WHERE - sub.subscription_id = sa.subscription_id; -Severity: low -Tags: {} -Title: Storage account logging (Classic Diagnostic Setting) for queues should be enabled \ No newline at end of file diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_5_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_6_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_1_8_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_1_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_10.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_10.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_10.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_11.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_11.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_11.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_12.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_12.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_12.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_9.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_9.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_5_9.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_6_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_7_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_2_8_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_1_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_9.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_9.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_2_9.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4_18.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4_18.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4_18.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_4_18.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_11.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_11.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_11.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_12.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_12.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_12.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_14.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_14.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_14.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_15.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_15.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_15.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_15.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_16.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_16.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_16.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_17.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_17.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_17.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_9.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_9.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_5_9.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_6_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_10.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_10.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_10.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_4.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_4.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_9.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_9.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_7_9.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_1.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_1.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_2.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_2.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_3.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_3.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_5.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_5.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_5.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_6.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_6.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_6.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_7.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_7.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_7.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_8.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_8.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/aws_acsc_essential_eight_ml_3_8_8.yaml diff --git a/compliance/frameworks/cloud/aws_acsc_essential_eight/root.yaml b/compliance/frameworks/aws/aws_acsc_essential_eight/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_acsc_essential_eight/root.yaml rename to compliance/frameworks/aws/aws_acsc_essential_eight/root.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_account.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_account.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_account.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_account.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_acm.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_acm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_acm.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_acm.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_apigateway.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_apigateway.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_apigateway.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_apigateway.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_appstream.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_appstream.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_appstream.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_appstream.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_appsync.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_appsync.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_appsync.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_appsync.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_athena.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_athena.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_athena.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_athena.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_autoscaling.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_autoscaling.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_autoscaling.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_autoscaling.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_backup.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_backup.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_backup.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_backup.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudformation.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudformation.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudformation.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudformation.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudfront.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudfront.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudfront.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudfront.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudtrail.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudtrail.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudtrail.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudtrail.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudwatch.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudwatch.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_cloudwatch.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_cloudwatch.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_codebuild.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_codebuild.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_codebuild.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_codebuild.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_codedeploy.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_codedeploy.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_codedeploy.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_codedeploy.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_config.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_config.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_config.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_config.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dax.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_dax.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dax.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_dax.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_directoryservice.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_directoryservice.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_directoryservice.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_directoryservice.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dlm.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_dlm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dlm.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_dlm.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dms.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_dms.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dms.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_dms.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_docdb.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_docdb.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_docdb.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_docdb.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_drs.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_drs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_drs.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_drs.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dynamodb.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_dynamodb.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_dynamodb.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_dynamodb.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ebs.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_ebs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ebs.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_ebs.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ec2.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_ec2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ec2.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_ec2.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ecr.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_ecr.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ecr.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_ecr.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ecs.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_ecs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ecs.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_ecs.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_efs.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_efs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_efs.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_efs.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_eks.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_eks.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_eks.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_eks.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_elasticache.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_elasticache.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_elasticache.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_elasticache.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_elasticbeanstalk.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_elasticbeanstalk.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_elasticbeanstalk.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_elasticbeanstalk.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_elb.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_elb.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_elb.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_elb.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_emr.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_emr.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_emr.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_emr.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_es.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_es.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_es.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_es.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_eventbridge.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_eventbridge.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_eventbridge.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_eventbridge.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_fsx.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_fsx.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_fsx.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_fsx.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_glacier.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_glacier.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_glacier.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_glacier.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_glue.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_glue.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_glue.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_glue.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_guardduty.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_guardduty.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_guardduty.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_guardduty.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_iam.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_iam.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_iam.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_iam.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_kinesis.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_kinesis.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_kinesis.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_kinesis.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_kms.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_kms.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_kms.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_kms.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_lambda.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_lambda.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_lambda.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_lambda.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_lightsail.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_lightsail.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_lightsail.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_lightsail.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_mq.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_mq.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_mq.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_mq.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_msk.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_msk.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_msk.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_msk.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_neptune.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_neptune.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_neptune.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_neptune.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_networkfirewall.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_networkfirewall.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_networkfirewall.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_networkfirewall.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_opensearch.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_opensearch.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_opensearch.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_opensearch.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_organization.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_organization.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_organization.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_organization.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_pca.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_pca.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_pca.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_pca.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_rds.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_rds.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_rds.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_rds.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_redshift.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_redshift.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_redshift.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_redshift.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_route53.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_route53.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_route53.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_route53.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_s3.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_s3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_s3.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_s3.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sagemaker.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_sagemaker.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sagemaker.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_sagemaker.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_secretsmanager.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_secretsmanager.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_secretsmanager.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_secretsmanager.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_securityhub.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_securityhub.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_securityhub.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_securityhub.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sfn.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_sfn.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sfn.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_sfn.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sns.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_sns.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sns.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_sns.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sqs.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_sqs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_sqs.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_sqs.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ssm.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_ssm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_ssm.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_ssm.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_vpc.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_vpc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_vpc.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_vpc.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_waf.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_waf.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_waf.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_waf.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_wafv2.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_wafv2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_wafv2.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_wafv2.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/aws_all_controls_workspaces.yaml b/compliance/frameworks/aws/aws_all_controls/aws_all_controls_workspaces.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/aws_all_controls_workspaces.yaml rename to compliance/frameworks/aws/aws_all_controls/aws_all_controls_workspaces.yaml diff --git a/compliance/frameworks/cloud/aws_all_controls/root.yaml b/compliance/frameworks/aws/aws_all_controls/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_all_controls/root.yaml rename to compliance/frameworks/aws/aws_all_controls/root.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_0_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_0_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_0_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_0_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_1_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_1_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_instances_5_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_2.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_2.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_internet_connection_2_0_2.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_2.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_2.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_0_2.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_2.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_2.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_disallow_public_access_4_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_2.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_2.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_2.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_3.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_3.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_ebs_checks_1_0_3.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_1.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_1.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_1.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_2.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_2.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_2.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_3.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_3.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/aws_audit_manager_control_tower_multi_factor_authentication_3_0_3.yaml diff --git a/compliance/frameworks/cloud/aws_audit_manager_control_tower/root.yaml b/compliance/frameworks/aws/aws_audit_manager_control_tower/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_audit_manager_control_tower/root.yaml rename to compliance/frameworks/aws/aws_audit_manager_control_tower/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_10.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_10.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_10.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_11.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_11.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_11.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_1.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_1.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_2.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_2.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_3.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_3.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_4.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_4.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_5.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_5.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_6.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/aws_cis_compute_service_v100_6.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/aws_cis_compute_service_v100_6.yaml diff --git a/compliance/frameworks/cloud/aws_cis_compute_service_v100/root.yaml b/compliance/frameworks/aws/aws_cis_compute_service_v100/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_compute_service_v100/root.yaml rename to compliance/frameworks/aws/aws_cis_compute_service_v100/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_2.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_2.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_10_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_2.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_2.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_3.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_3.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_4.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_4.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_11_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_12_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_2.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_2.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_3.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_3.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_4.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_4.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_6.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_6.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_6.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_7.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_7.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_4_7.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_2.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_2.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_3.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_3.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_4.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_4.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6_5.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6_5.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_6_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_3.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_3.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_1.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_1.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_2.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_2.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/aws_cis_controls_v8_ig1_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_controls_v8_ig1/root.yaml b/compliance/frameworks/aws/aws_cis_controls_v8_ig1/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_controls_v8_ig1/root.yaml rename to compliance/frameworks/aws/aws_cis_controls_v8_ig1/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_1.yaml b/compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_1.yaml rename to compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_2.yaml b/compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_2.yaml rename to compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_3.yaml b/compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_3.yaml rename to compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_4.yaml b/compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v120/aws_cis_v120_4.yaml rename to compliance/frameworks/aws/aws_cis_v120/aws_cis_v120_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v120/root.yaml b/compliance/frameworks/aws/aws_cis_v120/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v120/root.yaml rename to compliance/frameworks/aws/aws_cis_v120/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_1.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_1.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_2.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_2.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_2_1.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_2_1.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_2_2.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_2_2.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_3.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_3.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_4.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_4.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_5.yaml b/compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/aws_cis_v130_5.yaml rename to compliance/frameworks/aws/aws_cis_v130/aws_cis_v130_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v130/root.yaml b/compliance/frameworks/aws/aws_cis_v130/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v130/root.yaml rename to compliance/frameworks/aws/aws_cis_v130/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_1.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_1.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2_1.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2_1.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2_2.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2_2.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2_3.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_2_3.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_3.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_3.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_4.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_4.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_5.yaml b/compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/aws_cis_v140_5.yaml rename to compliance/frameworks/aws/aws_cis_v140/aws_cis_v140_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v140/root.yaml b/compliance/frameworks/aws/aws_cis_v140/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v140/root.yaml rename to compliance/frameworks/aws/aws_cis_v140/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_1.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_1.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_1.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_1.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_2.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_2.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_3.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_3.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_4.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_2_4.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_3.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_3.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_4.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_4.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_5.yaml b/compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/aws_cis_v150_5.yaml rename to compliance/frameworks/aws/aws_cis_v150/aws_cis_v150_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v150/root.yaml b/compliance/frameworks/aws/aws_cis_v150/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v150/root.yaml rename to compliance/frameworks/aws/aws_cis_v150/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_1.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_1.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_1.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_1.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_2.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_2.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_3.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_3.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_4.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_2_4.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_3.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_3.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_4.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_4.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_5.yaml b/compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/aws_cis_v200_5.yaml rename to compliance/frameworks/aws/aws_cis_v200/aws_cis_v200_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v200/root.yaml b/compliance/frameworks/aws/aws_cis_v200/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v200/root.yaml rename to compliance/frameworks/aws/aws_cis_v200/root.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_1.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_1.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_1.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_1.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_2.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_2.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_3.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_3.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_4.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_2_4.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_3.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_3.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_3.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_4.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_4.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_4.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_5.yaml b/compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/aws_cis_v300_5.yaml rename to compliance/frameworks/aws/aws_cis_v300/aws_cis_v300_5.yaml diff --git a/compliance/frameworks/cloud/aws_cis_v300/root.yaml b/compliance/frameworks/aws/aws_cis_v300/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cis_v300/root.yaml rename to compliance/frameworks/aws/aws_cis_v300/root.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_1.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_1.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_1.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_2.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_2.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_2.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_3.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_3.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_booting_up_things_to_do_first_3.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response_2.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response_2.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_crisis_response_2.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_1.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_1.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_1.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_2.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_2.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_2.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_3.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_3.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_3.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_4.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_4.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_4.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_5.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_5.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_data_5.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_1.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_1.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_1.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_2.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_2.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_2.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_3.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_3.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_3.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_4.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_4.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_surroundings_4.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_1.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_1.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_1.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_2.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_2.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_2.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_3.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_3.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/aws_cisa_cyber_essentials_your_systems_3.yaml diff --git a/compliance/frameworks/cloud/aws_cisa_cyber_essentials/root.yaml b/compliance/frameworks/aws/aws_cisa_cyber_essentials/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_cisa_cyber_essentials/root.yaml rename to compliance/frameworks/aws/aws_cisa_cyber_essentials/root.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_17.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_17.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_17.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_2.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_2.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_3.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_3.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ac_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_11.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_11.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_11.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_2.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_2.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_9.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_9.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_au_9.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca_7.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca_7.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ca_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_2.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_2.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_8.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_8.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cm_8.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_10.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_10.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_10.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_9.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_9.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_cp_9.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia_2.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia_2.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ia_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir_4.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir_4.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_ir_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa_3.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa_3.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sa_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_12.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_12.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_12.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_13.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_13.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_13.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_5.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_5.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_5.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_7.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_7.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/aws_fedramp_low_rev_4_sc_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_low_rev_4/root.yaml b/compliance/frameworks/aws/aws_fedramp_low_rev_4/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_low_rev_4/root.yaml rename to compliance/frameworks/aws/aws_fedramp_low_rev_4/root.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_17_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21_b.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21_b.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_21_b.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12_a.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12_a.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_12_a.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_f.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_f.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_f.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_f.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_g.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_g.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_g.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_j.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_j.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_j.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_2_j.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5_c.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5_c.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_5_c.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6_10.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6_10.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ac_6_10.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_11.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_11.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_11.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12_a_c.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12_a_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12_a_c.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_12_a_c.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2_a_d.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2_a_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2_a_d.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_2_a_d.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6_1_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6_1_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_6_1_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_au_9_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7_a_b.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7_a_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7_a_b.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ca_7_a_b.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7_a.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7_a.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_7_a.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3_a.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3_a.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cm_8_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_10.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_10.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_10.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9_b.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9_b.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_cp_9_b.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_2_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1_a_d_e.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1_a_d_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1_a_d_e.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_1_a_d_e.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ia_5_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ir_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra_5.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra_5.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_ra_5.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_10.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_10.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_10.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3_a.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3_a.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sa_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_12.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_12.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_12.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_13.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_13.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_13.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_23.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_23.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_23.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_23.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_28.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_28.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_28.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_28.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_5.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_5.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_5.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7_3.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7_3.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_sc_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_12.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_12.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_12.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_16.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_16.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_16.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_2.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_2.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_2.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_4.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_4.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_4.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_5.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_5.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_5.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_a_b_c.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_a_b_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_a_b_c.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_4_a_b_c.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7_1.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7_1.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/aws_fedramp_moderate_rev_4_si_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/root.yaml b/compliance/frameworks/aws/aws_fedramp_moderate_rev_4/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_fedramp_moderate_rev_4/root.yaml rename to compliance/frameworks/aws/aws_fedramp_moderate_rev_4/root.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_g.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_g.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_g.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_g_it_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_g_it_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_g_it_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_g_it_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_rm.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_rm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_rm.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_rm.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_rm_ra_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_rm_ra_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_rm_ra_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_rm_ra_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_rm_rm_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_rm_rm_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_1_rm_rm_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_1_rm_rm_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_is.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_is.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_is.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_is.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_is_is_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_is_is_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_is_is_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_is_is_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ma.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ma.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ma.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ma.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ma_ma_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ma_ma_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ma_ma_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ma_ma_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ma_ma_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ma_ma_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ma_ma_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ma_ma_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti_ti_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti_ti_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti_ti_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti_ti_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti_ti_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti_ti_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti_ti_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti_ti_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti_ti_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti_ti_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_2_ti_ti_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_2_ti_ti_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_cc.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_cc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_cc.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_cc.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_cc_pm_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_cc_pm_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_cc_pm_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_cc_pm_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_cc_pm_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_cc_pm_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_cc_pm_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_cc_pm_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_4.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_4.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_4.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_5.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_an_b_5.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_an_b_5.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_ev_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_ev_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_ev_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_ev_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_ev_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_ev_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_ev_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_ev_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_ev_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_ev_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_ev_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_ev_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_th_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_th_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_dc_th_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_dc_th_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_10.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_10.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_10.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_12.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_12.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_12.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_13.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_13.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_13.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_15.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_15.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_15.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_15.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_16.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_16.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_16.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_6.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_6.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_6.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_7.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_7.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_7.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_8.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_am_b_8.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_am_b_8.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_5.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_5.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_5.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_6.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_6.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_6.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_7.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_im_b_7.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_im_b_7.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_se_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_se_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_3_pc_se_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_3_pc_se_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_4.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_4.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_4.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_4_c.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_4_c.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_4_c_co_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_4_c_co_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_4_c_co_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_4_c_co_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr_de_b_1.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr_de_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr_de_b_1.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr_de_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr_de_b_2.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr_de_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr_de_b_2.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr_de_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr_de_b_3.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr_de_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_dr_de_b_3.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_dr_de_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_er.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_er.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_er.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_er.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_er_es_b_4.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_er_es_b_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_er_es_b_4.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_er_es_b_4.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_ir.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_ir.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_ir.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_ir_pi_b_6.yaml b/compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_ir_pi_b_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/aws_ffiec_d_5_ir_pi_b_6.yaml rename to compliance/frameworks/aws/aws_ffiec/aws_ffiec_d_5_ir_pi_b_6.yaml diff --git a/compliance/frameworks/cloud/aws_ffiec/root.yaml b/compliance/frameworks/aws/aws_ffiec/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_ffiec/root.yaml rename to compliance/frameworks/aws/aws_ffiec/root.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_account.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_account.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_account.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_account.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_acm.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_acm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_acm.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_acm.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_apigateway.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_apigateway.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_apigateway.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_apigateway.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_appsync.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_appsync.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_appsync.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_appsync.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_athena.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_athena.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_athena.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_athena.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_autoscaling.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_autoscaling.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_autoscaling.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_autoscaling.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_backup.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_backup.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_backup.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_backup.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_cloudformation.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_cloudformation.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_cloudformation.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_cloudformation.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_cloudfront.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_cloudfront.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_cloudfront.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_cloudfront.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_cloudtrail.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_cloudtrail.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_cloudtrail.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_cloudtrail.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_codebuild.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_codebuild.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_codebuild.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_codebuild.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_config.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_config.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_config.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_config.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_dms.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_dms.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_dms.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_dms.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_docdb.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_docdb.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_docdb.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_docdb.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_dynamodb.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_dynamodb.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_dynamodb.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_dynamodb.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ec2.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ec2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ec2.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ec2.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ecr.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ecr.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ecr.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ecr.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ecs.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ecs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ecs.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ecs.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_efs.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_efs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_efs.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_efs.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_eks.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_eks.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_eks.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_eks.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_elasticache.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_elasticache.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_elasticache.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_elasticache.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_elasticbeanstalk.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_elasticbeanstalk.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_elasticbeanstalk.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_elasticbeanstalk.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_elb.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_elb.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_elb.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_elb.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_emr.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_emr.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_emr.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_emr.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_es.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_es.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_es.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_es.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_eventbridge.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_eventbridge.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_eventbridge.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_eventbridge.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_fsx.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_fsx.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_fsx.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_fsx.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_guardduty.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_guardduty.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_guardduty.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_guardduty.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_iam.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_iam.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_iam.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_iam.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_kinesis.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_kinesis.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_kinesis.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_kinesis.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_kms.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_kms.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_kms.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_kms.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_lambda.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_lambda.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_lambda.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_lambda.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_msk.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_msk.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_msk.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_msk.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_neptune.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_neptune.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_neptune.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_neptune.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_networkfirewall.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_networkfirewall.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_networkfirewall.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_networkfirewall.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_opensearch.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_opensearch.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_opensearch.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_opensearch.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_pca.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_pca.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_pca.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_pca.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_rds.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_rds.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_rds.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_rds.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_redshift.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_redshift.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_redshift.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_redshift.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_route53.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_route53.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_route53.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_route53.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_s3.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_s3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_s3.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_s3.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sagemaker.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sagemaker.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sagemaker.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sagemaker.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_secretsmanager.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_secretsmanager.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_secretsmanager.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_secretsmanager.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sfn.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sfn.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sfn.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sfn.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sns.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sns.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sns.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sns.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sqs.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sqs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_sqs.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_sqs.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ssm.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ssm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_ssm.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_ssm.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_waf.yaml b/compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_waf.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/aws_foundational_security_waf.yaml rename to compliance/frameworks/aws/aws_foundational_security/aws_foundational_security_waf.yaml diff --git a/compliance/frameworks/cloud/aws_foundational_security/root.yaml b/compliance/frameworks/aws/aws_foundational_security/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_foundational_security/root.yaml rename to compliance/frameworks/aws/aws_foundational_security/root.yaml diff --git a/compliance/frameworks/cloud/aws_gdpr/aws_article_25.yaml b/compliance/frameworks/aws/aws_gdpr/aws_article_25.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gdpr/aws_article_25.yaml rename to compliance/frameworks/aws/aws_gdpr/aws_article_25.yaml diff --git a/compliance/frameworks/cloud/aws_gdpr/aws_article_30.yaml b/compliance/frameworks/aws/aws_gdpr/aws_article_30.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gdpr/aws_article_30.yaml rename to compliance/frameworks/aws/aws_gdpr/aws_article_30.yaml diff --git a/compliance/frameworks/cloud/aws_gdpr/aws_article_32.yaml b/compliance/frameworks/aws/aws_gdpr/aws_article_32.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gdpr/aws_article_32.yaml rename to compliance/frameworks/aws/aws_gdpr/aws_article_32.yaml diff --git a/compliance/frameworks/cloud/aws_gdpr/root.yaml b/compliance/frameworks/aws/aws_gdpr/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gdpr/root.yaml rename to compliance/frameworks/aws/aws_gdpr/root.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_a.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_a.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_a.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_c.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_c.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_c.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_d.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_d.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_d.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_e.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_e.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_e.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_g.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_g.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_g.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_h.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_h.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_h.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_h.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_k.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_k.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_k.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_10_k.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200_a.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200_a.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_200_a.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_30.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_30.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_30.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_30.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_b.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_b.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_b.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_d.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_d.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/aws_gxp_21_cfr_part_11_11_300_d.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/root.yaml b/compliance/frameworks/aws/aws_gxp_21_cfr_part_11/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_21_cfr_part_11/root.yaml rename to compliance/frameworks/aws/aws_gxp_21_cfr_part_11/root.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general_1.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general_1.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_general_1.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_10.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_10.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_10.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12_4.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12_4.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_12_4.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_13.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_13.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_13.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_16.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_16.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_16.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_17.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_17.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_17.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_5.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_5.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_5.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_1.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_1.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_2.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_2.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8_2.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8_2.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_9.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_9.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_operational_phase_9.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_2.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_2.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_2.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_5.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_5.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_5.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_6.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_6.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_6.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_8.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_8.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/aws_gxp_eu_annex_11_project_phase_4_8.yaml diff --git a/compliance/frameworks/cloud/aws_gxp_eu_annex_11/root.yaml b/compliance/frameworks/aws/aws_gxp_eu_annex_11/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_gxp_eu_annex_11/root.yaml rename to compliance/frameworks/aws/aws_gxp_eu_annex_11/root.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_d.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_d.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_1_ii_d.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_3_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_4_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_d.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_d.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_5_ii_d.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_ii.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_6_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_7_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_8.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_8.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_308_a_8.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310_d_2_iv.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310_d_2_iv.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310_d_2_iv.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_310_d_2_iv.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_1.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_1.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_ii.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_iv.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_iv.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_iv.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_a_2_iv.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_b.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_b.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_1.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_1.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_2.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_2.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_c_2.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_d.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_d.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_d.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_1.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_1.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_ii.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_312_e_2_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_1.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_1.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_i.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_i.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_ii.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iii.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iii.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iv.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iv.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iv.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/aws_hipaa_final_omnibus_security_rule_2013_164_314_b_2_iv.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/root.yaml b/compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_final_omnibus_security_rule_2013/root.yaml rename to compliance/frameworks/aws/aws_hipaa_final_omnibus_security_rule_2013/root.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_d.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_d.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_1_ii_d.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_i.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_i.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_3_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_i.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_i.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_4_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_d.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_d.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_5_ii_d.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_i.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_i.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_ii.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_6_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_i.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_i.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_a.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_a.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_a.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_b.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_b.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_c.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_c.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_7_ii_c.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_8.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_8.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_308_a_8.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310_d_2_iv.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310_d_2_iv.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310_d_2_iv.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_310_d_2_iv.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_1.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_1.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_i.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_i.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_ii.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_iv.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_iv.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_iv.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_a_2_iv.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_b.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_b.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_b.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_1.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_1.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_2.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_2.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_c_2.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_d.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_d.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_d.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_1.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_1.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_i.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_i.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_i.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_ii.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_ii.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_ii.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_312_e_2_ii.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_1.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_1.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_2.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_2.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/aws_hipaa_security_rule_2003_164_314_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_hipaa_security_rule_2003/root.yaml b/compliance/frameworks/aws/aws_hipaa_security_rule_2003/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_hipaa_security_rule_2003/root.yaml rename to compliance/frameworks/aws/aws_hipaa_security_rule_2003/root.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_11_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_12_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_10.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_10.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_11.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_11.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_15.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_15.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_15.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_15.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_16.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_16.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_5.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_5.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_6.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_6.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_8.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_8.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_13_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_6.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_6.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_7.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_7.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_14_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_12.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_12.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_13.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_13.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_14.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_14.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_14.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_20.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_20.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_20.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_20.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_5.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_5.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_6.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_6.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_7.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_7.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_1_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_5.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_5.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_8.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_8.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_3_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_5.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_5.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_6.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_6.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_7.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_7.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_9.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_9.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_4_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_3.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_3.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_4.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_4.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_5.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_5.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_6.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_6.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_7.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_7.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_8.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_8.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_9.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_9.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_5_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_1.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_1.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_2.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_2.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8_9.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8_9.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/aws_nist_800_171_rev_2_3_8_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_171_rev_2/root.yaml b/compliance/frameworks/aws/aws_nist_800_171_rev_2/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_171_rev_2/root.yaml rename to compliance/frameworks/aws/aws_nist_800_171_rev_2/root.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_1.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_1.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_11.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_11.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_11_1_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_11_1_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_11_1_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_11_1_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_11_2_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_11_2_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_11_2_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_11_2_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_13.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_13.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_13_4_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_13_4_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_13_4_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_13_4_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_1_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_1_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_1_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_1_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_2_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_2_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_2_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_2_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_6_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_6_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_6_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_6_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_7_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_7_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_14_7_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_14_7_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_1_3_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_1_3_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_1_3_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_1_3_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_4.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_4.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_4_2_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_4_2_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_4_2_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_4_2_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_4_3_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_4_3_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_4_3_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_4_3_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_5.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_5.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_5_2_e.yaml b/compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_5_2_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/aws_nist_800_172_3_5_2_e.yaml rename to compliance/frameworks/aws/aws_nist_800_172/aws_nist_800_172_3_5_2_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_172/root.yaml b/compliance/frameworks/aws/aws_nist_800_172/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_172/root.yaml rename to compliance/frameworks/aws/aws_nist_800_172/root.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_17_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_21.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_21.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_21.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_21.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ac_6_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_11.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_11.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_au_9_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ca_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cm_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_cp_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_11.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_11.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ia_5_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ir_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_ra_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sa_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_13.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_13.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_23.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_23.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_23.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_23.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_28.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_28.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_28.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_28.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_sc_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_16.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_16.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_4_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/aws_nist_800_53_rev_4_si_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_4/root.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_4/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_4/root.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_4/root.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_16_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_17_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_24_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_12_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_3_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_d_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_d_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_d_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_d_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_g.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_g.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_g.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_i_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_i_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_i_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_i_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_j.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_j.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_j.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_2_j.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_12_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_13.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_13.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_15_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_b_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_3_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_e.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_e.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_4_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_3_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_21.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_21.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_21.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_21.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_22.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_22.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_22.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_22.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_26.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_26.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_26.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_26.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_28.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_28.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_28.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_4_28.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_6_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ac_7_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_11_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_12_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_14_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_16.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_16.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_2_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_e.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_e.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_f.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_f.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_f.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_3_f.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_6_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_8_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_au_9_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_2_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_7_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ca_9_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_12_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_2_b_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_5_1_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_6_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_7_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_a_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_8_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cm_9_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_10_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_1_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_1_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_1_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_1_a_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_a_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_e.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_e.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_2_e.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_6_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_cp_9_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_6_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_2_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_3_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_4_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_18_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_f.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_f.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_f.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_f.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_g.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_g.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_g.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_h.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_h.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_h.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_1_h.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_f.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_f.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_f.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_f.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_h.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_h.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_h.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_5_h.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ia_8_2_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ir_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ma_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_mp_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pe_6_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_11_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_a_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_a_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_14_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_16.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_16.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_17_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_21_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_31.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_31.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_31.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_pm_31.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_10_a_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_1_a_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_a_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_a_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_3_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_ra_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_10_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15_a_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15_a_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15_a_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_15_a_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sa_9_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_12_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_13_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_16_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_22.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_22.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_22.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_22.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_23_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_25.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_25.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_25.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_25.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_28_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36_1_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36_1_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_36_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_43_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_6.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_6.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_11.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_11.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_11.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_16.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_16.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_16.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_16.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_20.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_20.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_20.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_20.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_21.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_21.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_21.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_21.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_24_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_25.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_25.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_25.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_25.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_26.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_26.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_26.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_26.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_27.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_27.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_27.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_27.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_28.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_28.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_28.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_28.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_g.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_g.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_4_g.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_9_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_7_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_sc_8_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_10_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_13_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_19_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_1_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_1_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_a_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_a_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_a_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_a_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_c_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_c_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_c_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_1_c_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_2_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_8_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_c_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_c_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_c_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_3_c_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_10.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_10.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_10.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_12.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_12.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_13_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_14.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_14.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_14.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_14.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_17.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_17.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_17.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_17.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_20.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_20.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_20.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_20.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_23.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_23.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_23.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_23.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_25.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_25.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_25.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_25.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_2.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_2.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_a_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_c.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_c.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_d.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_d.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_4_d.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_b.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_b.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_1.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_1.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_3.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_3.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_7.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_7.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_8.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_8.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_a.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_a.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/aws_nist_800_53_rev_5_si_7_a.yaml diff --git a/compliance/frameworks/cloud/aws_nist_800_53_rev_5/root.yaml b/compliance/frameworks/aws/aws_nist_800_53_rev_5/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_800_53_rev_5/root.yaml rename to compliance/frameworks/aws/aws_nist_800_53_rev_5/root.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_ae_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_ae_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_6.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_6.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_7.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_cm_7.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_cm_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_dp.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_dp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_dp.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_dp.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_dp_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_dp_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_dp_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_dp_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_dp_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_dp_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_de_dp_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_de_dp_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_6.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_am_6.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_am_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_be.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_be.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_be.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_be.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_be_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_be_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_be_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_be_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_ra_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_ra_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_sc.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_sc.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_sc.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_sc_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_sc_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_id_sc_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_id_sc_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_6.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_6.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_7.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ac_7.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ac_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_6.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_6.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_6.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_7.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_7.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_8.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ds_8.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ds_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_12.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_12.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_12.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_7.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_7.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_7.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_8.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_8.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_8.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_9.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_9.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ip_9.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ip_9.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ma.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ma.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ma.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ma.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ma_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ma_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_ma_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_ma_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_4.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_4.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_4.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_5.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_pr_pt_5.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_pr_pt_5.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rc.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rc.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rc.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rc.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rc_rp.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rc_rp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rc_rp.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rc_rp.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rc_rp_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rc_rp_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rc_rp_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rc_rp_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_an.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_an.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_an.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_an.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_an_2.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_an_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_an_2.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_an_2.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_mi.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_mi.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_mi.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_mi.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_mi_3.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_mi_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_mi_3.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_mi_3.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_rp.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_rp.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_rp.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_rp.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_rp_1.yaml b/compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_rp_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/aws_nist_csf_rs_rp_1.yaml rename to compliance/frameworks/aws/aws_nist_csf/aws_nist_csf_rs_rp_1.yaml diff --git a/compliance/frameworks/cloud/aws_nist_csf/root.yaml b/compliance/frameworks/aws/aws_nist_csf/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_nist_csf/root.yaml rename to compliance/frameworks/aws/aws_nist_csf/root.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_7.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_7.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_2_7.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_3_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_5_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_7_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_10_8_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_11_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_1_4_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_2_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_2_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_1_3_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_1_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_d.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_d.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_2_d.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_2_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_2_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_d.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_d.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_4_d.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_3_6_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_d.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_d.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_d.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_e.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_e.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_e.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_e.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_f.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_f.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_f.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_f.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_g.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_g.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_4_1_g.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_5_2_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_1_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_2_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_2_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_3_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5_8.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5_8.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_5_8.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_6_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_1_2_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_7_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_1_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_3_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_4_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_2_5_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_3_2_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_5_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_6_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_a.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_a.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_a.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_b.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_b.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_b.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_b.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_c.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_c.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_c.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_d.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_d.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_d.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/aws_pci_dss_v321_requirement_8_7_d.yaml diff --git a/compliance/frameworks/cloud/aws_pci_dss_v321/root.yaml b/compliance/frameworks/aws/aws_pci_dss_v321/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_pci_dss_v321/root.yaml rename to compliance/frameworks/aws/aws_pci_dss_v321/root.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_12.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_12.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_12.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_12.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_1.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_1.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_3.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_3.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_1_3.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_5_1.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_5_1.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_5_1.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_6.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_6.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_6.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_1.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_1.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_2.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_2.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_3.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_3.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_4.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_4.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/aws_rbi_cyber_security_annex_i_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_cyber_security/root.yaml b/compliance/frameworks/aws/aws_rbi_cyber_security/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_cyber_security/root.yaml rename to compliance/frameworks/aws/aws_rbi_cyber_security/root.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_a.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_a.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_a.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_c.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_c.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_c.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_g.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_g.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_g.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_h.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_h.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_h.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_h.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_i.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_i.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_1_i.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_3.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_3.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_3.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_5.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_5.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_3_5.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_g.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_g.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_g.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_g.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_h.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_h.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_h.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_h.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_i.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_i.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_i.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_4_4_i.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6_3.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6_3.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_1.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_1.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_I.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_I.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_I.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_I.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_II.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_II.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_II.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_II.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_III.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_III.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_III.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_III.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_IX.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_IX.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_IX.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/aws_rbi_itf_nbfc_8_IX.yaml diff --git a/compliance/frameworks/cloud/aws_rbi_itf_nbfc/root.yaml b/compliance/frameworks/aws/aws_rbi_itf_nbfc/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_rbi_itf_nbfc/root.yaml rename to compliance/frameworks/aws/aws_rbi_itf_nbfc/root.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_a_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_a_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_a_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_a_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_a_1_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_a_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_a_1_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_a_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_c_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_c_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_c_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_c_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_c_1_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_c_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_c_1_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_c_1_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_c_1_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_c_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_c_1_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_c_1_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_1_3.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_1_3.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_1_3.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_2_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_2_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_2_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3_4.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_3_4.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_3_4.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_4.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_4.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_4.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_4_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_4_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_4_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_3.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_3.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_3.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_6.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_6.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_6.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_7.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_7.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_7.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_8.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_6_8.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_6_8.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_2.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_2.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_2.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_3.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_3.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_3.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_4.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_4.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_7_4.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_7_4.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_8.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_8.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_8.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_8_1.yaml b/compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/aws_soc_2_cc_8_1.yaml rename to compliance/frameworks/aws/aws_soc_2/aws_soc_2_cc_8_1.yaml diff --git a/compliance/frameworks/cloud/aws_soc_2/root.yaml b/compliance/frameworks/aws/aws_soc_2/root.yaml similarity index 100% rename from compliance/frameworks/cloud/aws_soc_2/root.yaml rename to compliance/frameworks/aws/aws_soc_2/root.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_activedirectory.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_activedirectory.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_activedirectory.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_activedirectory.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_apimanagement.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_apimanagement.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_apimanagement.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_apimanagement.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_appconfiguration.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_appconfiguration.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_appconfiguration.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_appconfiguration.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_appservice.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_appservice.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_appservice.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_appservice.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_automation.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_automation.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_automation.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_automation.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_batch.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_batch.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_batch.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_batch.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_cognitivesearch.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_cognitivesearch.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_cognitivesearch.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_cognitivesearch.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_cognitiveservice.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_cognitiveservice.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_cognitiveservice.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_cognitiveservice.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_compute.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_compute.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_compute.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_compute.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_containerinstance.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_containerinstance.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_containerinstance.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_containerinstance.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_containerregistry.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_containerregistry.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_containerregistry.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_containerregistry.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_cosmosdb.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_cosmosdb.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_cosmosdb.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_cosmosdb.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_databoxedge.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_databoxedge.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_databoxedge.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_databoxedge.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_datafactory.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_datafactory.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_datafactory.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_datafactory.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_datalakeanalytics.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_datalakeanalytics.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_datalakeanalytics.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_datalakeanalytics.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_datalakestore.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_datalakestore.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_datalakestore.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_datalakestore.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_eventgrid.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_eventgrid.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_eventgrid.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_eventgrid.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_eventhub.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_eventhub.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_eventhub.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_eventhub.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_frontdoor.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_frontdoor.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_frontdoor.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_frontdoor.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_hdinsight.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_hdinsight.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_hdinsight.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_hdinsight.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_healthcare.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_healthcare.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_healthcare.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_healthcare.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_hpccache.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_hpccache.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_hpccache.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_hpccache.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_iothub.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_iothub.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_iothub.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_iothub.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_keyvault.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_keyvault.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_keyvault.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_keyvault.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_kubernetes.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_kubernetes.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_kubernetes.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_kubernetes.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_kusto.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_kusto.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_kusto.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_kusto.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_logic.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_logic.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_logic.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_logic.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_machinelearning.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_machinelearning.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_machinelearning.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_machinelearning.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_mariadb.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_mariadb.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_mariadb.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_mariadb.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_monitor.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_monitor.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_monitor.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_monitor.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_mysql.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_mysql.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_mysql.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_mysql.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_network.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_network.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_network.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_network.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_postgres.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_postgres.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_postgres.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_postgres.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_recoveryservice.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_recoveryservice.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_recoveryservice.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_recoveryservice.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_redis.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_redis.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_redis.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_redis.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_securitycenter.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_securitycenter.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_securitycenter.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_securitycenter.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_servicebus.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_servicebus.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_servicebus.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_servicebus.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_servicefabric.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_servicefabric.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_servicefabric.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_servicefabric.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_signalr.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_signalr.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_signalr.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_signalr.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_springcloud.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_springcloud.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_springcloud.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_springcloud.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_sql.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_sql.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_sql.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_sql.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_storage.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_storage.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_storage.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_storage.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_storagesync.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_storagesync.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_storagesync.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_storagesync.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_streamanalytics.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_streamanalytics.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_streamanalytics.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_streamanalytics.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/azure_all_controls_synapse.yaml b/compliance/frameworks/azure/azure_all_controls/azure_all_controls_synapse.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/azure_all_controls_synapse.yaml rename to compliance/frameworks/azure/azure_all_controls/azure_all_controls_synapse.yaml diff --git a/compliance/frameworks/cloud/azure_all_controls/root.yaml b/compliance/frameworks/azure/azure_all_controls/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_all_controls/root.yaml rename to compliance/frameworks/azure/azure_all_controls/root.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_1.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_1.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_2.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_2.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_3.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_3.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4_1.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4_1.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4_2.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4_2.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4_3.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_4_3.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_4_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_5.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_5.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_5_1.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_5_1.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_5_2.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_5_2.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_6.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_6.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_6.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_7.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_7.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_7.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_8.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_8.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_8.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_9.yaml b/compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/azure_cis_v130_9.yaml rename to compliance/frameworks/azure/azure_cis_v130/azure_cis_v130_9.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v130/root.yaml b/compliance/frameworks/azure/azure_cis_v130/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v130/root.yaml rename to compliance/frameworks/azure/azure_cis_v130/root.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_1.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_1.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_2.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_2.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_3.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_3.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_1.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_1.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_2.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_2.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_3.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_3.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_4.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_4_4.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_4_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_5.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_5.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_5_1.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_5_1.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_5_2.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_5_2.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_6.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_6.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_6.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_7.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_7.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_7.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_8.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_8.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_8.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_9.yaml b/compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/azure_cis_v140_9.yaml rename to compliance/frameworks/azure/azure_cis_v140/azure_cis_v140_9.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v140/root.yaml b/compliance/frameworks/azure/azure_cis_v140/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v140/root.yaml rename to compliance/frameworks/azure/azure_cis_v140/root.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_1.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_1.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_10.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_10.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_10.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_1_1.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_1_1.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_1_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_1_2.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_1_2.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_1_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_1.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_1.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_2.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_2.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_3.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_3.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_4.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_2_4.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_2_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_3.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_3.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_1.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_1.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_2.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_2.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_3.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_3.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_4.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_4.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_5.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_4_5.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_4_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_5.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_5.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_5_1.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_5_1.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_5_2.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_5_2.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_6.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_6.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_6.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_7.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_7.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_7.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_8.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_8.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_8.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_9.yaml b/compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/azure_cis_v150_9.yaml rename to compliance/frameworks/azure/azure_cis_v150/azure_cis_v150_9.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v150/root.yaml b/compliance/frameworks/azure/azure_cis_v150/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v150/root.yaml rename to compliance/frameworks/azure/azure_cis_v150/root.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_1.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_1.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_10.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_10.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_10.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_1_1.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_1_1.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_1_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_1_2.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_1_2.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_1_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2_1.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2_1.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2_2.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2_2.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2_3.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_2_3.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_2_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_3.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_3.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_1.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_1.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_2.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_2.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_3.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_3.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_4.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_4.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_5.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_4_5.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_4_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_1.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_1.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_2.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_2.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_3.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_3.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_5.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_5_5.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_5_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_6.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_6.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_6.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_7.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_7.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_7.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_8.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_8.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_8.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_9.yaml b/compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/azure_cis_v200_9.yaml rename to compliance/frameworks/azure/azure_cis_v200/azure_cis_v200_9.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v200/root.yaml b/compliance/frameworks/azure/azure_cis_v200/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v200/root.yaml rename to compliance/frameworks/azure/azure_cis_v200/root.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_1.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_1.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_10.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_10.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_10.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_1_1.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_1_1.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_1_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_1_2.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_1_2.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_1_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_2.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_2.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_2_1.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_2_1.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_2_2.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_2_2.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_2_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_3.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_3.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_1.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_1.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_3.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_3.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_4.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_4.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_4.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_5.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_4_5.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_4_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_1.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_1.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_2.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_2.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_3.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_3.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_3.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_5.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_5_5.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_5_5.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_6.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_6.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_6.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_7.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_7.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_7.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_8.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_8.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_8.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_9.yaml b/compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/azure_cis_v210_9.yaml rename to compliance/frameworks/azure/azure_cis_v210/azure_cis_v210_9.yaml diff --git a/compliance/frameworks/cloud/azure_cis_v210/root.yaml b/compliance/frameworks/azure/azure_cis_v210/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_cis_v210/root.yaml rename to compliance/frameworks/azure/azure_cis_v210/root.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_17.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_17.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_17.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_17.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_17_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_17_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_17_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_17_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2_12.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2_12.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2_12.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2_7.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_2_7.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_2_7.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_3.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_3.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_3.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_4.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_4.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_4.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_5.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_5.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_5.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_6.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_6.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_6.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_6_7.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_6_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ac_6_7.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ac_6_7.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_12.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_12.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_12.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_12_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_12_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_12_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_12_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_6.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_6.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_6.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_6_4.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_6_4.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_6_4.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_6_5.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_au_6_5.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_au_6_5.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cm.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cm.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cm.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cm_6.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cm_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cm_6.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cm_6.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cm_7.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cm_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cm_7.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cm_7.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_6.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_6.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_6.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_6_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_6_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_6_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_7.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_7.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_7.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_9.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_cp_9.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_cp_9.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_2.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_2.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_2.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_4.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_4.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_4.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_5.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_5.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_5.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_5_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ia_5_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ia_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ir.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ir.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ir.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ir_4.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ir_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ir_4.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ir_4.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ir_5.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ir_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ir_5.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ir_5.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ra.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ra.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ra.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ra.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ra_5.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ra_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_ra_5.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_ra_5.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_12.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_12.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_12.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_28.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_28.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_28.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_28.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_28_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_28_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_28_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_28_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_3.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_3.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_3.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_5.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_5.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_5.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_7.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_7.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_7.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_7_3.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_7_3.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_7_3.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_8.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_8.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_8.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_8_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_sc_8_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_sc_8_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_16.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_16.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_16.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_16.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_2.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_2.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_2.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_3.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_3.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_3.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_3_1.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_3_1.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_3_1.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_4.yaml b/compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/azure_fedramp_high_si_4.yaml rename to compliance/frameworks/azure/azure_fedramp_high/azure_fedramp_high_si_4.yaml diff --git a/compliance/frameworks/cloud/azure_fedramp_high/root.yaml b/compliance/frameworks/azure/azure_fedramp_high/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_fedramp_high/root.yaml rename to compliance/frameworks/azure/azure_fedramp_high/root.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0201_09j1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0201_09j1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0201_09j1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0201_09j1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0301_09o1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0301_09o1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0301_09o1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0301_09o1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0302_09o2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0302_09o2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0302_09o2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0302_09o2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0304_09o3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0304_09o3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0304_09o3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0304_09o3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0605_10h1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0605_10h1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0605_10h1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0605_10h1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0606_10h2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0606_10h2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0606_10h2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0606_10h2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0607_10h2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0607_10h2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0607_10h2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0607_10h2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0635_10k1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0635_10k1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0635_10k1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0635_10k1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0636_10k2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0636_10k2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0636_10k2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0636_10k2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0637_10k2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0637_10k2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0637_10k2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0637_10k2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0638_10k2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0638_10k2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0638_10k2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0638_10k2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0639_10k2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0639_10k2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0639_10k2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0639_10k2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0640_10k2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0640_10k2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0640_10k2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0640_10k2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0641_10k2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0641_10k2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0641_10k2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0641_10k2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0642_10k3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0642_10k3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0642_10k3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0642_10k3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0643_10k3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0643_10k3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0643_10k3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0643_10k3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0644_10k3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0644_10k3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0644_10k3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0644_10k3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0662_09scsporganizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0662_09scsporganizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0662_09scsporganizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0662_09scsporganizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0709_10m1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0709_10m1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0709_10m1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0709_10m1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0710_10m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0710_10m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0710_10m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0710_10m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0711_10m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0711_10m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0711_10m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0711_10m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0713_10m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0713_10m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0713_10m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0713_10m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0714_10m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0714_10m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0714_10m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0714_10m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0715_10m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0715_10m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0715_10m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0715_10m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0716_10m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0716_10m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0716_10m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0716_10m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0717_10m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0717_10m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0717_10m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0717_10m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0718_10m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0718_10m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0718_10m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0718_10m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0719_10m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0719_10m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0719_10m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0719_10m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0805_01m1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0805_01m1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0805_01m1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0805_01m1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0806_01m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0806_01m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0806_01m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0806_01m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0809_01n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0809_01n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0809_01n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0809_01n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0810_01n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0810_01n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0810_01n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0810_01n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0811_01n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0811_01n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0811_01n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0811_01n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0812_01n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0812_01n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0812_01n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0812_01n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0814_01n1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0814_01n1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0814_01n1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0814_01n1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0835_09n1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0835_09n1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0835_09n1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0835_09n1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0836_09_n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0836_09_n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0836_09_n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0836_09_n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0837_09_n2Organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0837_09_n2Organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0837_09_n2Organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0837_09_n2Organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0858_09m1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0858_09m1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0858_09m1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0858_09m1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0859_09m1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0859_09m1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0859_09m1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0859_09m1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0860_09m1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0860_09m1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0860_09m1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0860_09m1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0861_09m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0861_09m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0861_09m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0861_09m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0862_09m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0862_09m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0862_09m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0862_09m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0863_09m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0863_09m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0863_09m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0863_09m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0864_09m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0864_09m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0864_09m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0864_09m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0865_09m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0865_09m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0865_09m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0865_09m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0866_09m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0866_09m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0866_09m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0866_09m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0867_09m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0867_09m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0867_09m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0867_09m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0868_09m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0868_09m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0868_09m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0868_09m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0869_09m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0869_09m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0869_09m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0869_09m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0870_09m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0870_09m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0870_09m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0870_09m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0871_09m3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0871_09m3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0871_09m3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0871_09m3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0885_09n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0885_09n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0885_09n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0885_09n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0886_09n2Organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0886_09n2Organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0886_09n2Organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0886_09n2Organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0887_09n2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0887_09n2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0887_09n2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0887_09n2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0888_09n2Organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0888_09n2Organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0888_09n2Organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0888_09n2Organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0894_01m2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0894_01m2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0894_01m2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0894_01m2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0901_09s1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0901_09s1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0901_09s1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0901_09s1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0902_09s2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0902_09s2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0902_09s2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0902_09s2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0912_09s1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0912_09s1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0912_09s1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0912_09s1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0913_09s1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0913_09s1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0913_09s1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0913_09s1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0915_09s2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0915_09s2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0915_09s2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0915_09s2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0916_09s2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0916_09s2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0916_09s2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0916_09s2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0943_09y1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0943_09y1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0943_09y1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0943_09y1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0945_09y1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0945_09y1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0945_09y1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0945_09y1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0946_09y2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0946_09y2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0946_09y2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0946_09y2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0947_09y2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0947_09y2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0947_09y2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0947_09y2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0948_09y2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0948_09y2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0948_09y2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0948_09y2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0949_09y2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0949_09y2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0949_09y2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0949_09y2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0960_09scsporganizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0960_09scsporganizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0960_09scsporganizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_0960_09scsporganizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11109_01q1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11109_01q1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11109_01q1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11109_01q1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11110_01q1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11110_01q1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11110_01q1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11110_01q1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11111_01q2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11111_01q2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11111_01q2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11111_01q2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11112_01q2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11112_01q2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11112_01q2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11112_01q2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1116_01j1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1116_01j1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1116_01j1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1116_01j1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1117_01j1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1117_01j1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1117_01j1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1117_01j1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11180_01c3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11180_01c3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11180_01c3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11180_01c3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1118_01j2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1118_01j2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1118_01j2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1118_01j2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1119_01j2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1119_01j2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1119_01j2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1119_01j2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11208_01q1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11208_01q1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11208_01q1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11208_01q1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1120_09ab3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1120_09ab3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1120_09ab3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1120_09ab3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11210_01q2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11210_01q2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11210_01q2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11210_01q2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11211_01q2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11211_01q2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11211_01q2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_11211_01q2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1121_01j3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1121_01j3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1121_01j3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1121_01j3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1123_01q1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1123_01q1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1123_01q1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1123_01q1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1125_01q2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1125_01q2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1125_01q2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1125_01q2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1127_01q2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1127_01q2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1127_01q2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1127_01q2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1143_01c1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1143_01c1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1143_01c1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1143_01c1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1144_01c1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1144_01c1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1144_01c1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1144_01c1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1145_01c2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1145_01c2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1145_01c2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1145_01c2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1146_01c2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1146_01c2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1146_01c2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1146_01c2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1147_01c2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1147_01c2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1147_01c2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1147_01c2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1148_01c2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1148_01c2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1148_01c2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1148_01c2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1149_01c2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1149_01c2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1149_01c2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1149_01c2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1150_01c2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1150_01c2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1150_01c2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1150_01c2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1151_01c3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1151_01c3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1151_01c3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1151_01c3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1152_01c3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1152_01c3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1152_01c3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1152_01c3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1153_01c3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1153_01c3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1153_01c3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1153_01c3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1154_01c3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1154_01c3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1154_01c3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1154_01c3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1173_01j1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1173_01j1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1173_01j1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1173_01j1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1174_01j1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1174_01j1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1174_01j1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1174_01j1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1175_01j1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1175_01j1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1175_01j1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1175_01j1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1176_01j2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1176_01j2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1176_01j2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1176_01j2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1177_01j2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1177_01j2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1177_01j2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1177_01j2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1178_01j2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1178_01j2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1178_01j2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1178_01j2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1179_01j3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1179_01j3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1179_01j3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1179_01j3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1192_01l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1192_01l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1192_01l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1192_01l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1193_01l2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1193_01l2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1193_01l2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1193_01l2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1194_01l2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1194_01l2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1194_01l2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1194_01l2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1195_01l3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1195_01l3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1195_01l3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1195_01l3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1197_01l3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1197_01l3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1197_01l3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1197_01l3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1202_09aa1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1202_09aa1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1202_09aa1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1202_09aa1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1203_09aa1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1203_09aa1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1203_09aa1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1203_09aa1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1204_09aa1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1204_09aa1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1204_09aa1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1204_09aa1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1205_09aa2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1205_09aa2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1205_09aa2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1205_09aa2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1207_09aa2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1207_09aa2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1207_09aa2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1207_09aa2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1208_09aa3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1208_09aa3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1208_09aa3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1208_09aa3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1209_09aa3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1209_09aa3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1209_09aa3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1209_09aa3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12100_09ab2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12100_09ab2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12100_09ab2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12100_09ab2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12101_09ab1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12101_09ab1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12101_09ab1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12101_09ab1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12102_09ab1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12102_09ab1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12102_09ab1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_12102_09ab1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1210_09aa3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1210_09aa3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1210_09aa3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1210_09aa3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1211_09aa3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1211_09aa3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1211_09aa3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1211_09aa3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1212_09ab1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1212_09ab1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1212_09ab1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1212_09ab1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1213_09ab2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1213_09ab2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1213_09ab2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1213_09ab2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1214_09ab2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1214_09ab2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1214_09ab2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1214_09ab2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1215_09ab2system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1215_09ab2system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1215_09ab2system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1215_09ab2system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1216_09ab3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1216_09ab3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1216_09ab3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1216_09ab3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1217_09ab3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1217_09ab3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1217_09ab3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1217_09ab3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1219_09ab3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1219_09ab3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1219_09ab3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1219_09ab3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1220_09ab3system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1220_09ab3system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1220_09ab3system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1220_09ab3system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1229_09c1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1229_09c1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1229_09c1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1229_09c1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1230_09c2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1230_09c2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1230_09c2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1230_09c2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1232_09c3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1232_09c3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1232_09c3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1232_09c3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1270_09ad1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1270_09ad1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1270_09ad1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1270_09ad1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1271_09ad1system.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1271_09ad1system.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1271_09ad1system.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1271_09ad1system.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1277_09c2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1277_09c2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1277_09c2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1277_09c2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1325_09s1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1325_09s1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1325_09s1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1325_09s1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1401_05i1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1401_05i1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1401_05i1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1401_05i1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1402_05i1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1402_05i1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1402_05i1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1402_05i1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1403_05i1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1403_05i1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1403_05i1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1403_05i1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1418_05i1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1418_05i1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1418_05i1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1418_05i1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1450_05i2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1450_05i2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1450_05i2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1450_05i2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1451_05icsporganizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1451_05icsporganizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1451_05icsporganizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1451_05icsporganizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1616_09l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1616_09l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1616_09l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1616_09l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1617_09l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1617_09l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1617_09l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1617_09l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1618_09l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1618_09l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1618_09l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1618_09l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1619_09l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1619_09l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1619_09l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1619_09l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1620_09l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1620_09l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1620_09l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1620_09l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1621_09l2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1621_09l2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1621_09l2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1621_09l2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1622_09l2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1622_09l2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1622_09l2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1622_09l2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1623_09l2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1623_09l2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1623_09l2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1623_09l2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1624_09l3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1624_09l3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1624_09l3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1624_09l3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1625_09l3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1625_09l3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1625_09l3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1625_09l3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1626_09l3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1626_09l3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1626_09l3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1626_09l3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1627_09l3organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1627_09l3organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1627_09l3organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1627_09l3organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1634_12b1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1634_12b1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1634_12b1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1634_12b1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1635_12b1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1635_12b1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1635_12b1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1635_12b1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1637_12b2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1637_12b2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1637_12b2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1637_12b2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1638_12b2organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1638_12b2organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1638_12b2organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1638_12b2organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1699_09l1organizational.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1699_09l1organizational.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1699_09l1organizational.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_1699_09l1organizational.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_access_control.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_access_control.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_access_control.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_access_control.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_audit_logging_and_monitoring.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_audit_logging_and_monitoring.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_audit_logging_and_monitoring.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_audit_logging_and_monitoring.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_back_up.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_back_up.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_back_up.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_back_up.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_business_continuity_and_disaster_recovery.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_business_continuity_and_disaster_recovery.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_business_continuity_and_disaster_recovery.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_business_continuity_and_disaster_recovery.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_configuration_management.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_configuration_management.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_configuration_management.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_configuration_management.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_control_of_operational_software.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_control_of_operational_software.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_control_of_operational_software.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_control_of_operational_software.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_education_training_and_awareness.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_education_training_and_awareness.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_education_training_and_awareness.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_education_training_and_awareness.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_endpoint_protection.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_endpoint_protection.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_endpoint_protection.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_endpoint_protection.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_identification_of_risks_related_to_external_parties.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_identification_of_risks_related_to_external_parties.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_identification_of_risks_related_to_external_parties.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_identification_of_risks_related_to_external_parties.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_controls.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_controls.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_controls.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_controls.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_protection.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_protection.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_protection.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_network_protection.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_on_line_transactions.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_on_line_transactions.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_on_line_transactions.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_on_line_transactions.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_portable_media_security.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_portable_media_security.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_portable_media_security.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_portable_media_security.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_privilege_management.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_privilege_management.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_privilege_management.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_privilege_management.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_third_party_assurance.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_third_party_assurance.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_third_party_assurance.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_third_party_assurance.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_transmission_protection.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_transmission_protection.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_transmission_protection.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_transmission_protection.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_authentication_for_external_connections.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_authentication_for_external_connections.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_authentication_for_external_connections.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_authentication_for_external_connections.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_identification_and_authentication.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_identification_and_authentication.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_identification_and_authentication.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_user_identification_and_authentication.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_vulnerability_management.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_vulnerability_management.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_vulnerability_management.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/azure_hipaa_hitrust_v92_vulnerability_management.yaml diff --git a/compliance/frameworks/cloud/azure_hipaa_hitrust_v92/root.yaml b/compliance/frameworks/azure/azure_hipaa_hitrust_v92/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_hipaa_hitrust_v92/root.yaml rename to compliance/frameworks/azure/azure_hipaa_hitrust_v92/root.yaml diff --git a/compliance/frameworks/cloud/azure_msb/azure_msb_5.yaml b/compliance/frameworks/azure/azure_msb/azure_msb_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_msb/azure_msb_5.yaml rename to compliance/frameworks/azure/azure_msb/azure_msb_5.yaml diff --git a/compliance/frameworks/cloud/azure_msb/azure_msb_aks.yaml b/compliance/frameworks/azure/azure_msb/azure_msb_aks.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_msb/azure_msb_aks.yaml rename to compliance/frameworks/azure/azure_msb/azure_msb_aks.yaml diff --git a/compliance/frameworks/cloud/azure_msb/root.yaml b/compliance/frameworks/azure/azure_msb/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_msb/root.yaml rename to compliance/frameworks/azure/azure_msb/root.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_11_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_10.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_10.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_10.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_16.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_16.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_16.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_16.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_8.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_8.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_13_8.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_14_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_12.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_12.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_12.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_13.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_13.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_13.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_13.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_14.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_14.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_14.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_14.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_1_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_3_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_4_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_10.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_10.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_10.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_8.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_8.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_5_8.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_6_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8_9.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8_9.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/azure_nist_sp_800_171_rev_2_3_8_9.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/root.yaml b/compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_171_rev_2/root.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_171_rev_2/root.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_16.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_16.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_16.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_16.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_17_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_12.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_12.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_12.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_2_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_3_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_4_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ac_6_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_11.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_11.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_11.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_11.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_12_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_au_6_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_10.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_10.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_10.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_11.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_11.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_11.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_11.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cm_7_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_6_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_9.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_9.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_9.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_cp_9.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_2_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ia_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_6_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_6_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ir_6_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_ra_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_12.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_12.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_12.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_28_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_5.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_5.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_5.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_7_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8_1.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8_1.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_sc_8_1.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_16.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_16.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_16.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_16.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2_6.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2_6.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_2_6.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_3.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_3.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_3.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4_12.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4_12.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4_12.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/azure_nist_sp_800_53_rev_5_si_4_12.yaml diff --git a/compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/root.yaml b/compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_nist_sp_800_53_rev_5/root.yaml rename to compliance/frameworks/azure/azure_nist_sp_800_53_rev_5/root.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5_4.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5_4.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_10_5_4.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_11_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_4.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_4.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_1_3_4.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_4.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_4.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_3_4.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_4_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_5_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_5_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_6.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_6.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_6_6.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_1_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_7_2_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_5.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_5.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_1_5.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_5.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_5.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_2_5.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3_1.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3_1.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/azure_pci_dss_v321_requirement_8_3_1.yaml diff --git a/compliance/frameworks/cloud/azure_pci_dss_v321/root.yaml b/compliance/frameworks/azure/azure_pci_dss_v321/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_pci_dss_v321/root.yaml rename to compliance/frameworks/azure/azure_pci_dss_v321/root.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_2.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_2.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_2.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_3.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_3.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_3.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_4.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_4.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_business_continuity_planning_6_4.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5_2.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5_2.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_is_audit_5_2.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1_1.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1_1.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_governance_1_1.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_a.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_a.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_a.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_a.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_b.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_b.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_b.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_b.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_c.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_c.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_c.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_c.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_f.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_f.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_f.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_f.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_g.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_g.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_g.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_g.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_h.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_h.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_h.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_1_h.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_3.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_3.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_3.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_3.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_8.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_8.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_8.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_information_and_cyber_security_3_8.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_2.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_2.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_2.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_2.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_a.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_a.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_a.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_a.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_b.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_b.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_b.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/azure_rbi_itf_nbfc_v2017_it_operations_4_4_b.yaml diff --git a/compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/root.yaml b/compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/root.yaml similarity index 100% rename from compliance/frameworks/cloud/azure_rbi_itf_nbfc_v2017/root.yaml rename to compliance/frameworks/azure/azure_rbi_itf_nbfc_v2017/root.yaml