diff --git a/modules/aws_lambda.py b/modules/aws/aws_lambda.py
similarity index 100%
rename from modules/aws_lambda.py
rename to modules/aws/aws_lambda.py
diff --git a/modules/ce.py b/modules/aws/ce.py
similarity index 100%
rename from modules/ce.py
rename to modules/aws/ce.py
diff --git a/modules/cloudfront.py b/modules/aws/cloudfront.py
similarity index 100%
rename from modules/cloudfront.py
rename to modules/aws/cloudfront.py
diff --git a/modules/cloudtrail.py b/modules/aws/cloudtrail.py
similarity index 100%
rename from modules/cloudtrail.py
rename to modules/aws/cloudtrail.py
diff --git a/modules/cloudwatch.py b/modules/aws/cloudwatch.py
similarity index 100%
rename from modules/cloudwatch.py
rename to modules/aws/cloudwatch.py
diff --git a/modules/config.py b/modules/aws/config.py
similarity index 100%
rename from modules/config.py
rename to modules/aws/config.py
diff --git a/modules/datapipeline.py b/modules/aws/datapipeline.py
similarity index 100%
rename from modules/datapipeline.py
rename to modules/aws/datapipeline.py
diff --git a/modules/db.py b/modules/aws/db.py
similarity index 100%
rename from modules/db.py
rename to modules/aws/db.py
diff --git a/modules/dynamodb.py b/modules/aws/dynamodb.py
similarity index 100%
rename from modules/dynamodb.py
rename to modules/aws/dynamodb.py
diff --git a/modules/dynamodbstreams.py b/modules/aws/dynamodbstreams.py
similarity index 100%
rename from modules/dynamodbstreams.py
rename to modules/aws/dynamodbstreams.py
diff --git a/modules/ec2.py b/modules/aws/ec2.py
similarity index 100%
rename from modules/ec2.py
rename to modules/aws/ec2.py
diff --git a/modules/ecr.py b/modules/aws/ecr.py
similarity index 100%
rename from modules/ecr.py
rename to modules/aws/ecr.py
diff --git a/modules/elasticbeanstalk.py b/modules/aws/elasticbeanstalk.py
similarity index 100%
rename from modules/elasticbeanstalk.py
rename to modules/aws/elasticbeanstalk.py
diff --git a/modules/emr.py b/modules/aws/emr.py
similarity index 100%
rename from modules/emr.py
rename to modules/aws/emr.py
diff --git a/modules/firehose.py b/modules/aws/firehose.py
similarity index 100%
rename from modules/firehose.py
rename to modules/aws/firehose.py
diff --git a/modules/iam.py b/modules/aws/iam.py
similarity index 100%
rename from modules/iam.py
rename to modules/aws/iam.py
diff --git a/modules/iam_pwn.py b/modules/aws/iam_pwn.py
similarity index 100%
rename from modules/iam_pwn.py
rename to modules/aws/iam_pwn.py
diff --git a/modules/lightsail.py b/modules/aws/lightsail.py
similarity index 100%
rename from modules/lightsail.py
rename to modules/aws/lightsail.py
diff --git a/modules/opsworks.py b/modules/aws/opsworks.py
similarity index 100%
rename from modules/opsworks.py
rename to modules/aws/opsworks.py
diff --git a/modules/pricing.py b/modules/aws/pricing.py
similarity index 100%
rename from modules/pricing.py
rename to modules/aws/pricing.py
diff --git a/modules/rds.py b/modules/aws/rds.py
similarity index 100%
rename from modules/rds.py
rename to modules/aws/rds.py
diff --git a/modules/recon.py b/modules/aws/recon.py
similarity index 100%
rename from modules/recon.py
rename to modules/aws/recon.py
diff --git a/modules/route53.py b/modules/aws/route53.py
similarity index 100%
rename from modules/route53.py
rename to modules/aws/route53.py
diff --git a/modules/s3.py b/modules/aws/s3.py
similarity index 100%
rename from modules/s3.py
rename to modules/aws/s3.py
diff --git a/modules/ses.py b/modules/aws/ses.py
similarity index 100%
rename from modules/ses.py
rename to modules/aws/ses.py
diff --git a/modules/sns.py b/modules/aws/sns.py
similarity index 100%
rename from modules/sns.py
rename to modules/aws/sns.py
diff --git a/modules/sqs.py b/modules/aws/sqs.py
similarity index 100%
rename from modules/sqs.py
rename to modules/aws/sqs.py
diff --git a/modules/sts.py b/modules/aws/sts.py
similarity index 100%
rename from modules/sts.py
rename to modules/aws/sts.py
diff --git a/modules/translate.py b/modules/aws/translate.py
similarity index 100%
rename from modules/translate.py
rename to modules/aws/translate.py
diff --git a/weirdAAL.py b/weirdAAL.py
index 9771525..f7c8be0 100755
--- a/weirdAAL.py
+++ b/weirdAAL.py
@@ -19,7 +19,7 @@ os.environ['AWS_SHARED_CREDENTIALS_FILE'] = '.env'
 # If you want to use a transparent + supports SSL proxy you can put it here
 # os.environ['HTTPS_PROXY'] = 'https://127.0.0.1:3128'
 
-sys.path.append("modules")
+sys.path.append("modules/aws/")
 for module in all_modules:
     exec("from %s import *" % module)