diff --git a/modules/exploits/local_host/firefox_extension_bindshell/command.js b/modules/social_engineering/firefox_extension_bindshell/command.js
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/command.js
rename to modules/social_engineering/firefox_extension_bindshell/command.js
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/config.yaml b/modules/social_engineering/firefox_extension_bindshell/config.yaml
similarity index 93%
rename from modules/exploits/local_host/firefox_extension_bindshell/config.yaml
rename to modules/social_engineering/firefox_extension_bindshell/config.yaml
index 1d427dd3b..9eb6eb45a 100644
--- a/modules/exploits/local_host/firefox_extension_bindshell/config.yaml
+++ b/modules/social_engineering/firefox_extension_bindshell/config.yaml
@@ -7,7 +7,7 @@ beef:
     module:
         firefox_extension_bindshell:
             enable: true
-            category: ["Exploits", "Local Host"]
+            category: ["Social Engineering"]
             name: "Firefox Extension (Bindshell)"
             description: "Create on the fly a malicious Firefox extension that binds a shell to a specified port.<br/><br/>The extension is based on the original work from Michael Schierl and his Metasploit module, and joev's Firefox payloads for Metasploit."
             authors: ["antisnatchor", "bcoles"]
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/extension/HTML5_Enhancements.xpi b/modules/social_engineering/firefox_extension_bindshell/extension/HTML5_Enhancements.xpi
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/extension/HTML5_Enhancements.xpi
rename to modules/social_engineering/firefox_extension_bindshell/extension/HTML5_Enhancements.xpi
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/extension/bootstrap.js b/modules/social_engineering/firefox_extension_bindshell/extension/bootstrap.js
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/extension/bootstrap.js
rename to modules/social_engineering/firefox_extension_bindshell/extension/bootstrap.js
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/extension/build/readme.txt b/modules/social_engineering/firefox_extension_bindshell/extension/build/readme.txt
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/extension/build/readme.txt
rename to modules/social_engineering/firefox_extension_bindshell/extension/build/readme.txt
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/extension/chrome.manifest b/modules/social_engineering/firefox_extension_bindshell/extension/chrome.manifest
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/extension/chrome.manifest
rename to modules/social_engineering/firefox_extension_bindshell/extension/chrome.manifest
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/extension/install.rdf b/modules/social_engineering/firefox_extension_bindshell/extension/install.rdf
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/extension/install.rdf
rename to modules/social_engineering/firefox_extension_bindshell/extension/install.rdf
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/extension/overlay.xul b/modules/social_engineering/firefox_extension_bindshell/extension/overlay.xul
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_bindshell/extension/overlay.xul
rename to modules/social_engineering/firefox_extension_bindshell/extension/overlay.xul
diff --git a/modules/exploits/local_host/firefox_extension_bindshell/module.rb b/modules/social_engineering/firefox_extension_bindshell/module.rb
similarity index 93%
rename from modules/exploits/local_host/firefox_extension_bindshell/module.rb
rename to modules/social_engineering/firefox_extension_bindshell/module.rb
index 179d43901..3ba31175b 100644
--- a/modules/exploits/local_host/firefox_extension_bindshell/module.rb
+++ b/modules/social_engineering/firefox_extension_bindshell/module.rb
@@ -38,7 +38,7 @@ class Firefox_extension_bindshell < BeEF::Core::Command
        end
     end
 
-    mod_path = "#{$root_dir}/modules/exploits/local_host/firefox_extension_bindshell"
+    mod_path = "#{$root_dir}/modules/social_engineering/firefox_extension_bindshell"
     extension_path = mod_path + "/extension"
 
     # clean the build directory
@@ -65,7 +65,7 @@ class Firefox_extension_bindshell < BeEF::Core::Command
 
     # mount the extension in the BeEF web server, calling a specific nested class (needed because we need a specific content-type/disposition)
     bind_extension = Firefox_extension_bindshell::Bind_extension
-    bind_extension.set :extension_path, "#{$root_dir}/modules/exploits/local_host/firefox_extension_bindshell/extension/#{@xpi_name}.xpi"
+    bind_extension.set :extension_path, "#{$root_dir}/modules/social_engineering/firefox_extension_bindshell/extension/#{@xpi_name}.xpi"
     BeEF::Core::Server.instance.mount("/#{@xpi_name}.xpi", bind_extension.new)
     BeEF::Core::Server.instance.remap
   end
diff --git a/modules/exploits/local_host/firefox_extension_dropper/command.js b/modules/social_engineering/firefox_extension_dropper/command.js
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/command.js
rename to modules/social_engineering/firefox_extension_dropper/command.js
diff --git a/modules/exploits/local_host/firefox_extension_dropper/config.yaml b/modules/social_engineering/firefox_extension_dropper/config.yaml
similarity index 93%
rename from modules/exploits/local_host/firefox_extension_dropper/config.yaml
rename to modules/social_engineering/firefox_extension_dropper/config.yaml
index cefbb1211..79a802cb1 100644
--- a/modules/exploits/local_host/firefox_extension_dropper/config.yaml
+++ b/modules/social_engineering/firefox_extension_dropper/config.yaml
@@ -7,7 +7,7 @@ beef:
     module:
         firefox_extension_dropper:
             enable: true
-            category: ["Exploits", "Local Host"]
+            category: ["Social Engineering"]
             name: "Firefox Extension (Dropper)"
             description: "Create on the fly a malicious Firefox extension that embeds a dropper you can specify (add it to the 'dropper' directory). <br/><br/> The extension is based on the original work from Michael Schierl and his Metasploit module."
             authors: ["antisnatchor"]
diff --git a/modules/exploits/local_host/firefox_extension_dropper/dropper/readme.txt b/modules/social_engineering/firefox_extension_dropper/dropper/readme.txt
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/dropper/readme.txt
rename to modules/social_engineering/firefox_extension_dropper/dropper/readme.txt
diff --git a/modules/exploits/local_host/firefox_extension_dropper/extension/bootstrap.js b/modules/social_engineering/firefox_extension_dropper/extension/bootstrap.js
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/extension/bootstrap.js
rename to modules/social_engineering/firefox_extension_dropper/extension/bootstrap.js
diff --git a/modules/exploits/local_host/firefox_extension_dropper/extension/build/readme.txt b/modules/social_engineering/firefox_extension_dropper/extension/build/readme.txt
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/extension/build/readme.txt
rename to modules/social_engineering/firefox_extension_dropper/extension/build/readme.txt
diff --git a/modules/exploits/local_host/firefox_extension_dropper/extension/chrome.manifest b/modules/social_engineering/firefox_extension_dropper/extension/chrome.manifest
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/extension/chrome.manifest
rename to modules/social_engineering/firefox_extension_dropper/extension/chrome.manifest
diff --git a/modules/exploits/local_host/firefox_extension_dropper/extension/install.rdf b/modules/social_engineering/firefox_extension_dropper/extension/install.rdf
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/extension/install.rdf
rename to modules/social_engineering/firefox_extension_dropper/extension/install.rdf
diff --git a/modules/exploits/local_host/firefox_extension_dropper/extension/overlay.xul b/modules/social_engineering/firefox_extension_dropper/extension/overlay.xul
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_dropper/extension/overlay.xul
rename to modules/social_engineering/firefox_extension_dropper/extension/overlay.xul
diff --git a/modules/exploits/local_host/firefox_extension_dropper/module.rb b/modules/social_engineering/firefox_extension_dropper/module.rb
similarity index 94%
rename from modules/exploits/local_host/firefox_extension_dropper/module.rb
rename to modules/social_engineering/firefox_extension_dropper/module.rb
index 13a782f0a..4860d1dd2 100644
--- a/modules/exploits/local_host/firefox_extension_dropper/module.rb
+++ b/modules/social_engineering/firefox_extension_dropper/module.rb
@@ -35,7 +35,7 @@ class Firefox_extension_dropper < BeEF::Core::Command
        end
     end
 
-    mod_path = "#{$root_dir}/modules/exploits/local_host/firefox_extension_dropper"
+    mod_path = "#{$root_dir}/modules/social_engineering/firefox_extension_dropper"
     extension_path = mod_path + "/extension"
 
     # clean the build directory
@@ -75,7 +75,7 @@ class Firefox_extension_dropper < BeEF::Core::Command
 
     # mount the extension in the BeEF web server, calling a specific nested class (needed because we need a specifi content-type/disposition)
     bind_extension = Firefox_extension_dropper::Bind_extension
-    bind_extension.set :extension_path, "#{$root_dir}/modules/exploits/local_host/firefox_extension_dropper/extension/#{@xpi_name}.xpi"
+    bind_extension.set :extension_path, "#{$root_dir}/modules/social_engineering/firefox_extension_dropper/extension/#{@xpi_name}.xpi"
     BeEF::Core::Server.instance.mount("/#{@xpi_name}.xpi", bind_extension.new)
     BeEF::Core::Server.instance.remap
   end
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/command.js b/modules/social_engineering/firefox_extension_reverse_shell/command.js
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/command.js
rename to modules/social_engineering/firefox_extension_reverse_shell/command.js
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/config.yaml b/modules/social_engineering/firefox_extension_reverse_shell/config.yaml
similarity index 93%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/config.yaml
rename to modules/social_engineering/firefox_extension_reverse_shell/config.yaml
index b48157dd1..20f50972f 100644
--- a/modules/exploits/local_host/firefox_extension_reverse_shell/config.yaml
+++ b/modules/social_engineering/firefox_extension_reverse_shell/config.yaml
@@ -7,7 +7,7 @@ beef:
     module:
         firefox_extension_reverse_shell:
             enable: true
-            category: ["Exploits", "Local Host"]
+            category: ["Social Engineering"]
             name: "Firefox Extension (Reverse Shell)"
             description: "Create on the fly a malicious Firefox extension that makes a reverse shell connection to a specified host:port.<br/><br/>The extension is based on the original work from Michael Schierl and his Metasploit module, and joev's Firefox payloads for Metasploit."
             authors: ["antisnatchor", "bcoles"]
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/extension/HTML5_Enhancements.xpi b/modules/social_engineering/firefox_extension_reverse_shell/extension/HTML5_Enhancements.xpi
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/extension/HTML5_Enhancements.xpi
rename to modules/social_engineering/firefox_extension_reverse_shell/extension/HTML5_Enhancements.xpi
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/extension/bootstrap.js b/modules/social_engineering/firefox_extension_reverse_shell/extension/bootstrap.js
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/extension/bootstrap.js
rename to modules/social_engineering/firefox_extension_reverse_shell/extension/bootstrap.js
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/extension/build/readme.txt b/modules/social_engineering/firefox_extension_reverse_shell/extension/build/readme.txt
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/extension/build/readme.txt
rename to modules/social_engineering/firefox_extension_reverse_shell/extension/build/readme.txt
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/extension/chrome.manifest b/modules/social_engineering/firefox_extension_reverse_shell/extension/chrome.manifest
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/extension/chrome.manifest
rename to modules/social_engineering/firefox_extension_reverse_shell/extension/chrome.manifest
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/extension/install.rdf b/modules/social_engineering/firefox_extension_reverse_shell/extension/install.rdf
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/extension/install.rdf
rename to modules/social_engineering/firefox_extension_reverse_shell/extension/install.rdf
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/extension/overlay.xul b/modules/social_engineering/firefox_extension_reverse_shell/extension/overlay.xul
similarity index 100%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/extension/overlay.xul
rename to modules/social_engineering/firefox_extension_reverse_shell/extension/overlay.xul
diff --git a/modules/exploits/local_host/firefox_extension_reverse_shell/module.rb b/modules/social_engineering/firefox_extension_reverse_shell/module.rb
similarity index 93%
rename from modules/exploits/local_host/firefox_extension_reverse_shell/module.rb
rename to modules/social_engineering/firefox_extension_reverse_shell/module.rb
index b66fc9e36..34978bf74 100644
--- a/modules/exploits/local_host/firefox_extension_reverse_shell/module.rb
+++ b/modules/social_engineering/firefox_extension_reverse_shell/module.rb
@@ -41,7 +41,7 @@ class Firefox_extension_reverse_shell < BeEF::Core::Command
        end
     end
 
-    mod_path = "#{$root_dir}/modules/exploits/local_host/firefox_extension_reverse_shell"
+    mod_path = "#{$root_dir}/modules/social_engineering/firefox_extension_reverse_shell"
     extension_path = mod_path + "/extension"
 
     # clean the build directory
@@ -68,7 +68,7 @@ class Firefox_extension_reverse_shell < BeEF::Core::Command
 
     # mount the extension in the BeEF web server, calling a specific nested class (needed because we need a specific content-type/disposition)
     bind_extension = Firefox_extension_reverse_shell::Bind_extension
-    bind_extension.set :extension_path, "#{$root_dir}/modules/exploits/local_host/firefox_extension_reverse_shell/extension/#{@xpi_name}.xpi"
+    bind_extension.set :extension_path, "#{$root_dir}/modules/social_engineering/firefox_extension_reverse_shell/extension/#{@xpi_name}.xpi"
     BeEF::Core::Server.instance.mount("/#{@xpi_name}.xpi", bind_extension.new)
     BeEF::Core::Server.instance.remap
   end