diff --git a/aws/src/main/java/com/baeldung/LambdaMethodHandler.java b/aws/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
similarity index 89%
rename from aws/src/main/java/com/baeldung/LambdaMethodHandler.java
rename to aws/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
index 6cce694912..dc21476290 100644
--- a/aws/src/main/java/com/baeldung/LambdaMethodHandler.java
+++ b/aws/src/main/java/com/baeldung/lambda/LambdaMethodHandler.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.lambda;
 
 import com.amazonaws.services.lambda.runtime.Context;
 
diff --git a/aws/src/main/java/com/baeldung/LambdaRequestHandler.java b/aws/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
similarity index 92%
rename from aws/src/main/java/com/baeldung/LambdaRequestHandler.java
rename to aws/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
index 37f114db25..85385555d2 100644
--- a/aws/src/main/java/com/baeldung/LambdaRequestHandler.java
+++ b/aws/src/main/java/com/baeldung/lambda/LambdaRequestHandler.java
@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.lambda;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
diff --git a/aws/src/main/java/com/baeldung/LambdaRequestStreamHandler.java b/aws/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
similarity index 95%
rename from aws/src/main/java/com/baeldung/LambdaRequestStreamHandler.java
rename to aws/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
index 96d11d2257..6e8a33c42d 100644
--- a/aws/src/main/java/com/baeldung/LambdaRequestStreamHandler.java
+++ b/aws/src/main/java/com/baeldung/lambda/LambdaRequestStreamHandler.java
@@ -1,14 +1,13 @@
-package com.baeldung;
+package com.baeldung.lambda;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.commons.io.IOUtils;
-
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-
 public class LambdaRequestStreamHandler implements RequestStreamHandler {
 
     public void handleRequest(InputStream inputStream, OutputStream outputStream, Context context) throws IOException {