diff --git a/libs/__init__.py b/libs/__init__.py
index 367e6ee..7ad8262 100644
--- a/libs/__init__.py
+++ b/libs/__init__.py
@@ -1,11 +1,11 @@
 import os
-list_of_files = os.listdir('.')
+from libs.utils.common import *
 
-arry = []
 
-for file in list_of_files:
-    filename_and_ext = os.path.splitext(file)
-    if filename_and_ext[1] == ".py":
-        arry.append(filename_and_ext[0])
+# Get the application's path (wherever weirdAAL.py is located will be the dirpath )
+dirpath = os.getcwd()
+# The actual location of this file on the filesystem is the "foldername"
+foldername = os.path.dirname(os.path.realpath(__file__))
 
-__all__ = arry
+all_files = list_all_files(foldername)
+__all__ = all_files
diff --git a/libs/utils/__init__.py b/libs/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/libs/utils/common.py b/libs/utils/common.py
new file mode 100644
index 0000000..4ac82b4
--- /dev/null
+++ b/libs/utils/common.py
@@ -0,0 +1,12 @@
+import os
+
+def list_all_files(directory):
+  list_of_files = os.listdir(directory)
+
+  array = []
+
+  for file in list_of_files:
+      filename_and_ext = os.path.splitext(file)
+      if filename_and_ext[1] == ".py":
+          array.append(filename_and_ext[0])
+  return array
diff --git a/modules/__init__.py b/modules/__init__.py
new file mode 100644
index 0000000..7ad8262
--- /dev/null
+++ b/modules/__init__.py
@@ -0,0 +1,11 @@
+import os
+from libs.utils.common import *
+
+
+# Get the application's path (wherever weirdAAL.py is located will be the dirpath )
+dirpath = os.getcwd()
+# The actual location of this file on the filesystem is the "foldername"
+foldername = os.path.dirname(os.path.realpath(__file__))
+
+all_files = list_all_files(foldername)
+__all__ = all_files
diff --git a/iam_pwn.py b/modules/iam_pwn.py
similarity index 77%
rename from iam_pwn.py
rename to modules/iam_pwn.py
index a9e24e1..be8217e 100644
--- a/iam_pwn.py
+++ b/modules/iam_pwn.py
@@ -5,9 +5,11 @@ from libs.iam import *
 from libs.sts import *
 from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 
-get_accountid(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
-check_root_account(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
-get_password_policy(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
+
+def step_cg_test():
+  get_accountid(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
+  check_root_account(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
+  get_password_policy(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
 #create_access_key(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,'pythons3')
 #delete_access_key(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY,'pythons3', 'AKIAIJV3RQMOYM7WQS2Q')
 #change_user_console_password(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, 'pythons3', 'PS#EDCasd123456!@')
diff --git a/weirdAAL.py b/weirdAAL.py
index bb5e6af..54b0b21 100755
--- a/weirdAAL.py
+++ b/weirdAAL.py
@@ -11,7 +11,7 @@ import argparse
 import os
 from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 from botocore.exceptions import ClientError
-#from modules import *
+from modules import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-s", "--step", help="list the step you would like to run",