diff --git a/aws-app-sync/README.md b/aws-modules/aws-app-sync/README.md
similarity index 100%
rename from aws-app-sync/README.md
rename to aws-modules/aws-app-sync/README.md
diff --git a/aws-app-sync/pom.xml b/aws-modules/aws-app-sync/pom.xml
similarity index 96%
rename from aws-app-sync/pom.xml
rename to aws-modules/aws-app-sync/pom.xml
index b759de4a72..8d7d90e631 100644
--- a/aws-app-sync/pom.xml
+++ b/aws-modules/aws-app-sync/pom.xml
@@ -11,7 +11,7 @@
com.baeldung
parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-2
+ ../../parent-boot-2
diff --git a/aws-app-sync/src/main/java/com/baeldung/awsappsync/AppSyncClientHelper.java b/aws-modules/aws-app-sync/src/main/java/com/baeldung/awsappsync/AppSyncClientHelper.java
similarity index 100%
rename from aws-app-sync/src/main/java/com/baeldung/awsappsync/AppSyncClientHelper.java
rename to aws-modules/aws-app-sync/src/main/java/com/baeldung/awsappsync/AppSyncClientHelper.java
diff --git a/aws-app-sync/src/main/java/com/baeldung/awsappsync/AwsAppSyncApplication.java b/aws-modules/aws-app-sync/src/main/java/com/baeldung/awsappsync/AwsAppSyncApplication.java
similarity index 100%
rename from aws-app-sync/src/main/java/com/baeldung/awsappsync/AwsAppSyncApplication.java
rename to aws-modules/aws-app-sync/src/main/java/com/baeldung/awsappsync/AwsAppSyncApplication.java
diff --git a/aws-app-sync/src/test/java/com/baeldung/awsappsync/AwsAppSyncApplicationUnitTest.java b/aws-modules/aws-app-sync/src/test/java/com/baeldung/awsappsync/AwsAppSyncApplicationUnitTest.java
similarity index 100%
rename from aws-app-sync/src/test/java/com/baeldung/awsappsync/AwsAppSyncApplicationUnitTest.java
rename to aws-modules/aws-app-sync/src/test/java/com/baeldung/awsappsync/AwsAppSyncApplicationUnitTest.java
diff --git a/aws-lambda/.gitignore b/aws-modules/aws-lambda/.gitignore
similarity index 100%
rename from aws-lambda/.gitignore
rename to aws-modules/aws-lambda/.gitignore
diff --git a/aws-lambda/README.md b/aws-modules/aws-lambda/README.md
similarity index 73%
rename from aws-lambda/README.md
rename to aws-modules/aws-lambda/README.md
index 0ae188fc97..a845c5835e 100644
--- a/aws-lambda/README.md
+++ b/aws-modules/aws-lambda/README.md
@@ -3,7 +3,9 @@
This module contains articles about AWS Lambda
### Relevant Articles:
+- [A Basic AWS Lambda Example With Java](https://www.baeldung.com/java-aws-lambda)
- [Using AWS Lambda with API Gateway](https://www.baeldung.com/aws-lambda-api-gateway)
- [Introduction to AWS Serverless Application Model](https://www.baeldung.com/aws-serverless)
- [How to Implement Hibernate in an AWS Lambda Function in Java](https://www.baeldung.com/java-aws-lambda-hibernate)
- [Writing an Enterprise-Grade AWS Lambda in Java](https://www.baeldung.com/java-enterprise-aws-lambda)
+- [AWS Lambda Using DynamoDB With Java](https://www.baeldung.com/aws-lambda-dynamodb-java)
diff --git a/aws-lambda/lambda/pom.xml b/aws-modules/aws-lambda/lambda/pom.xml
similarity index 100%
rename from aws-lambda/lambda/pom.xml
rename to aws-modules/aws-lambda/lambda/pom.xml
diff --git a/aws-lambda/lambda/sam-templates/template-implicit.yaml b/aws-modules/aws-lambda/lambda/sam-templates/template-implicit.yaml
similarity index 100%
rename from aws-lambda/lambda/sam-templates/template-implicit.yaml
rename to aws-modules/aws-lambda/lambda/sam-templates/template-implicit.yaml
diff --git a/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml b/aws-modules/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml
similarity index 100%
rename from aws-lambda/lambda/sam-templates/template-inline-swagger.yaml
rename to aws-modules/aws-lambda/lambda/sam-templates/template-inline-swagger.yaml
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/APIDemoHandler.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/apigateway/model/Person.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/SavePersonHandler.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonRequest.java
diff --git a/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java b/aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
similarity index 100%
rename from aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
rename to aws-modules/aws-lambda/lambda/src/main/java/com/baeldung/lambda/dynamodb/bean/PersonResponse.java
diff --git a/aws-lambda/lambda/src/main/resources/logback.xml b/aws-modules/aws-lambda/lambda/src/main/resources/logback.xml
similarity index 100%
rename from aws-lambda/lambda/src/main/resources/logback.xml
rename to aws-modules/aws-lambda/lambda/src/main/resources/logback.xml
diff --git a/aws-lambda/pom.xml b/aws-modules/aws-lambda/pom.xml
similarity index 93%
rename from aws-lambda/pom.xml
rename to aws-modules/aws-lambda/pom.xml
index fc655f282d..bdd295c007 100644
--- a/aws-lambda/pom.xml
+++ b/aws-modules/aws-lambda/pom.xml
@@ -9,7 +9,7 @@
com.baeldung
- parent-modules
+ aws-modules
1.0.0-SNAPSHOT
diff --git a/aws-lambda/shipping-tracker/.gitignore b/aws-modules/aws-lambda/shipping-tracker/.gitignore
similarity index 100%
rename from aws-lambda/shipping-tracker/.gitignore
rename to aws-modules/aws-lambda/shipping-tracker/.gitignore
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/pom.xml b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/pom.xml
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/pom.xml
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/App.java
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Checkin.java
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Consignment.java
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/Item.java
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingDao.java
diff --git a/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java b/aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
similarity index 100%
rename from aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
rename to aws-modules/aws-lambda/shipping-tracker/ShippingFunction/src/main/java/com/baeldung/lambda/shipping/ShippingService.java
diff --git a/aws-lambda/shipping-tracker/template.yaml b/aws-modules/aws-lambda/shipping-tracker/template.yaml
similarity index 100%
rename from aws-lambda/shipping-tracker/template.yaml
rename to aws-modules/aws-lambda/shipping-tracker/template.yaml
diff --git a/aws-lambda/todo-reminder/ToDoFunction/pom.xml b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/pom.xml
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/pom.xml
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/App.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostApi.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/PostItem.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoApi.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/api/ToDoItem.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Config.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Credentials.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/ExecutionContext.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/config/Services.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/PostService.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/java/com/baeldung/lambda/todo/service/ToDoReaderService.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/configuration.yml
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/main/resources/log4j2.xml
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/AppTest.java
diff --git a/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java b/aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
similarity index 100%
rename from aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
rename to aws-modules/aws-lambda/todo-reminder/ToDoFunction/src/test/java/com/baeldung/lambda/todo/service/ToDoReaderServiceTest.java
diff --git a/aws-lambda/todo-reminder/template.yaml b/aws-modules/aws-lambda/todo-reminder/template.yaml
similarity index 100%
rename from aws-lambda/todo-reminder/template.yaml
rename to aws-modules/aws-lambda/todo-reminder/template.yaml
diff --git a/aws/.gitignore b/aws-modules/aws-miscellaneous/.gitignore
similarity index 100%
rename from aws/.gitignore
rename to aws-modules/aws-miscellaneous/.gitignore
diff --git a/aws-modules/aws-miscellaneous/README.md b/aws-modules/aws-miscellaneous/README.md
new file mode 100644
index 0000000000..5be8e6a3f2
--- /dev/null
+++ b/aws-modules/aws-miscellaneous/README.md
@@ -0,0 +1,10 @@
+## AWS Miscellaneous
+
+This module contains articles about various Amazon Web Services (AWS) such as EC2, DynamoDB, SQS, RDS
+
+### Relevant articles
+
+- [Managing EC2 Instances in Java](https://www.baeldung.com/ec2-java)
+- [Integration Testing with a Local DynamoDB Instance](https://www.baeldung.com/dynamodb-local-integration-tests)
+- [Managing Amazon SQS Queues in Java](https://www.baeldung.com/aws-queues-java)
+- [Guide to AWS Aurora RDS with Java](https://www.baeldung.com/aws-aurora-rds-java)
diff --git a/aws/pom.xml b/aws-modules/aws-miscellaneous/pom.xml
similarity index 88%
rename from aws/pom.xml
rename to aws-modules/aws-miscellaneous/pom.xml
index a57dd6690e..f05764f10a 100644
--- a/aws/pom.xml
+++ b/aws-modules/aws-miscellaneous/pom.xml
@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- aws
+ aws-miscellaneous
0.1.0-SNAPSHOT
- aws
+ aws-miscellaneous
jar
com.baeldung
- parent-modules
+ aws-modules
1.0.0-SNAPSHOT
@@ -58,17 +58,6 @@
${dynamodblocal.version}
test
-
-
- org.lucee
- jets3t
- ${jets3t-version}
-
-
- org.lucee
- commons-codec
- ${commons-codec-version}
-
diff --git a/aws/src/main/java/com/baeldung/dynamodb/entity/ProductInfo.java b/aws-modules/aws-miscellaneous/src/main/java/com/baeldung/dynamodb/entity/ProductInfo.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/dynamodb/entity/ProductInfo.java
rename to aws-modules/aws-miscellaneous/src/main/java/com/baeldung/dynamodb/entity/ProductInfo.java
diff --git a/aws/src/main/java/com/baeldung/dynamodb/repository/AbstractRepository.java b/aws-modules/aws-miscellaneous/src/main/java/com/baeldung/dynamodb/repository/AbstractRepository.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/dynamodb/repository/AbstractRepository.java
rename to aws-modules/aws-miscellaneous/src/main/java/com/baeldung/dynamodb/repository/AbstractRepository.java
diff --git a/aws/src/main/java/com/baeldung/dynamodb/repository/ProductInfoRepository.java b/aws-modules/aws-miscellaneous/src/main/java/com/baeldung/dynamodb/repository/ProductInfoRepository.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/dynamodb/repository/ProductInfoRepository.java
rename to aws-modules/aws-miscellaneous/src/main/java/com/baeldung/dynamodb/repository/ProductInfoRepository.java
diff --git a/aws/src/main/java/com/baeldung/ec2/EC2Application.java b/aws-modules/aws-miscellaneous/src/main/java/com/baeldung/ec2/EC2Application.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/ec2/EC2Application.java
rename to aws-modules/aws-miscellaneous/src/main/java/com/baeldung/ec2/EC2Application.java
diff --git a/aws/src/main/java/com/baeldung/rds/AWSRDSService.java b/aws-modules/aws-miscellaneous/src/main/java/com/baeldung/rds/AWSRDSService.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/rds/AWSRDSService.java
rename to aws-modules/aws-miscellaneous/src/main/java/com/baeldung/rds/AWSRDSService.java
diff --git a/aws/src/main/java/com/baeldung/sqs/SQSApplication.java b/aws-modules/aws-miscellaneous/src/main/java/com/baeldung/sqs/SQSApplication.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/sqs/SQSApplication.java
rename to aws-modules/aws-miscellaneous/src/main/java/com/baeldung/sqs/SQSApplication.java
diff --git a/aws/src/main/resources/db.properties b/aws-modules/aws-miscellaneous/src/main/resources/db.properties
similarity index 100%
rename from aws/src/main/resources/db.properties
rename to aws-modules/aws-miscellaneous/src/main/resources/db.properties
diff --git a/aws/src/main/resources/logback.xml b/aws-modules/aws-miscellaneous/src/main/resources/logback.xml
similarity index 100%
rename from aws/src/main/resources/logback.xml
rename to aws-modules/aws-miscellaneous/src/main/resources/logback.xml
diff --git a/aws/src/test/java/com/baeldung/dynamodb/ProductInfoRepositoryIntegrationTest.java b/aws-modules/aws-miscellaneous/src/test/java/com/baeldung/dynamodb/ProductInfoRepositoryIntegrationTest.java
similarity index 100%
rename from aws/src/test/java/com/baeldung/dynamodb/ProductInfoRepositoryIntegrationTest.java
rename to aws-modules/aws-miscellaneous/src/test/java/com/baeldung/dynamodb/ProductInfoRepositoryIntegrationTest.java
diff --git a/aws/src/test/java/com/baeldung/dynamodb/rule/LocalDbCreationRule.java b/aws-modules/aws-miscellaneous/src/test/java/com/baeldung/dynamodb/rule/LocalDbCreationRule.java
similarity index 100%
rename from aws/src/test/java/com/baeldung/dynamodb/rule/LocalDbCreationRule.java
rename to aws-modules/aws-miscellaneous/src/test/java/com/baeldung/dynamodb/rule/LocalDbCreationRule.java
diff --git a/aws/src/test/resources/test.properties b/aws-modules/aws-miscellaneous/src/test/resources/test.properties
similarity index 100%
rename from aws/src/test/resources/test.properties
rename to aws-modules/aws-miscellaneous/src/test/resources/test.properties
diff --git a/aws-reactive/README.md b/aws-modules/aws-reactive/README.md
similarity index 58%
rename from aws-reactive/README.md
rename to aws-modules/aws-reactive/README.md
index 1abf987b52..9164bd0ea6 100644
--- a/aws-reactive/README.md
+++ b/aws-modules/aws-reactive/README.md
@@ -1,3 +1,7 @@
+## AWS Reactive
+
+This module contains articles about reactive support with AWS
+
### Relevant Articles:
- [AWS S3 with Java – Reactive Support](https://www.baeldung.com/java-aws-s3-reactive)
diff --git a/aws-reactive/images/rective-upload.png b/aws-modules/aws-reactive/images/rective-upload.png
similarity index 100%
rename from aws-reactive/images/rective-upload.png
rename to aws-modules/aws-reactive/images/rective-upload.png
diff --git a/aws-reactive/images/rective-upload.txt b/aws-modules/aws-reactive/images/rective-upload.txt
similarity index 100%
rename from aws-reactive/images/rective-upload.txt
rename to aws-modules/aws-reactive/images/rective-upload.txt
diff --git a/aws-reactive/images/thread-per-client.png b/aws-modules/aws-reactive/images/thread-per-client.png
similarity index 100%
rename from aws-reactive/images/thread-per-client.png
rename to aws-modules/aws-reactive/images/thread-per-client.png
diff --git a/aws-reactive/images/thread-per-client.txt b/aws-modules/aws-reactive/images/thread-per-client.txt
similarity index 100%
rename from aws-reactive/images/thread-per-client.txt
rename to aws-modules/aws-reactive/images/thread-per-client.txt
diff --git a/aws-reactive/pom.xml b/aws-modules/aws-reactive/pom.xml
similarity index 98%
rename from aws-reactive/pom.xml
rename to aws-modules/aws-reactive/pom.xml
index 923e1361ab..7a9cefb9d1 100644
--- a/aws-reactive/pom.xml
+++ b/aws-modules/aws-reactive/pom.xml
@@ -10,7 +10,7 @@
com.baeldung
- parent-modules
+ aws-modules
1.0.0-SNAPSHOT
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadFailedException.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadFailedException.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadFailedException.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadFailedException.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/DownloadResource.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/ReactiveS3Application.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/ReactiveS3Application.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/ReactiveS3Application.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/ReactiveS3Application.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfigurarionProperties.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfigurarionProperties.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfigurarionProperties.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfigurarionProperties.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfiguration.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfiguration.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfiguration.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/S3ClientConfiguration.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadFailedException.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadFailedException.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadFailedException.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadFailedException.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResource.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResource.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResource.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResource.java
diff --git a/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResult.java b/aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResult.java
similarity index 100%
rename from aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResult.java
rename to aws-modules/aws-reactive/src/main/java/com/baeldung/aws/reactive/s3/UploadResult.java
diff --git a/aws-reactive/src/main/resources/application-minio.yml b/aws-modules/aws-reactive/src/main/resources/application-minio.yml
similarity index 100%
rename from aws-reactive/src/main/resources/application-minio.yml
rename to aws-modules/aws-reactive/src/main/resources/application-minio.yml
diff --git a/aws-reactive/src/main/resources/application.yml b/aws-modules/aws-reactive/src/main/resources/application.yml
similarity index 100%
rename from aws-reactive/src/main/resources/application.yml
rename to aws-modules/aws-reactive/src/main/resources/application.yml
diff --git a/aws-reactive/src/test/java/com/baeldung/aws/reactive/s3/ReactiveS3ApplicationLiveTest.java b/aws-modules/aws-reactive/src/test/java/com/baeldung/aws/reactive/s3/ReactiveS3ApplicationLiveTest.java
similarity index 100%
rename from aws-reactive/src/test/java/com/baeldung/aws/reactive/s3/ReactiveS3ApplicationLiveTest.java
rename to aws-modules/aws-reactive/src/test/java/com/baeldung/aws/reactive/s3/ReactiveS3ApplicationLiveTest.java
diff --git a/aws-reactive/src/test/resources/testimage1.png b/aws-modules/aws-reactive/src/test/resources/testimage1.png
similarity index 100%
rename from aws-reactive/src/test/resources/testimage1.png
rename to aws-modules/aws-reactive/src/test/resources/testimage1.png
diff --git a/aws-reactive/src/test/resources/testimage2.png b/aws-modules/aws-reactive/src/test/resources/testimage2.png
similarity index 100%
rename from aws-reactive/src/test/resources/testimage2.png
rename to aws-modules/aws-reactive/src/test/resources/testimage2.png
diff --git a/aws-modules/aws-s3/.gitignore b/aws-modules/aws-s3/.gitignore
new file mode 100644
index 0000000000..bf11a4cc38
--- /dev/null
+++ b/aws-modules/aws-s3/.gitignore
@@ -0,0 +1,2 @@
+/target/
+.idea/
\ No newline at end of file
diff --git a/aws-modules/aws-s3/README.md b/aws-modules/aws-s3/README.md
new file mode 100644
index 0000000000..efebf7d933
--- /dev/null
+++ b/aws-modules/aws-s3/README.md
@@ -0,0 +1,9 @@
+## AWS S3
+
+This module contains articles about Simple Storage Service (S3) on AWS
+
+### Relevant articles
+
+- [AWS S3 with Java](https://www.baeldung.com/aws-s3-java)
+- [Multipart Uploads in Amazon S3 with Java](https://www.baeldung.com/aws-s3-multipart-upload)
+- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
\ No newline at end of file
diff --git a/aws-modules/aws-s3/pom.xml b/aws-modules/aws-s3/pom.xml
new file mode 100644
index 0000000000..65ad6f27f8
--- /dev/null
+++ b/aws-modules/aws-s3/pom.xml
@@ -0,0 +1,70 @@
+
+
+ 4.0.0
+ aws-s3
+ 0.1.0-SNAPSHOT
+ aws-s3
+ jar
+
+
+ com.baeldung
+ aws-modules
+ 1.0.0-SNAPSHOT
+
+
+
+
+ com.amazonaws
+ aws-java-sdk
+ ${aws-java-sdk.version}
+
+
+
+ commons-io
+ commons-io
+ ${commons-io.version}
+
+
+
+ org.lucee
+ jets3t
+ ${jets3t-version}
+
+
+ org.lucee
+ commons-codec
+ ${commons-codec-version}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ ${maven-shade-plugin.version}
+
+ false
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
+ 1.11.290
+ 1.10.L001
+ 0.9.4.0006L
+ 3.0.0
+
+
+
\ No newline at end of file
diff --git a/aws/src/main/java/com/baeldung/s3/AWSS3Service.java b/aws-modules/aws-s3/src/main/java/com/baeldung/s3/AWSS3Service.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/s3/AWSS3Service.java
rename to aws-modules/aws-s3/src/main/java/com/baeldung/s3/AWSS3Service.java
diff --git a/aws/src/main/java/com/baeldung/s3/MultipartUpload.java b/aws-modules/aws-s3/src/main/java/com/baeldung/s3/MultipartUpload.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/s3/MultipartUpload.java
rename to aws-modules/aws-s3/src/main/java/com/baeldung/s3/MultipartUpload.java
diff --git a/aws/src/main/java/com/baeldung/s3/S3Application.java b/aws-modules/aws-s3/src/main/java/com/baeldung/s3/S3Application.java
similarity index 100%
rename from aws/src/main/java/com/baeldung/s3/S3Application.java
rename to aws-modules/aws-s3/src/main/java/com/baeldung/s3/S3Application.java
diff --git a/aws-modules/aws-s3/src/main/resources/logback.xml b/aws-modules/aws-s3/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/aws-modules/aws-s3/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aws/src/test/java/com/baeldung/jets3t/JetS3tLiveTest.java b/aws-modules/aws-s3/src/test/java/com/baeldung/jets3t/JetS3tLiveTest.java
similarity index 100%
rename from aws/src/test/java/com/baeldung/jets3t/JetS3tLiveTest.java
rename to aws-modules/aws-s3/src/test/java/com/baeldung/jets3t/JetS3tLiveTest.java
diff --git a/aws/src/test/java/com/baeldung/s3/AWSS3ServiceIntegrationTest.java b/aws-modules/aws-s3/src/test/java/com/baeldung/s3/AWSS3ServiceIntegrationTest.java
similarity index 100%
rename from aws/src/test/java/com/baeldung/s3/AWSS3ServiceIntegrationTest.java
rename to aws-modules/aws-s3/src/test/java/com/baeldung/s3/AWSS3ServiceIntegrationTest.java
diff --git a/aws/src/test/java/com/baeldung/s3/MultipartUploadLiveTest.java b/aws-modules/aws-s3/src/test/java/com/baeldung/s3/MultipartUploadLiveTest.java
similarity index 100%
rename from aws/src/test/java/com/baeldung/s3/MultipartUploadLiveTest.java
rename to aws-modules/aws-s3/src/test/java/com/baeldung/s3/MultipartUploadLiveTest.java
diff --git a/aws-modules/pom.xml b/aws-modules/pom.xml
new file mode 100644
index 0000000000..4bdffa789a
--- /dev/null
+++ b/aws-modules/pom.xml
@@ -0,0 +1,24 @@
+
+
+ 4.0.0
+ aws-modules
+ aws-modules
+ pom
+
+
+ com.baeldung
+ parent-modules
+ 1.0.0-SNAPSHOT
+
+
+
+ aws-app-sync
+ aws-lambda
+ aws-miscellaneous
+ aws-reactive
+ aws-s3
+
+
+
\ No newline at end of file
diff --git a/aws/README.md b/aws/README.md
deleted file mode 100644
index 9006c2d190..0000000000
--- a/aws/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## AWS
-
-This module contains articles about Amazon Web Services (AWS)
-
-### Relevant articles
-
-- [AWS Lambda Using DynamoDB With Java](https://www.baeldung.com/aws-lambda-dynamodb-java)
-- [AWS S3 with Java](https://www.baeldung.com/aws-s3-java)
-- [A Basic AWS Lambda Example With Java](https://www.baeldung.com/java-aws-lambda)
-- [Managing EC2 Instances in Java](https://www.baeldung.com/ec2-java)
-- [Multipart Uploads in Amazon S3 with Java](https://www.baeldung.com/aws-s3-multipart-upload)
-- [Integration Testing with a Local DynamoDB Instance](https://www.baeldung.com/dynamodb-local-integration-tests)
-- [Using the JetS3t Java Client With Amazon S3](https://www.baeldung.com/jets3t-amazon-s3)
-- [Managing Amazon SQS Queues in Java](https://www.baeldung.com/aws-queues-java)
-- [Guide to AWS Aurora RDS with Java](https://www.baeldung.com/aws-aurora-rds-java)
diff --git a/aws/native-libs/libsqlite4java-linux-amd64-1.0.392.so b/aws/native-libs/libsqlite4java-linux-amd64-1.0.392.so
deleted file mode 100644
index 884615789b..0000000000
Binary files a/aws/native-libs/libsqlite4java-linux-amd64-1.0.392.so and /dev/null differ
diff --git a/aws/native-libs/libsqlite4java-linux-i386-1.0.392.so b/aws/native-libs/libsqlite4java-linux-i386-1.0.392.so
deleted file mode 100644
index 15e7469e38..0000000000
Binary files a/aws/native-libs/libsqlite4java-linux-i386-1.0.392.so and /dev/null differ
diff --git a/aws/native-libs/sqlite4java-win32-x64-1.0.392.dll b/aws/native-libs/sqlite4java-win32-x64-1.0.392.dll
deleted file mode 100644
index 70d258f29b..0000000000
Binary files a/aws/native-libs/sqlite4java-win32-x64-1.0.392.dll and /dev/null differ
diff --git a/aws/native-libs/sqlite4java-win32-x86-1.0.392.dll b/aws/native-libs/sqlite4java-win32-x86-1.0.392.dll
deleted file mode 100644
index c988e5a697..0000000000
Binary files a/aws/native-libs/sqlite4java-win32-x86-1.0.392.dll and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 21589f5525..e47d3aa4dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -366,11 +366,8 @@
atomix
- aws
- aws-app-sync
- aws-lambda
- aws-reactive
-
+ aws-modules
+
axon
azure
@@ -850,11 +847,8 @@
atomix
- aws
- aws-app-sync
- aws-lambda
- aws-reactive
-
+ aws-modules
+
axon
azure