diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 940038f06a..4136d0fb00 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-31  Ramon Novoa  <rnovoa@artica.es>
+
+	* operation/snmpconsole/snmp_alert.php: Moved to
+	  godmode/snmpconsole/snmp_alert.php.
+
+	* godmode/snmpconsole: Added to repository. SNMP console godmode
+	  subdirectory.
+
+	* godmode/menu.php,
+	  operation/menu.php: Updated menus to reflect the change.
+
 2008-10-31  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/styles/god.css,
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 7a60926b80..88cfaf3af5 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -127,6 +127,29 @@ if (give_acl ($config['id_user'], 0, "UM")) {
 	echo '<ul class="mn"><li><a href="index.php?sec=gusuarios&amp;sec2=godmode/users/user_list" class="mn">'.__('Manage users').'</a></li></ul></div>';
 }
 
+// SNMP console
+if (give_acl($config['id_user'], 0, "AW")) {
+	if ($sec == "gsnmpconsole"){
+		echo "<div id='god9s'>";
+	} else
+		echo "<div id='god9'>";
+
+	echo "<ul class='mn'><li><a href='index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert' class='mn'>" . __('Manage SNMP console') . "</a></li></ul></div>";
+
+	// SNMP Console alert (submenu)
+	if ($sec == "gsnmpconsole") {
+		if ($sec2 == "godmode/snmpconsole/snmp_alert") {
+			echo "<div class='arrowgs'>";
+		} else {
+			echo "<div class='arrowg'>";
+		}
+		echo "<ul class='mn'><li><a href='index.php?sec=gsnmpconsole&amp;sec2=godmode/snmpconsole/snmp_alert' class='mn'>".__('SNMP alerts')."</a></li></ul></div>";
+	}
+	
+	enterprise_hook ('snmpconsole_submenu');
+}
+
+
 // Reporting
 if (give_acl ($config['id_user'], 0, "PM")) {
 	echo '<div id="god51">';
diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
similarity index 96%
rename from pandora_console/operation/snmpconsole/snmp_alert.php
rename to pandora_console/godmode/snmpconsole/snmp_alert.php
index 72ae7057e1..d7b8f17a0a 100644
--- a/pandora_console/operation/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -140,7 +140,7 @@ if (isset ($_GET["update_alert"])) {
 	} else {
 		echo "<h2>Pandora SNMP &gt; ".__('Create alert')."</h2>";
 	}
-	echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&submit='.$id_as.'">';
+	echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&submit='.$id_as.'">';
 	echo '<table cellpadding="4" cellspacing="4" width="650" class="databox_color">';
 	
 	// Alert type (e-mail, event etc.)
@@ -325,9 +325,9 @@ if (isset ($_GET["update_alert"])) {
 			$data[7] = __('Never');
 		}
 		
-		$data[8] = '<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">
+		$data[8] = '<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row["id_as"].'">
 				<img src="images/cross.png" border="0" alt="'.__('Delete').'"></a>&nbsp;
-				<a href="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">
+				<a href="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert='.$row["id_as"].'">
 				<img src="images/config.png" border="0" alt="'.__('Update').'"></a>';
 		$idx = count ($table->data); //The current index of the table is 1 less than the count of table data so we count before adding to table->data
 		array_push ($table->data, $data);
@@ -359,7 +359,7 @@ if (isset ($_GET["update_alert"])) {
 	unset ($table);	
 	
 	echo '<div style="text-align:right; width:740px">';
-	echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&update_alert=-1">';
+	echo '<form name="agente" method="post" action="index.php?sec=gsnmpconsole&sec2=godmode/snmpconsole/snmp_alert&update_alert=-1">';
 	print_submit_button (__('Create'), "add_alert", false, 'class="sub next"');
 	echo "</form></div>";
 		
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 9d8fb0aded..1fdc9add4e 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -234,18 +234,6 @@ if (give_acl ($config['id_user'], 0, "AR")) {
 	echo '<div id="op6" class="operation-menu'.$selected.'">';
 	echo '<ul class="mn"><li><a href="index.php?sec=snmpconsole&amp;sec2=operation/snmpconsole/snmp_view" class="mn">'.__('SNMP console').'</a></li></ul></div>';
 
-	if (give_acl($config['id_user'], 0, "AW")) {
-		// SNMP Console alert (submenu)
-		if ($sec == "snmpconsole") {
-			if ($sec2 == "operation/snmpconsole/snmp_alert") {
-				echo "<div class='operation-submenu submenu-selected'>";
-			} else {
-				echo "<div class='operation-submenu'>";
-			}
-			echo "<ul class='mn'><li><a href='index.php?sec=snmpconsole&amp;sec2=operation/snmpconsole/snmp_alert' class='mn'>".__('SNMP alerts')."</a></li></ul></div>";
-		}
-	}
-	
 	// Messages
 	if($sec2 == "operation/messages/message" && !isset ($_GET["nuevo_g"])) {
 		$selected = ' menu-selected';