diff --git a/DevOps/AWS/AWS_API_Gateway.md b/DevOps/AWS/API_Gateway.md
similarity index 100%
rename from DevOps/AWS/AWS_API_Gateway.md
rename to DevOps/AWS/API_Gateway.md
diff --git a/DevOps/AWS/AWS_CloudWatch.md b/DevOps/AWS/CloudWatch.md
similarity index 100%
rename from DevOps/AWS/AWS_CloudWatch.md
rename to DevOps/AWS/CloudWatch.md
diff --git a/DevOps/AWS/AWS_Database_options.md b/DevOps/AWS/Database_options_on_AWS.md
similarity index 100%
rename from DevOps/AWS/AWS_Database_options.md
rename to DevOps/AWS/Database_options_on_AWS.md
diff --git a/DevOps/AWS/AWS_Lambda/Accessing_secrets_from_a_Lambda.md b/DevOps/AWS/Lambda/Accessing_secrets_from_a_Lambda.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Accessing_secrets_from_a_Lambda.md
rename to DevOps/AWS/Lambda/Accessing_secrets_from_a_Lambda.md
diff --git a/DevOps/AWS/AWS_Lambda/Code_examples/Fetch_from_Secrets_Manager.md b/DevOps/AWS/Lambda/Code_examples/Fetch_from_Secrets_Manager.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Code_examples/Fetch_from_Secrets_Manager.md
rename to DevOps/AWS/Lambda/Code_examples/Fetch_from_Secrets_Manager.md
diff --git a/DevOps/AWS/AWS_Lambda/Code_examples/Handle_multiple_endpoints_single_lambda.md b/DevOps/AWS/Lambda/Code_examples/Handle_multiple_endpoints_single_lambda.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Code_examples/Handle_multiple_endpoints_single_lambda.md
rename to DevOps/AWS/Lambda/Code_examples/Handle_multiple_endpoints_single_lambda.md
diff --git a/DevOps/AWS/AWS_Lambda/Code_examples/Restructure_URLs.md b/DevOps/AWS/Lambda/Code_examples/Restructure_URLs.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Code_examples/Restructure_URLs.md
rename to DevOps/AWS/Lambda/Code_examples/Restructure_URLs.md
diff --git a/DevOps/AWS/AWS_Lambda/Lambda_directory_structure.md b/DevOps/AWS/Lambda/Lambda_directory_structure.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Lambda_directory_structure.md
rename to DevOps/AWS/Lambda/Lambda_directory_structure.md
diff --git a/DevOps/AWS/AWS_Lambda/Lambda_handler_function.md b/DevOps/AWS/Lambda/Lambda_handler_function.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Lambda_handler_function.md
rename to DevOps/AWS/Lambda/Lambda_handler_function.md
diff --git a/DevOps/AWS/AWS_Lambda/Lambda_programming_model.md b/DevOps/AWS/Lambda/Lambda_programming_model.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Lambda_programming_model.md
rename to DevOps/AWS/Lambda/Lambda_programming_model.md
diff --git a/DevOps/AWS/AWS_Lambda/Lambda_triggers.md b/DevOps/AWS/Lambda/Lambda_triggers.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Lambda_triggers.md
rename to DevOps/AWS/Lambda/Lambda_triggers.md
diff --git a/DevOps/AWS/AWS_Lambda/Practical_walkthrough_Lambda_creation_within_AWS.md b/DevOps/AWS/Lambda/Practical_walkthrough_Lambda_creation_within_AWS.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Practical_walkthrough_Lambda_creation_within_AWS.md
rename to DevOps/AWS/Lambda/Practical_walkthrough_Lambda_creation_within_AWS.md
diff --git a/DevOps/AWS/AWS_Lambda/Secrets_or_env_vars.md b/DevOps/AWS/Lambda/Secrets_or_env_vars.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Secrets_or_env_vars.md
rename to DevOps/AWS/Lambda/Secrets_or_env_vars.md
diff --git a/DevOps/AWS/AWS_Lambda/Using_env_vars.md b/DevOps/AWS/Lambda/Using_env_vars.md
similarity index 100%
rename from DevOps/AWS/AWS_Lambda/Using_env_vars.md
rename to DevOps/AWS/Lambda/Using_env_vars.md
diff --git a/DevOps/AWS/AWS_Messaging_services.md b/DevOps/AWS/Messaging_services.md
similarity index 100%
rename from DevOps/AWS/AWS_Messaging_services.md
rename to DevOps/AWS/Messaging_services.md
diff --git a/DevOps/AWS/AWS_S3.md b/DevOps/AWS/S3.md
similarity index 100%
rename from DevOps/AWS/AWS_S3.md
rename to DevOps/AWS/S3.md
diff --git a/DevOps/AWS/SAM/AWS_SAM.md b/DevOps/AWS/SAM/SAM.md
similarity index 100%
rename from DevOps/AWS/SAM/AWS_SAM.md
rename to DevOps/AWS/SAM/SAM.md
diff --git a/DevOps/AWS/AWS_User_management_and_roles.md b/DevOps/AWS/User_management_on_AWS.md
similarity index 100%
rename from DevOps/AWS/AWS_User_management_and_roles.md
rename to DevOps/AWS/User_management_on_AWS.md