diff --git a/deployment/main.tf b/deployment/database/main.tf
similarity index 100%
rename from deployment/main.tf
rename to deployment/database/main.tf
diff --git a/deployment/output.tf b/deployment/database/output.tf
similarity index 100%
rename from deployment/output.tf
rename to deployment/database/output.tf
diff --git a/deployment/provider.tf b/deployment/database/provider.tf
similarity index 100%
rename from deployment/provider.tf
rename to deployment/database/provider.tf
diff --git a/deployment/variables.tf b/deployment/database/variables.tf
similarity index 100%
rename from deployment/variables.tf
rename to deployment/database/variables.tf
diff --git a/deployment/vpc.tf b/deployment/database/vpc.tf
similarity index 100%
rename from deployment/vpc.tf
rename to deployment/database/vpc.tf
diff --git a/deployment/extractor_and_loader/Dockerfile b/deployment/lambda/extractor_and_loader/Dockerfile
similarity index 100%
rename from deployment/extractor_and_loader/Dockerfile
rename to deployment/lambda/extractor_and_loader/Dockerfile
diff --git a/deployment/extractor_and_loader/app.py b/deployment/lambda/extractor_and_loader/app.py
similarity index 94%
rename from deployment/extractor_and_loader/app.py
rename to deployment/lambda/extractor_and_loader/app.py
index a8ece33..4a281ed 100644
--- a/deployment/extractor_and_loader/app.py
+++ b/deployment/lambda/extractor_and_loader/app.py
@@ -10,6 +10,7 @@ def handler(event, context):
         print("show me something.. anything...")
         s3_uri = event.get("file_location")
         if not s3_uri:
+            print("failed to get s3_uri")
             return {
                 "statusCode": 400,
                 "body": "Missing 'file_location' in event"
diff --git a/deployment/extractor_and_loader_lambda.tf b/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
similarity index 100%
rename from deployment/extractor_and_loader_lambda.tf
rename to deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
diff --git a/deployment/lambda_example/Dockerfile b/deployment/lambda/lambda_example/Dockerfile
similarity index 100%
rename from deployment/lambda_example/Dockerfile
rename to deployment/lambda/lambda_example/Dockerfile
diff --git a/deployment/lambda_example/app.py b/deployment/lambda/lambda_example/app.py
similarity index 100%
rename from deployment/lambda_example/app.py
rename to deployment/lambda/lambda_example/app.py
diff --git a/deployment/lambda_example_and_config.tf b/deployment/lambda/lambda_example/lambda_example_and_config.tf
similarity index 99%
rename from deployment/lambda_example_and_config.tf
rename to deployment/lambda/lambda_example/lambda_example_and_config.tf
index f0f88e5..b020e2d 100644
--- a/deployment/lambda_example_and_config.tf
+++ b/deployment/lambda/lambda_example/lambda_example_and_config.tf
@@ -73,7 +73,7 @@ resource "aws_lambda_function" "lambda_example" {
   function_name = "lambda-example"
   role          = aws_iam_role.lambda_exec_role.arn
   package_type  = "Image"
-  image_uri     = "${aws_ecr_repository.lambda_example.repository_url}:latest4"
+  image_uri     = "${aws_ecr_repository.lambda_example.repository_url}:latest"
   timeout       = 10
 }