diff --git a/shelf_warmers/README.md b/shelf_warmers_aws/README.md
similarity index 100%
rename from shelf_warmers/README.md
rename to shelf_warmers_aws/README.md
diff --git a/shelf_warmers/dataproduct-aws-athena-shelf_warmers/main.tf b/shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/main.tf
similarity index 100%
rename from shelf_warmers/dataproduct-aws-athena-shelf_warmers/main.tf
rename to shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/main.tf
diff --git a/shelf_warmers/dataproduct-aws-athena-shelf_warmers/providers.tf b/shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/providers.tf
similarity index 100%
rename from shelf_warmers/dataproduct-aws-athena-shelf_warmers/providers.tf
rename to shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/providers.tf
diff --git a/shelf_warmers/dataproduct-aws-athena-shelf_warmers/schema/shelf_warmers.schema.json b/shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/schema/shelf_warmers.schema.json
similarity index 100%
rename from shelf_warmers/dataproduct-aws-athena-shelf_warmers/schema/shelf_warmers.schema.json
rename to shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/schema/shelf_warmers.schema.json
diff --git a/shelf_warmers/dataproduct-aws-athena-shelf_warmers/sql/transform.sql b/shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/sql/transform.sql
similarity index 100%
rename from shelf_warmers/dataproduct-aws-athena-shelf_warmers/sql/transform.sql
rename to shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/sql/transform.sql
diff --git a/shelf_warmers/dataproduct-aws-athena-shelf_warmers/terraform.tfvars.template b/shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/terraform.tfvars.template
similarity index 100%
rename from shelf_warmers/dataproduct-aws-athena-shelf_warmers/terraform.tfvars.template
rename to shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/terraform.tfvars.template
diff --git a/shelf_warmers/dataproduct-aws-athena-shelf_warmers/variables.tf b/shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/variables.tf
similarity index 100%
rename from shelf_warmers/dataproduct-aws-athena-shelf_warmers/variables.tf
rename to shelf_warmers_aws/dataproduct-aws-athena-shelf_warmers/variables.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/main.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/main.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/main.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/main.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/output.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/output.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/output.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/output.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/providers.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/providers.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/providers.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/providers.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/variables.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/variables.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/variables.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/confluent_kafka/variables.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/main.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/main.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/main.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/main.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/providers.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/providers.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/providers.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/providers.tf
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/schema/stock_updated.schema.json b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/schema/stock_updated.schema.json
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/schema/stock_updated.schema.json
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/schema/stock_updated.schema.json
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/terraform.tfvars.template b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/terraform.tfvars.template
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/terraform.tfvars.template
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/terraform.tfvars.template
diff --git a/shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/variables.tf b/shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/variables.tf
similarity index 100%
rename from shelf_warmers/dataproduct-confluent-kafka-to-aws-s3/variables.tf
rename to shelf_warmers_aws/dataproduct-confluent-kafka-to-aws-s3/variables.tf