diff --git a/create_dbs.py b/create_dbs.py
index b09248e..49325b6 100644
--- a/create_dbs.py
+++ b/create_dbs.py
@@ -6,7 +6,7 @@ import builtins
 import sqlite3
 from sqlite3 import Error
 
-from libs.sql import *
+from libs.aws.sql import *
 
 
 
diff --git a/libs/aws_lambda.py b/libs/aws/aws_lambda.py
similarity index 100%
rename from libs/aws_lambda.py
rename to libs/aws/aws_lambda.py
diff --git a/libs/brute.py b/libs/aws/brute.py
similarity index 99%
rename from libs/brute.py
rename to libs/aws/brute.py
index 04074c9..fa12771 100644
--- a/libs/brute.py
+++ b/libs/aws/brute.py
@@ -16,7 +16,7 @@ import pprint
 import sys
 
 
-from libs.sql import *
+from libs.aws.sql import *
 
 pp = pprint.PrettyPrinter(indent=5, width=80)
 
diff --git a/libs/ce.py b/libs/aws/ce.py
similarity index 100%
rename from libs/ce.py
rename to libs/aws/ce.py
diff --git a/libs/cloudfront.py b/libs/aws/cloudfront.py
similarity index 100%
rename from libs/cloudfront.py
rename to libs/aws/cloudfront.py
diff --git a/libs/cloudtrail.py b/libs/aws/cloudtrail.py
similarity index 100%
rename from libs/cloudtrail.py
rename to libs/aws/cloudtrail.py
diff --git a/libs/cloudwatch.py b/libs/aws/cloudwatch.py
similarity index 100%
rename from libs/cloudwatch.py
rename to libs/aws/cloudwatch.py
diff --git a/libs/config.py b/libs/aws/config.py
similarity index 100%
rename from libs/config.py
rename to libs/aws/config.py
diff --git a/libs/datapipeline.py b/libs/aws/datapipeline.py
similarity index 100%
rename from libs/datapipeline.py
rename to libs/aws/datapipeline.py
diff --git a/libs/dynamodb.py b/libs/aws/dynamodb.py
similarity index 100%
rename from libs/dynamodb.py
rename to libs/aws/dynamodb.py
diff --git a/libs/dynamodbstreams.py b/libs/aws/dynamodbstreams.py
similarity index 100%
rename from libs/dynamodbstreams.py
rename to libs/aws/dynamodbstreams.py
diff --git a/libs/ec2.py b/libs/aws/ec2.py
similarity index 99%
rename from libs/ec2.py
rename to libs/aws/ec2.py
index 1c355d8..40a57fa 100644
--- a/libs/ec2.py
+++ b/libs/aws/ec2.py
@@ -10,7 +10,7 @@ import pprint
 import sys
 import time
 
-from libs.sql import *
+from libs.aws.sql import *
 
 pp = pprint.PrettyPrinter(indent=5, width=80)
 
diff --git a/libs/ecr.py b/libs/aws/ecr.py
similarity index 100%
rename from libs/ecr.py
rename to libs/aws/ecr.py
diff --git a/libs/elasticbeanstalk.py b/libs/aws/elasticbeanstalk.py
similarity index 100%
rename from libs/elasticbeanstalk.py
rename to libs/aws/elasticbeanstalk.py
diff --git a/libs/emr.py b/libs/aws/emr.py
similarity index 100%
rename from libs/emr.py
rename to libs/aws/emr.py
diff --git a/libs/firehose.py b/libs/aws/firehose.py
similarity index 100%
rename from libs/firehose.py
rename to libs/aws/firehose.py
diff --git a/libs/iam.py b/libs/aws/iam.py
similarity index 100%
rename from libs/iam.py
rename to libs/aws/iam.py
diff --git a/libs/lightsail.py b/libs/aws/lightsail.py
similarity index 100%
rename from libs/lightsail.py
rename to libs/aws/lightsail.py
diff --git a/libs/opsworks.py b/libs/aws/opsworks.py
similarity index 100%
rename from libs/opsworks.py
rename to libs/aws/opsworks.py
diff --git a/libs/pricing.py b/libs/aws/pricing.py
similarity index 100%
rename from libs/pricing.py
rename to libs/aws/pricing.py
diff --git a/libs/rds.py b/libs/aws/rds.py
similarity index 100%
rename from libs/rds.py
rename to libs/aws/rds.py
diff --git a/libs/route53.py b/libs/aws/route53.py
similarity index 100%
rename from libs/route53.py
rename to libs/aws/route53.py
diff --git a/libs/s3.py b/libs/aws/s3.py
similarity index 100%
rename from libs/s3.py
rename to libs/aws/s3.py
diff --git a/libs/ses.py b/libs/aws/ses.py
similarity index 100%
rename from libs/ses.py
rename to libs/aws/ses.py
diff --git a/libs/sns.py b/libs/aws/sns.py
similarity index 100%
rename from libs/sns.py
rename to libs/aws/sns.py
diff --git a/libs/sql.py b/libs/aws/sql.py
similarity index 100%
rename from libs/sql.py
rename to libs/aws/sql.py
diff --git a/libs/sqs.py b/libs/aws/sqs.py
similarity index 100%
rename from libs/sqs.py
rename to libs/aws/sqs.py
diff --git a/libs/sts.py b/libs/aws/sts.py
similarity index 100%
rename from libs/sts.py
rename to libs/aws/sts.py
diff --git a/libs/translate.py b/libs/aws/translate.py
similarity index 100%
rename from libs/translate.py
rename to libs/aws/translate.py
diff --git a/modules/aws/aws_lambda.py b/modules/aws/aws_lambda.py
index 913e205..5d7ff5f 100644
--- a/modules/aws/aws_lambda.py
+++ b/modules/aws/aws_lambda.py
@@ -1,7 +1,7 @@
 '''
 This file is used to list lambda functions and event mappings
 '''
-from libs.aws_lambda import *
+from libs.aws.aws_lambda import *
 
 
 def module_lambda_list_functions():
diff --git a/modules/aws/ce.py b/modules/aws/ce.py
index 3d0c318..2133552 100644
--- a/modules/aws/ce.py
+++ b/modules/aws/ce.py
@@ -4,7 +4,7 @@ usually have to be root or be specifically assigned the
 permission to get anything from this
 '''
 
-from libs.ce import *
+from libs.aws.ce import *
 
 
 def module_costexplorer_get_cost_and_usage():
diff --git a/modules/aws/cloudfront.py b/modules/aws/cloudfront.py
index e4ed6c6..060a0d7 100644
--- a/modules/aws/cloudfront.py
+++ b/modules/aws/cloudfront.py
@@ -2,7 +2,7 @@
 This file is used to perform some EMR actions
 '''
 
-from libs.cloudfront import *
+from libs.aws.cloudfront import *
 
 
 def module_cloudfront_list_distributions():
diff --git a/modules/aws/cloudtrail.py b/modules/aws/cloudtrail.py
index ce80466..844d654 100644
--- a/modules/aws/cloudtrail.py
+++ b/modules/aws/cloudtrail.py
@@ -1,7 +1,7 @@
 '''
 This file is used to perform cloudtrail actions
 '''
-from libs.cloudtrail import *
+from libs.aws.cloudtrail import *
 
 
 def module_cloudtrail_describe_trails():
diff --git a/modules/aws/cloudwatch.py b/modules/aws/cloudwatch.py
index b3d6072..9d94fec 100644
--- a/modules/aws/cloudwatch.py
+++ b/modules/aws/cloudwatch.py
@@ -2,7 +2,7 @@
 example calling cloudwatch functions
 decribe alarms, describe alarm history, list metrics
 '''
-from libs.cloudwatch import *
+from libs.aws.cloudwatch import *
 
 
 def module_cloudwatch_describe_alarms():
diff --git a/modules/aws/config.py b/modules/aws/config.py
index babc125..a8e83b4 100644
--- a/modules/aws/config.py
+++ b/modules/aws/config.py
@@ -2,7 +2,7 @@
 Module for interacting with the config service
 '''
 
-from libs.config import *
+from libs.aws.config import *
 
 
 def module_config_list_all_rules():
diff --git a/modules/aws/datapipeline.py b/modules/aws/datapipeline.py
index e2f75cd..191c0b9 100644
--- a/modules/aws/datapipeline.py
+++ b/modules/aws/datapipeline.py
@@ -2,7 +2,7 @@
 datapipeline modules
 '''
 
-from libs.datapipeline import *
+from libs.aws.datapipeline import *
 
 
 def module_datapipeline_list_pipelines():
diff --git a/modules/aws/db.py b/modules/aws/db.py
index ec4f040..e3f6d33 100644
--- a/modules/aws/db.py
+++ b/modules/aws/db.py
@@ -6,7 +6,7 @@ import boto3
 import sqlite3
 from sqlite3 import Error
 
-from libs.sql import *
+from libs.aws.sql import *
 
 session = boto3.Session()
 credentials = session.get_credentials()
diff --git a/modules/aws/dynamodb.py b/modules/aws/dynamodb.py
index 08ac82e..126d5f8 100644
--- a/modules/aws/dynamodb.py
+++ b/modules/aws/dynamodb.py
@@ -1,7 +1,7 @@
 '''
 dynamoDB examples
 '''
-from libs.dynamodb import *
+from libs.aws.dynamodb import *
 
 
 def module_dynamodb_list_tables():
diff --git a/modules/aws/dynamodbstreams.py b/modules/aws/dynamodbstreams.py
index bc6da65..7c2a040 100644
--- a/modules/aws/dynamodbstreams.py
+++ b/modules/aws/dynamodbstreams.py
@@ -1,7 +1,7 @@
 '''
 dynamoDBstreams examples
 '''
-from libs.dynamodbstreams import *
+from libs.aws.dynamodbstreams import *
 
 
 def module_dynamodbstreams_list_streams():
diff --git a/modules/aws/ec2.py b/modules/aws/ec2.py
index f0f6fe1..3681591 100644
--- a/modules/aws/ec2.py
+++ b/modules/aws/ec2.py
@@ -2,7 +2,7 @@
 This file is used to perform various EC2 operations
 '''
 
-from libs.ec2 import *
+from libs.aws.ec2 import *
 
 
 def module_ec2_describe_instances_basic():
diff --git a/modules/aws/ecr.py b/modules/aws/ecr.py
index 3e977ab..2c933cf 100644
--- a/modules/aws/ecr.py
+++ b/modules/aws/ecr.py
@@ -2,7 +2,7 @@
 ECR functions
 '''
 
-from libs.ecr import *
+from libs.aws.ecr import *
 
 
 def module_ecr_describe_repos():
diff --git a/modules/aws/elasticbeanstalk.py b/modules/aws/elasticbeanstalk.py
index a16777c..e59dc6f 100644
--- a/modules/aws/elasticbeanstalk.py
+++ b/modules/aws/elasticbeanstalk.py
@@ -1,7 +1,7 @@
 '''
 This file is used to perform some ElasticBeanstalk actions
 '''
-from libs.elasticbeanstalk import *
+from libs.aws.elasticbeanstalk import *
 
 
 '''
diff --git a/modules/aws/emr.py b/modules/aws/emr.py
index a1b4e64..15b24e7 100644
--- a/modules/aws/emr.py
+++ b/modules/aws/emr.py
@@ -2,7 +2,7 @@
 This file is used to perform some EMR actions
 '''
 
-from libs.emr import *
+from libs.aws.emr import *
 
 
 def module_emr_list_clusters():
diff --git a/modules/aws/firehose.py b/modules/aws/firehose.py
index 75aed36..eabefe0 100644
--- a/modules/aws/firehose.py
+++ b/modules/aws/firehose.py
@@ -1,7 +1,7 @@
 '''
 Firehose functions
 '''
-from libs.firehose import *
+from libs.aws.firehose import *
 
 
 def module_firehose_list_delivery_streams():
diff --git a/modules/aws/iam.py b/modules/aws/iam.py
index b191b20..8e2068a 100644
--- a/modules/aws/iam.py
+++ b/modules/aws/iam.py
@@ -2,7 +2,7 @@
 IAM recon functions
 '''
 
-from libs.iam import *
+from libs.aws.iam import *
 
 
 def module_iam_list_groups():
diff --git a/modules/aws/iam_pwn.py b/modules/aws/iam_pwn.py
index a7ebdfd..cd0cc94 100644
--- a/modules/aws/iam_pwn.py
+++ b/modules/aws/iam_pwn.py
@@ -2,8 +2,8 @@
 Functions specifically related to IAM account takeover if you have root or IAM access gather user info,
 manipulate access keys or passwords, make backdoor account
 '''
-from libs.iam import *
-from libs.sts import *
+from libs.aws.iam import *
+from libs.aws.sts import *
 
 
 def module_iam_get_account_summary():
diff --git a/modules/aws/lightsail.py b/modules/aws/lightsail.py
index a3dd3f4..67acb0b 100644
--- a/modules/aws/lightsail.py
+++ b/modules/aws/lightsail.py
@@ -2,7 +2,7 @@
 Module for interacting with the lightsail
 '''
 
-from libs.lightsail import *
+from libs.aws.lightsail import *
 
 
 def module_lightsail_get_instances():
diff --git a/modules/aws/opsworks.py b/modules/aws/opsworks.py
index 323e703..949bca1 100644
--- a/modules/aws/opsworks.py
+++ b/modules/aws/opsworks.py
@@ -1,4 +1,4 @@
-from libs.opsworks import *
+from libs.aws.opsworks import *
 
 
 def module_opsworks_describe_stacks():
diff --git a/modules/aws/pricing.py b/modules/aws/pricing.py
index 776267e..3039e6a 100644
--- a/modules/aws/pricing.py
+++ b/modules/aws/pricing.py
@@ -4,7 +4,7 @@ usually have to be root or be specifically assigned the
 permission to get anything from this
 '''
 
-from libs.pricing import *
+from libs.aws.pricing import *
 
 
 def module_pricing_describe_services():
diff --git a/modules/aws/rds.py b/modules/aws/rds.py
index 1f42a38..0ceb233 100644
--- a/modules/aws/rds.py
+++ b/modules/aws/rds.py
@@ -2,7 +2,7 @@
 RDS module
 '''
 
-from libs.rds import *
+from libs.aws.rds import *
 
 
 def module_rds_describe_db_instances():
diff --git a/modules/aws/recon.py b/modules/aws/recon.py
index 57b69bc..aac095f 100644
--- a/modules/aws/recon.py
+++ b/modules/aws/recon.py
@@ -3,14 +3,14 @@ This module handles the core recon functionality by asking all the services
 that have functions that done have arguments if we can access them :-)
 '''
 
-from libs.brute import *
-from libs.s3 import *
+from libs.aws.brute import *
+from libs.aws.s3 import *
 
 # for recon_defaults
-from libs.elasticbeanstalk import *
-from libs.opsworks import *
-from libs.route53 import *
-from libs.sts import *
+from libs.aws.elasticbeanstalk import *
+from libs.aws.opsworks import *
+from libs.aws.route53 import *
+from libs.aws.sts import *
 
 # maps to available services in boto 1.7.4
 
diff --git a/modules/aws/route53.py b/modules/aws/route53.py
index 1cf62a7..1f03964 100644
--- a/modules/aws/route53.py
+++ b/modules/aws/route53.py
@@ -2,13 +2,13 @@
 route53 functions
 '''
 
-from libs.route53 import *
+from libs.aws.route53 import *
 
 
 def module_route53_list_geolocations():
     '''
     Route53 list geolocations
-    
+
     python3 weirdAAL.py -m route53_list_geolocations -t demo
     '''
     list_geolocations()
diff --git a/modules/aws/s3.py b/modules/aws/s3.py
index 763762b..416cae4 100644
--- a/modules/aws/s3.py
+++ b/modules/aws/s3.py
@@ -2,7 +2,7 @@
 S3 module
 '''
 
-from libs.s3 import *
+from libs.aws.s3 import *
 
 
 def module_s3_get_bucket_policy(*args):
diff --git a/modules/aws/ses.py b/modules/aws/ses.py
index e213799..a20b13e 100644
--- a/modules/aws/ses.py
+++ b/modules/aws/ses.py
@@ -2,7 +2,7 @@
 SES module
 '''
 
-from libs.ses import *
+from libs.aws.ses import *
 
 
 def module_ses_list_identities():
diff --git a/modules/aws/sns.py b/modules/aws/sns.py
index b529bab..a7ef82c 100644
--- a/modules/aws/sns.py
+++ b/modules/aws/sns.py
@@ -2,7 +2,7 @@
 SNS module
 '''
 
-from libs.sns import *
+from libs.aws.sns import *
 
 def module_sns_list_topics():
     '''
diff --git a/modules/aws/sqs.py b/modules/aws/sqs.py
index a9d9f61..f060087 100644
--- a/modules/aws/sqs.py
+++ b/modules/aws/sqs.py
@@ -2,7 +2,7 @@
 SQS Modules
 '''
 
-from libs.sqs import *
+from libs.aws.sqs import *
 
 
 def module_sqs_list_queues():
diff --git a/modules/aws/sts.py b/modules/aws/sts.py
index c476fc5..0162efb 100644
--- a/modules/aws/sts.py
+++ b/modules/aws/sts.py
@@ -2,7 +2,7 @@
 This file is used to perform some EMR actions
 '''
 
-from libs.sts import *
+from libs.aws.sts import *
 
 
 def module_sts_get_accountid():
diff --git a/modules/aws/translate.py b/modules/aws/translate.py
index 252cb92..5701138 100644
--- a/modules/aws/translate.py
+++ b/modules/aws/translate.py
@@ -2,7 +2,7 @@
 Translate module
 '''
 
-from libs.translate import *
+from libs.aws.translate import *
 
 
 def module_translate_translate_text(*text):