diff --git a/libs/utils/common.py b/libs/utils/common.py
index 424f965..069c258 100644
--- a/libs/utils/common.py
+++ b/libs/utils/common.py
@@ -10,8 +10,7 @@ def list_all_files(directory):
       if ( not (dirpath == os.path.basename(directory)) and
       (os.path.isdir(dirpath))
       and not (os.path.basename(dirpath).startswith('__')) ):
-        if filenames:
+        for file in filenames:
             list_path_name = dirpath.split('/')
-            array.append(".".join(list_path_name))
-            #array.append(directory.split)
+            array.append(".".join(list_path_name) + "." + os.path.splitext(file)[0])
   return array
diff --git a/weirdAAL.py b/weirdAAL.py
index 27b827b..fd57f12 100755
--- a/weirdAAL.py
+++ b/weirdAAL.py
@@ -20,10 +20,9 @@ os.environ['AWS_SHARED_CREDENTIALS_FILE'] = '.env'
 # os.environ['HTTPS_PROXY'] = 'https://127.0.0.1:3128'
 
 sys.path.append("modules")
-#for module in all_modules:
-#    exec("from %s import *" % module)
+for module in all_modules:
+    exec("from %s import *" % module)
 
-from modules import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-m", "--module", help="list the module you would like to run", action="store", type=str, required=True)