diff --git a/modules/misc/alert_dialog/command.js b/modules/browser/alert_dialog/command.js
similarity index 100%
rename from modules/misc/alert_dialog/command.js
rename to modules/browser/alert_dialog/command.js
diff --git a/modules/misc/alert_dialog/config.yaml b/modules/browser/alert_dialog/config.yaml
similarity index 88%
rename from modules/misc/alert_dialog/config.yaml
rename to modules/browser/alert_dialog/config.yaml
index 09884946c..1a4d222eb 100644
--- a/modules/misc/alert_dialog/config.yaml
+++ b/modules/browser/alert_dialog/config.yaml
@@ -17,9 +17,9 @@ beef:
     module:
         alert_dialog:
             enable: true
-            category: "Misc"
-            name: "Alert Dialog"
+            category: "Browser"
+            name: "Create Alert Dialog"
             description: "Sends an alert dialog to the hooked browser."
-            authors: ["bm"]
+            authors: ["wade", "bm"]
             target:
                 user_notify: ["All"]
diff --git a/modules/misc/alert_dialog/module.rb b/modules/browser/alert_dialog/module.rb
similarity index 100%
rename from modules/misc/alert_dialog/module.rb
rename to modules/browser/alert_dialog/module.rb
diff --git a/modules/recon/browser_fingerprinting/command.js b/modules/browser/browser_fingerprinting/command.js
similarity index 100%
rename from modules/recon/browser_fingerprinting/command.js
rename to modules/browser/browser_fingerprinting/command.js
diff --git a/modules/recon/browser_fingerprinting/config.yaml b/modules/browser/browser_fingerprinting/config.yaml
similarity index 93%
rename from modules/recon/browser_fingerprinting/config.yaml
rename to modules/browser/browser_fingerprinting/config.yaml
index 382a3dadd..5754f8ee6 100644
--- a/modules/recon/browser_fingerprinting/config.yaml
+++ b/modules/browser/browser_fingerprinting/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         browser_fingerprinting:
             enable: true
-            category: "Recon"
-            name: "Browser Fingerprinting"
+            category: "Browser"
+            name: "Fingerprint Browser"
             description: "This module attempts to fingerprint the browser type and version using URI handlers unique to Internet Explorer and Mozilla Firefox. This method does not rely on JavaScript objects which may have been modified by the user or browser compatibility mode."
             authors: ["bcoles"]
             target:
diff --git a/modules/recon/browser_fingerprinting/module.rb b/modules/browser/browser_fingerprinting/module.rb
similarity index 100%
rename from modules/recon/browser_fingerprinting/module.rb
rename to modules/browser/browser_fingerprinting/module.rb
diff --git a/modules/recon/collect_links/command.js b/modules/browser/collect_links/command.js
similarity index 100%
rename from modules/recon/collect_links/command.js
rename to modules/browser/collect_links/command.js
diff --git a/modules/recon/collect_links/config.yaml b/modules/browser/collect_links/config.yaml
similarity index 92%
rename from modules/recon/collect_links/config.yaml
rename to modules/browser/collect_links/config.yaml
index bda9f70c1..54e758394 100644
--- a/modules/recon/collect_links/config.yaml
+++ b/modules/browser/collect_links/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         collect_links:
             enable: true
-            category: "Recon"
-            name: "Collect Links"
+            category: "Browser"
+            name: "Get Page HREFs"
             description: "This module will retrieve HREFs from the target page."
             authors: ["vo"]
             target:
diff --git a/modules/recon/collect_links/module.rb b/modules/browser/collect_links/module.rb
similarity index 100%
rename from modules/recon/collect_links/module.rb
rename to modules/browser/collect_links/module.rb
diff --git a/modules/misc/deface_web_page/command.js b/modules/browser/deface_web_page/command.js
similarity index 100%
rename from modules/misc/deface_web_page/command.js
rename to modules/browser/deface_web_page/command.js
diff --git a/modules/misc/deface_web_page/config.yaml b/modules/browser/deface_web_page/config.yaml
similarity index 92%
rename from modules/misc/deface_web_page/config.yaml
rename to modules/browser/deface_web_page/config.yaml
index 8426764d2..171fbef52 100644
--- a/modules/misc/deface_web_page/config.yaml
+++ b/modules/browser/deface_web_page/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         deface_web_page:
             enable: true
-            category: "Misc"
-            name: "Deface Web Page"
+            category: "Browser"
+            name: "Replace Content (Deface)"
             description: "Overwrite the body of the page the hooked browser is on with the 'Deface Content' string."
             authors: ["antisnatchor"]
             target:
diff --git a/modules/misc/deface_web_page/module.rb b/modules/browser/deface_web_page/module.rb
similarity index 100%
rename from modules/misc/deface_web_page/module.rb
rename to modules/browser/deface_web_page/module.rb
diff --git a/modules/browser/detect_visited_urls/config.yaml b/modules/browser/detect_visited_urls/config.yaml
index 2b5b39eb0..80b67a310 100644
--- a/modules/browser/detect_visited_urls/config.yaml
+++ b/modules/browser/detect_visited_urls/config.yaml
@@ -18,7 +18,7 @@ beef:
         detect_visited_urls:
             enable: true
             category: "Browser"
-            name: "Detect Visited URLs"
+            name: "Get Visited URLs"
             description: "This module will detect whether or not the hooked browser has visited the specified URL(s)"
             authors: ["passbe"]
             target:
diff --git a/modules/misc/extract_local_storage/command.js b/modules/browser/extract_local_storage/command.js
similarity index 100%
rename from modules/misc/extract_local_storage/command.js
rename to modules/browser/extract_local_storage/command.js
diff --git a/modules/misc/extract_local_storage/config.yaml b/modules/browser/extract_local_storage/config.yaml
similarity index 92%
rename from modules/misc/extract_local_storage/config.yaml
rename to modules/browser/extract_local_storage/config.yaml
index 0444bebd8..3f93f935d 100644
--- a/modules/misc/extract_local_storage/config.yaml
+++ b/modules/browser/extract_local_storage/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         extract_local_storage:
             enable: true
-            category: "Misc"
-            name: "Extract Local Storage"
+            category: "Browser"
+            name: "Get Local Storage"
             description: "Extracts data from the HTML5 localStorage object."
             authors: ["bcoles"]
             target:
diff --git a/modules/misc/extract_local_storage/module.rb b/modules/browser/extract_local_storage/module.rb
similarity index 100%
rename from modules/misc/extract_local_storage/module.rb
rename to modules/browser/extract_local_storage/module.rb
diff --git a/modules/browser/link_rewrite/config.yaml b/modules/browser/link_rewrite/config.yaml
index 9afbb1f8b..7af1ca0ed 100644
--- a/modules/browser/link_rewrite/config.yaml
+++ b/modules/browser/link_rewrite/config.yaml
@@ -18,7 +18,7 @@ beef:
         link_rewrite:
             enable: true
             category: "Browser"
-            name: "Link Rewriter"
+            name: "Replace HREFs"
             description: "This module will rewrite all the href attributes of all matched links.<br /><br />The jQuery selector field can be used to limit the selection of links. eg: a[href=\"http://www.bindshell.net\"]. For more information please see: http://api.jquery.com/category/selectors/"
             authors: ["passbe"]
             target:
diff --git a/modules/misc/prompt_dialog/command.js b/modules/browser/prompt_dialog/command.js
similarity index 100%
rename from modules/misc/prompt_dialog/command.js
rename to modules/browser/prompt_dialog/command.js
diff --git a/modules/misc/prompt_dialog/config.yaml b/modules/browser/prompt_dialog/config.yaml
similarity index 88%
rename from modules/misc/prompt_dialog/config.yaml
rename to modules/browser/prompt_dialog/config.yaml
index 9209d7ce5..882250b09 100644
--- a/modules/misc/prompt_dialog/config.yaml
+++ b/modules/browser/prompt_dialog/config.yaml
@@ -17,9 +17,9 @@ beef:
     module:
         prompt_dialog:
             enable: true
-            category: "Misc"
-            name: "Prompt Dialog"
+            category: "Browser"
+            name: "Create Prompt Dialog"
             description: "Sends a prompt dialog to the hooked browser."
-            authors: ["bm"]
+            authors: ["wade", "bm"]
             target:
                 user_notify: ['ALL']
diff --git a/modules/misc/prompt_dialog/module.rb b/modules/browser/prompt_dialog/module.rb
similarity index 100%
rename from modules/misc/prompt_dialog/module.rb
rename to modules/browser/prompt_dialog/module.rb
diff --git a/modules/misc/replace_video/command.js b/modules/browser/replace_video/command.js
similarity index 100%
rename from modules/misc/replace_video/command.js
rename to modules/browser/replace_video/command.js
diff --git a/modules/misc/replace_video/config.yaml b/modules/browser/replace_video/config.yaml
similarity index 93%
rename from modules/misc/replace_video/config.yaml
rename to modules/browser/replace_video/config.yaml
index b7d0b1bc1..0bd57c56a 100644
--- a/modules/misc/replace_video/config.yaml
+++ b/modules/browser/replace_video/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         replace_video:
             enable: true
-            category: "Misc"
-            name: "Replace Video"
+            category: "Browser"
+            name: "Replace Videos"
             description: "Replaces an object selected with jQuery (all embed tags by default) with an embed tag containing the youtube video of your choice (rickroll by default)."
             authors: ["Yori Kvitchko", "antisnatchor"]
             target:
diff --git a/modules/misc/replace_video/module.rb b/modules/browser/replace_video/module.rb
similarity index 100%
rename from modules/misc/replace_video/module.rb
rename to modules/browser/replace_video/module.rb
diff --git a/modules/misc/rickroll/command.js b/modules/browser/rickroll/command.js
similarity index 100%
rename from modules/misc/rickroll/command.js
rename to modules/browser/rickroll/command.js
diff --git a/modules/misc/rickroll/config.yaml b/modules/browser/rickroll/config.yaml
similarity index 91%
rename from modules/misc/rickroll/config.yaml
rename to modules/browser/rickroll/config.yaml
index f3991ee45..4ca194d4e 100644
--- a/modules/misc/rickroll/config.yaml
+++ b/modules/browser/rickroll/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         rickroll:
             enable: true
-            category: "Misc"
-            name: "Rickroll"
+            category: "Browser"
+            name: "Redirect Browser (Rickroll)"
             description: "Overwrite the body of the page the victim is on with a full screen Rickroll."
             authors: ["Yori Kvitchko"]
             target:
diff --git a/modules/misc/rickroll/module.rb b/modules/browser/rickroll/module.rb
similarity index 100%
rename from modules/misc/rickroll/module.rb
rename to modules/browser/rickroll/module.rb
diff --git a/modules/browser/site_redirect/config.yaml b/modules/browser/site_redirect/config.yaml
index 97d54a44c..9af2f1327 100644
--- a/modules/browser/site_redirect/config.yaml
+++ b/modules/browser/site_redirect/config.yaml
@@ -18,7 +18,7 @@ beef:
         site_redirect:
             enable: true
             category: "Browser"
-            name: "Site Redirect"
+            name: "Redirect Browser"
             description: "This module will redirect the selected hooked browser to the address specified in the 'Redirect URL' input."
             authors: ["wade", "vo"]
             target:
diff --git a/modules/browser/site_redirect_iframe/config.yaml b/modules/browser/site_redirect_iframe/config.yaml
index 61edea423..9ca1d8a63 100644
--- a/modules/browser/site_redirect_iframe/config.yaml
+++ b/modules/browser/site_redirect_iframe/config.yaml
@@ -18,7 +18,7 @@ beef:
         site_redirect_iframe:
             enable: true
             category: "Browser"
-            name: "Site Redirect (iframe)"
+            name: "Redirect Browser (iFrame)"
             description: "This module creates a 100% x 100% overlaying iframe and keeps the browers hooked to the framework. The content of the iframe, page title and the time delay are specified in the parameters below.<br><br>The content of the URL bar will not be changed in the hooked browser."
             authors: ["ethicalhack3r", "Yori Kvitchko"]
             target:
diff --git a/modules/network/coldfusion_dir_traversal_exploit/command.js b/modules/exploits/coldfusion_dir_traversal_exploit/command.js
similarity index 100%
rename from modules/network/coldfusion_dir_traversal_exploit/command.js
rename to modules/exploits/coldfusion_dir_traversal_exploit/command.js
diff --git a/modules/network/coldfusion_dir_traversal_exploit/config.yaml b/modules/exploits/coldfusion_dir_traversal_exploit/config.yaml
similarity index 96%
rename from modules/network/coldfusion_dir_traversal_exploit/config.yaml
rename to modules/exploits/coldfusion_dir_traversal_exploit/config.yaml
index 35ca6e7a8..29063e25b 100644
--- a/modules/network/coldfusion_dir_traversal_exploit/config.yaml
+++ b/modules/exploits/coldfusion_dir_traversal_exploit/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         coldfusion_dir_traversal_exploit:
             enable: true
-            category: "Network"
+            category: "Exploits"
             name: "ColdFusion Directory Traversal Exploit"
             description: "ColdFusion 9.0, 8.0.1, 9.0 and 9.0.1 are vulnerable to directory traversal that leads to arbitrary file retrieval from the ColdFusion server (CVE-2010-2861)"
             authors: ["antisnatchor"]
diff --git a/modules/network/coldfusion_dir_traversal_exploit/module.rb b/modules/exploits/coldfusion_dir_traversal_exploit/module.rb
similarity index 100%
rename from modules/network/coldfusion_dir_traversal_exploit/module.rb
rename to modules/exploits/coldfusion_dir_traversal_exploit/module.rb
diff --git a/modules/network/jboss_jmx_upload_exploit/command.js b/modules/exploits/jboss_jmx_upload_exploit/command.js
similarity index 100%
rename from modules/network/jboss_jmx_upload_exploit/command.js
rename to modules/exploits/jboss_jmx_upload_exploit/command.js
diff --git a/modules/network/jboss_jmx_upload_exploit/config.yaml b/modules/exploits/jboss_jmx_upload_exploit/config.yaml
similarity index 97%
rename from modules/network/jboss_jmx_upload_exploit/config.yaml
rename to modules/exploits/jboss_jmx_upload_exploit/config.yaml
index 9d58b5f5b..677fa8b47 100644
--- a/modules/network/jboss_jmx_upload_exploit/config.yaml
+++ b/modules/exploits/jboss_jmx_upload_exploit/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         jboss_jmx_upload_exploit:
             enable: true
-            category: "Network"
+            category: "Exploits"
             name: "Jboss 6.0.0M1 JMX Deploy Exploit"
             description: "Deploy a JSP reverse or bind shell (Metasploit one) using the JMX exposed deploymentFileRepository MBean of JBoss. The first request made is a HEAD one to bypass auth and deploy the malicious JSP, the second request is a GET one that triggers the reverse connection to the specified MSF listener.<br>Remember to run the MSF multi/hanlder listener with java/jsp_shell_reverse_tcp as payload, in case you are using the reverse payload."
             authors: ["antisnatchor", "l33tb0y"]
diff --git a/modules/network/jboss_jmx_upload_exploit/module.rb b/modules/exploits/jboss_jmx_upload_exploit/module.rb
similarity index 100%
rename from modules/network/jboss_jmx_upload_exploit/module.rb
rename to modules/exploits/jboss_jmx_upload_exploit/module.rb
diff --git a/modules/network/vtiger_crm_upload_exploit/command.js b/modules/exploits/vtiger_crm_upload_exploit/command.js
similarity index 100%
rename from modules/network/vtiger_crm_upload_exploit/command.js
rename to modules/exploits/vtiger_crm_upload_exploit/command.js
diff --git a/modules/network/vtiger_crm_upload_exploit/config.yaml b/modules/exploits/vtiger_crm_upload_exploit/config.yaml
similarity index 97%
rename from modules/network/vtiger_crm_upload_exploit/config.yaml
rename to modules/exploits/vtiger_crm_upload_exploit/config.yaml
index 51922d1e8..afefdd067 100644
--- a/modules/network/vtiger_crm_upload_exploit/config.yaml
+++ b/modules/exploits/vtiger_crm_upload_exploit/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         vtiger_crm_upload_exploit:
             enable: true
-            category: "Network"
+            category: "Exploits"
             name: "VTiger CRM Upload Exploit"
             description: "This module demonstrates chained exploitation. It will upload and execute a reverse bindshell. The vulnerability is exploited in the CRM <a href=\"http://www.vtiger.com/\">vtiger 5.0.4</a><br />The default PHP requires a listener, so don't forget to start one, for example: nc -l 8888."
             authors: ["wade", "bm", "pipes", "xntrik", "yorikv"]
diff --git a/modules/network/vtiger_crm_upload_exploit/module.rb b/modules/exploits/vtiger_crm_upload_exploit/module.rb
similarity index 100%
rename from modules/network/vtiger_crm_upload_exploit/module.rb
rename to modules/exploits/vtiger_crm_upload_exploit/module.rb
diff --git a/modules/misc/clipboard_theft/command.js b/modules/host/clipboard_theft/command.js
similarity index 100%
rename from modules/misc/clipboard_theft/command.js
rename to modules/host/clipboard_theft/command.js
diff --git a/modules/misc/clipboard_theft/config.yaml b/modules/host/clipboard_theft/config.yaml
similarity index 95%
rename from modules/misc/clipboard_theft/config.yaml
rename to modules/host/clipboard_theft/config.yaml
index a389be5c9..b34c44556 100644
--- a/modules/misc/clipboard_theft/config.yaml
+++ b/modules/host/clipboard_theft/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         clipboard_theft:
             enable: true
-            category: "Misc"
-            name: "Clipboard Theft"
+            category: "Host"
+            name: "Get Clipboard"
             description: "Retrieves the clipboard contents. This module will work automatically with Internet Explorer 6.x however Internet Explorer 7.x will prompt the user and ask for permission to access the clipboard."
             authors: ["bcoles"]
             target:
diff --git a/modules/misc/clipboard_theft/module.rb b/modules/host/clipboard_theft/module.rb
similarity index 100%
rename from modules/misc/clipboard_theft/module.rb
rename to modules/host/clipboard_theft/module.rb
diff --git a/modules/network/detect_local_settings/Beeffeine.class b/modules/host/detect_local_settings/Beeffeine.class
similarity index 100%
rename from modules/network/detect_local_settings/Beeffeine.class
rename to modules/host/detect_local_settings/Beeffeine.class
diff --git a/modules/network/detect_local_settings/Beeffeine.java b/modules/host/detect_local_settings/Beeffeine.java
similarity index 100%
rename from modules/network/detect_local_settings/Beeffeine.java
rename to modules/host/detect_local_settings/Beeffeine.java
diff --git a/modules/network/detect_local_settings/command.js b/modules/host/detect_local_settings/command.js
similarity index 100%
rename from modules/network/detect_local_settings/command.js
rename to modules/host/detect_local_settings/command.js
diff --git a/modules/network/detect_local_settings/config.yaml b/modules/host/detect_local_settings/config.yaml
similarity index 92%
rename from modules/network/detect_local_settings/config.yaml
rename to modules/host/detect_local_settings/config.yaml
index da1f55a43..41a80b1b8 100644
--- a/modules/network/detect_local_settings/config.yaml
+++ b/modules/host/detect_local_settings/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         detect_local_settings:
             enable: true
-            category: "Network"
-            name: "Detect Local Settings"
+            category: "Host"
+            name: "Get Network Settings"
             description: "Grab the local network settings (ie internal ip address)."
             authors: ["pdp", "wade", "bm", "xntrik"]
             target:
diff --git a/modules/network/detect_local_settings/module.rb b/modules/host/detect_local_settings/module.rb
similarity index 100%
rename from modules/network/detect_local_settings/module.rb
rename to modules/host/detect_local_settings/module.rb
diff --git a/modules/browser/hook_default/bounce_to_ie.pdf b/modules/host/hook_default/bounce_to_ie.pdf
similarity index 100%
rename from modules/browser/hook_default/bounce_to_ie.pdf
rename to modules/host/hook_default/bounce_to_ie.pdf
diff --git a/modules/browser/hook_default/command.js b/modules/host/hook_default/command.js
similarity index 100%
rename from modules/browser/hook_default/command.js
rename to modules/host/hook_default/command.js
diff --git a/modules/browser/hook_default/config.yaml b/modules/host/hook_default/config.yaml
similarity index 97%
rename from modules/browser/hook_default/config.yaml
rename to modules/host/hook_default/config.yaml
index 5c6f72f9b..6bb2bdc04 100644
--- a/modules/browser/hook_default/config.yaml
+++ b/modules/host/hook_default/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         hook_ie:
             enable: true
-            category: "Browser"
+            category: "Host"
             name: "Hook Default Browser"
             description: "This module will use a PDF to attempt to hook the default browser (assuming it isn't currently hooked). <br><br>Normally, this will be IE but it will also work when Chrome is set to the default. When executed, the hooked browser will load a PDF and use that to start the default browser. If successful another browser will appear in the browser tree."
             authors: ["saafan"]
diff --git a/modules/browser/hook_default/module.rb b/modules/host/hook_default/module.rb
similarity index 100%
rename from modules/browser/hook_default/module.rb
rename to modules/host/hook_default/module.rb
diff --git a/modules/host/insecure_url_skype/config.yaml b/modules/host/insecure_url_skype/config.yaml
index 9834f3971..e88a63b82 100644
--- a/modules/host/insecure_url_skype/config.yaml
+++ b/modules/host/insecure_url_skype/config.yaml
@@ -18,7 +18,7 @@ beef:
         insecure_url_skype:
             enable: true
             category: "Host"
-            name: "Skype Call"
+            name: "Make Skype Call (Skype)"
             description: "This module will force the browser to attempt a skype call. It will exploit the insecure handling of URL schemes<br><br>The protocol handler used will be: skype."
             authors: ["xntrik", "Nitesh Dhanjani"]
             target:
diff --git a/modules/host/iphone_tel/config.yaml b/modules/host/iphone_tel/config.yaml
index 0ee4f5596..d7d64c786 100644
--- a/modules/host/iphone_tel/config.yaml
+++ b/modules/host/iphone_tel/config.yaml
@@ -18,7 +18,7 @@ beef:
         iphone_tel:
             enable: true
             category: "Host"
-            name: "iPhone Telephone URL"
+            name: "Make Skype Call (Tel)"
             description: "This module will force the browser to attempt a skype call. It will exploit the insecure handling of URL schemes in iOS.<br><br>The protocol handler used will be: tel"
             authors: ["xntrik", "Nitesh Dhanjani"]
             target:
diff --git a/modules/host/physical_location/config.yaml b/modules/host/physical_location/config.yaml
index d37e7247f..32fec8a55 100644
--- a/modules/host/physical_location/config.yaml
+++ b/modules/host/physical_location/config.yaml
@@ -18,7 +18,7 @@ beef:
         physical_location:
             enable: true
             category: "Host"
-            name: "Physical Location"
+            name: "Get Geolocation"
             description: "This module will retrieve the physical location of the hooked browser using the geolocation API."
             authors: ["antisnatchor"]
             target:
diff --git a/modules/persistence/iframe_keylogger/command.js b/modules/misc/iframe_keylogger/command.js
similarity index 100%
rename from modules/persistence/iframe_keylogger/command.js
rename to modules/misc/iframe_keylogger/command.js
diff --git a/modules/persistence/iframe_keylogger/config.yaml b/modules/misc/iframe_keylogger/config.yaml
similarity index 96%
rename from modules/persistence/iframe_keylogger/config.yaml
rename to modules/misc/iframe_keylogger/config.yaml
index e92bb54a1..d00136bd2 100644
--- a/modules/persistence/iframe_keylogger/config.yaml
+++ b/modules/misc/iframe_keylogger/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         iframe_keylogger:
             enable: true
-            category: "Persistence"
+            category: "Misc"
             name: "iFrame Event Logger"
             description: "Creates a 100% by 100% iFrame overlay with event logging. The content of the overlay is set in the 'iFrame Src' option."
             authors: ["antisnatchor"]
diff --git a/modules/persistence/iframe_keylogger/module.rb b/modules/misc/iframe_keylogger/module.rb
similarity index 100%
rename from modules/persistence/iframe_keylogger/module.rb
rename to modules/misc/iframe_keylogger/module.rb
diff --git a/modules/recon/detect_soc_nets/command.js b/modules/network/detect_soc_nets/command.js
similarity index 100%
rename from modules/recon/detect_soc_nets/command.js
rename to modules/network/detect_soc_nets/command.js
diff --git a/modules/recon/detect_soc_nets/config.yaml b/modules/network/detect_soc_nets/config.yaml
similarity index 96%
rename from modules/recon/detect_soc_nets/config.yaml
rename to modules/network/detect_soc_nets/config.yaml
index d476a6e7d..f31b45c1b 100644
--- a/modules/recon/detect_soc_nets/config.yaml
+++ b/modules/network/detect_soc_nets/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         detect_soc_nets:
             enable: true
-            category: "Recon"
+            category: "Network"
             name: "Detect Social Networks"
             description: "This module will detect if the Hooked Browser is currently authenticated to GMail, Facebook and Twitter."
             authors: ["xntrik", "Mike Cardwell"]
diff --git a/modules/recon/detect_soc_nets/module.rb b/modules/network/detect_soc_nets/module.rb
similarity index 100%
rename from modules/recon/detect_soc_nets/module.rb
rename to modules/network/detect_soc_nets/module.rb
diff --git a/modules/recon/detect_tor/command.js b/modules/network/detect_tor/command.js
similarity index 100%
rename from modules/recon/detect_tor/command.js
rename to modules/network/detect_tor/command.js
diff --git a/modules/recon/detect_tor/config.yaml b/modules/network/detect_tor/config.yaml
similarity index 96%
rename from modules/recon/detect_tor/config.yaml
rename to modules/network/detect_tor/config.yaml
index 75504a49c..2ccd92735 100644
--- a/modules/recon/detect_tor/config.yaml
+++ b/modules/network/detect_tor/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         detect_tor:
             enable: true
-            category: "Recon"
+            category: "Network"
             name: "Detect Tor" 
             description: "This module will detect if the zombie is currently using Tor (https://www.torproject.org/)."
             authors: ["wade", "pdp", "bm", "xntrik"]
diff --git a/modules/recon/detect_tor/module.rb b/modules/network/detect_tor/module.rb
similarity index 100%
rename from modules/recon/detect_tor/module.rb
rename to modules/network/detect_tor/module.rb
diff --git a/modules/recon/internal_network_fingerprinting/command.js b/modules/network/internal_network_fingerprinting/command.js
similarity index 100%
rename from modules/recon/internal_network_fingerprinting/command.js
rename to modules/network/internal_network_fingerprinting/command.js
diff --git a/modules/recon/internal_network_fingerprinting/config.yaml b/modules/network/internal_network_fingerprinting/config.yaml
similarity index 93%
rename from modules/recon/internal_network_fingerprinting/config.yaml
rename to modules/network/internal_network_fingerprinting/config.yaml
index 6181dbf64..7f6447bda 100644
--- a/modules/recon/internal_network_fingerprinting/config.yaml
+++ b/modules/network/internal_network_fingerprinting/config.yaml
@@ -17,8 +17,8 @@ beef:
     module:
         internal_network_fingerprinting:
             enable: true
-            category: "Recon"
-            name: "Network Fingerprinting"
+            category: "Network"
+            name: "Fingerprint Network"
             description: "Discover devices and applications in the network of the victim using signatures like default logo images/favicons (partially based on the Yokoso idea)."
             authors: ["bcoles@gmail.com", "wade", "antisnatchor"]
             target:
diff --git a/modules/recon/internal_network_fingerprinting/module.rb b/modules/network/internal_network_fingerprinting/module.rb
similarity index 100%
rename from modules/recon/internal_network_fingerprinting/module.rb
rename to modules/network/internal_network_fingerprinting/module.rb
diff --git a/modules/recon/ping_sweep/command.js b/modules/network/ping_sweep/command.js
similarity index 100%
rename from modules/recon/ping_sweep/command.js
rename to modules/network/ping_sweep/command.js
diff --git a/modules/recon/ping_sweep/config.yaml b/modules/network/ping_sweep/config.yaml
similarity index 96%
rename from modules/recon/ping_sweep/config.yaml
rename to modules/network/ping_sweep/config.yaml
index 190d80555..fcf0f6d9f 100644
--- a/modules/recon/ping_sweep/config.yaml
+++ b/modules/network/ping_sweep/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         ping_sweep:
             enable: true
-            category: "Recon"
+            category: "Network"
             name: "Ping Sweep"
             description: "Discover active hosts in the internal network of the hooked browser. It works calling a Java method from JavaScript and do not require user interaction."
             authors: ["jgaliana"]
diff --git a/modules/recon/ping_sweep/module.rb b/modules/network/ping_sweep/module.rb
similarity index 100%
rename from modules/recon/ping_sweep/module.rb
rename to modules/network/ping_sweep/module.rb
diff --git a/modules/persistence/iframe_above/config.yaml b/modules/persistence/iframe_above/config.yaml
index 58b0b65fb..587338956 100644
--- a/modules/persistence/iframe_above/config.yaml
+++ b/modules/persistence/iframe_above/config.yaml
@@ -18,7 +18,7 @@ beef:
         iframe_above:
             enable: true
             category: "Persistence"
-            name: "iFrame Persistance"
+            name: "Create Forground iFrame"
             description: "Rewrites all links on the webpage to spawn a 100% by 100% iFrame with a source relative to the selected link."
             authors: ["passbe"]
             target:
diff --git a/modules/persistence/popunder_window/config.yaml b/modules/persistence/popunder_window/config.yaml
index 590c0ca7b..7c7faa3bf 100644
--- a/modules/persistence/popunder_window/config.yaml
+++ b/modules/persistence/popunder_window/config.yaml
@@ -18,7 +18,7 @@ beef:
         popunder_window:
             enable: true
             category: "Persistence"
-            name: "Pop Under Window"
+            name: "Create Pop Under"
             description: "Creates a new discrete pop under window with the beef hook included.<br><br>This module will add another browser node to the tree. It will be a duplicate. This will be addressed in a future release"
             authors: ["ethicalhack3r"]
             target: