diff --git a/centreon-plugins/hardware/ups/mge/mode/batterystatus.pm b/centreon-plugins/hardware/ups/mge/snmp/mode/batterystatus.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/mge/mode/batterystatus.pm
rename to centreon-plugins/hardware/ups/mge/snmp/mode/batterystatus.pm
index 3235ac6fd..7d52adb80 100644
--- a/centreon-plugins/hardware/ups/mge/mode/batterystatus.pm
+++ b/centreon-plugins/hardware/ups/mge/snmp/mode/batterystatus.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::mge::mode::batterystatus;
+package hardware::ups::mge::snmp::mode::batterystatus;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/mge/mode/environment.pm b/centreon-plugins/hardware/ups/mge/snmp/mode/environment.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/mge/mode/environment.pm
rename to centreon-plugins/hardware/ups/mge/snmp/mode/environment.pm
index 6e7c2b012..6f04b02c1 100644
--- a/centreon-plugins/hardware/ups/mge/mode/environment.pm
+++ b/centreon-plugins/hardware/ups/mge/snmp/mode/environment.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::mge::mode::environment;
+package hardware::ups::mge::snmp::mode::environment;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/mge/mode/inputlines.pm b/centreon-plugins/hardware/ups/mge/snmp/mode/inputlines.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/mge/mode/inputlines.pm
rename to centreon-plugins/hardware/ups/mge/snmp/mode/inputlines.pm
index 33c075b14..bc264bdcd 100644
--- a/centreon-plugins/hardware/ups/mge/mode/inputlines.pm
+++ b/centreon-plugins/hardware/ups/mge/snmp/mode/inputlines.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::mge::mode::inputlines;
+package hardware::ups::mge::snmp::mode::inputlines;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/mge/mode/outputlines.pm b/centreon-plugins/hardware/ups/mge/snmp/mode/outputlines.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/mge/mode/outputlines.pm
rename to centreon-plugins/hardware/ups/mge/snmp/mode/outputlines.pm
index bfc83c074..4f2e1022b 100644
--- a/centreon-plugins/hardware/ups/mge/mode/outputlines.pm
+++ b/centreon-plugins/hardware/ups/mge/snmp/mode/outputlines.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::mge::mode::outputlines;
+package hardware::ups::mge::snmp::mode::outputlines;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/mge/mode/outputsource.pm b/centreon-plugins/hardware/ups/mge/snmp/mode/outputsource.pm
similarity index 98%
rename from centreon-plugins/hardware/ups/mge/mode/outputsource.pm
rename to centreon-plugins/hardware/ups/mge/snmp/mode/outputsource.pm
index 85f819449..6e2b09383 100644
--- a/centreon-plugins/hardware/ups/mge/mode/outputsource.pm
+++ b/centreon-plugins/hardware/ups/mge/snmp/mode/outputsource.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::mge::mode::outputsource;
+package hardware::ups::mge::snmp::mode::outputsource;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/mge/plugin.pm b/centreon-plugins/hardware/ups/mge/snmp/plugin.pm
similarity index 93%
rename from centreon-plugins/hardware/ups/mge/plugin.pm
rename to centreon-plugins/hardware/ups/mge/snmp/plugin.pm
index b0a3119de..234b0fbb7 100644
--- a/centreon-plugins/hardware/ups/mge/plugin.pm
+++ b/centreon-plugins/hardware/ups/mge/snmp/plugin.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::mge::plugin;
+package hardware::ups::mge::snmp::plugin;
 
 use strict;
 use warnings;
@@ -47,11 +47,11 @@ sub new {
     
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                         'environment'      => 'hardware::ups::mge::mode::environment',
-                         'input-lines'      => 'hardware::ups::mge::mode::inputlines',
-                         'output-lines'     => 'hardware::ups::mge::mode::outputlines',
-                         'output-source'    => 'hardware::ups::mge::mode::outputsource',
-                         'battery-status'   => 'hardware::ups::mge::mode::batterystatus',
+                         'environment'      => 'hardware::ups::mge::snmp::mode::environment',
+                         'input-lines'      => 'hardware::ups::mge::snmp::mode::inputlines',
+                         'output-lines'     => 'hardware::ups::mge::snmp::mode::outputlines',
+                         'output-source'    => 'hardware::ups::mge::snmp::mode::outputsource',
+                         'battery-status'   => 'hardware::ups::mge::snmp::mode::batterystatus',
                          );
 
     return $self;
diff --git a/centreon-plugins/hardware/ups/powerware/mode/alarms.pm b/centreon-plugins/hardware/ups/powerware/snmp/mode/alarms.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/powerware/mode/alarms.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/mode/alarms.pm
index 272ce46ad..fd450614d 100644
--- a/centreon-plugins/hardware/ups/powerware/mode/alarms.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/mode/alarms.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::mode::alarms;
+package hardware::ups::powerware::snmp::mode::alarms;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/powerware/mode/batterystatus.pm b/centreon-plugins/hardware/ups/powerware/snmp/mode/batterystatus.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/powerware/mode/batterystatus.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/mode/batterystatus.pm
index 112b33e13..330a7e4f8 100644
--- a/centreon-plugins/hardware/ups/powerware/mode/batterystatus.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/mode/batterystatus.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::mode::batterystatus;
+package hardware::ups::powerware::snmp::mode::batterystatus;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/powerware/mode/environment.pm b/centreon-plugins/hardware/ups/powerware/snmp/mode/environment.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/powerware/mode/environment.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/mode/environment.pm
index ed263d1e0..e1ec420ca 100644
--- a/centreon-plugins/hardware/ups/powerware/mode/environment.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/mode/environment.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::mode::environment;
+package hardware::ups::powerware::snmp::mode::environment;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/powerware/mode/inputlines.pm b/centreon-plugins/hardware/ups/powerware/snmp/mode/inputlines.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/powerware/mode/inputlines.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/mode/inputlines.pm
index 52b079e6c..a58efefca 100644
--- a/centreon-plugins/hardware/ups/powerware/mode/inputlines.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/mode/inputlines.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::mode::inputlines;
+package hardware::ups::powerware::snmp::mode::inputlines;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/powerware/mode/outputlines.pm b/centreon-plugins/hardware/ups/powerware/snmp/mode/outputlines.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/powerware/mode/outputlines.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/mode/outputlines.pm
index af01ea82e..fb52d97fc 100644
--- a/centreon-plugins/hardware/ups/powerware/mode/outputlines.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/mode/outputlines.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::mode::outputlines;
+package hardware::ups::powerware::snmp::mode::outputlines;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/powerware/mode/outputsource.pm b/centreon-plugins/hardware/ups/powerware/snmp/mode/outputsource.pm
similarity index 98%
rename from centreon-plugins/hardware/ups/powerware/mode/outputsource.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/mode/outputsource.pm
index 18d2127cb..a2fa2efb8 100644
--- a/centreon-plugins/hardware/ups/powerware/mode/outputsource.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/mode/outputsource.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::mode::outputsource;
+package hardware::ups::powerware::snmp::mode::outputsource;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/powerware/plugin.pm b/centreon-plugins/hardware/ups/powerware/snmp/plugin.pm
similarity index 91%
rename from centreon-plugins/hardware/ups/powerware/plugin.pm
rename to centreon-plugins/hardware/ups/powerware/snmp/plugin.pm
index 5e416cbc3..5d5340471 100644
--- a/centreon-plugins/hardware/ups/powerware/plugin.pm
+++ b/centreon-plugins/hardware/ups/powerware/snmp/plugin.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::powerware::plugin;
+package hardware::ups::powerware::snmp::plugin;
 
 use strict;
 use warnings;
@@ -47,12 +47,12 @@ sub new {
     
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                         'environment'      => 'hardware::ups::powerware::mode::environment',
-                         'input-lines'      => 'hardware::ups::powerware::mode::inputlines',
-                         'output-lines'     => 'hardware::ups::powerware::mode::outputlines',
-                         'output-source'    => 'hardware::ups::powerware::mode::outputsource',
-                         'alarms'           => 'hardware::ups::powerware::mode::alarms',
-                         'battery-status'   => 'hardware::ups::powerware::mode::batterystatus',
+                         'environment'      => 'hardware::ups::powerware::snmp::mode::environment',
+                         'input-lines'      => 'hardware::ups::powerware::snmp::mode::inputlines',
+                         'output-lines'     => 'hardware::ups::powerware::snmp::mode::outputlines',
+                         'output-source'    => 'hardware::ups::powerware::snmp::mode::outputsource',
+                         'alarms'           => 'hardware::ups::powerware::snmp::mode::alarms',
+                         'battery-status'   => 'hardware::ups::powerware::snmp::mode::batterystatus',
                          );
 
     return $self;
diff --git a/centreon-plugins/hardware/ups/standard/rfc1628/mode/alarms.pm b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/alarms.pm
similarity index 98%
rename from centreon-plugins/hardware/ups/standard/rfc1628/mode/alarms.pm
rename to centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/alarms.pm
index c6ebdda7c..71c945448 100644
--- a/centreon-plugins/hardware/ups/standard/rfc1628/mode/alarms.pm
+++ b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/alarms.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::standard::rfc1628::mode::alarms;
+package hardware::ups::standard::rfc1628::snmp::mode::alarms;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/standard/rfc1628/mode/batterystatus.pm b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm
similarity index 98%
rename from centreon-plugins/hardware/ups/standard/rfc1628/mode/batterystatus.pm
rename to centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm
index d2b0fb34a..a778d2332 100644
--- a/centreon-plugins/hardware/ups/standard/rfc1628/mode/batterystatus.pm
+++ b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/batterystatus.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::standard::rfc1628::mode::batterystatus;
+package hardware::ups::standard::rfc1628::snmp::mode::batterystatus;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/standard/rfc1628/mode/inputlines.pm b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/standard/rfc1628/mode/inputlines.pm
rename to centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm
index 2c1f876b4..8d4fe8666 100644
--- a/centreon-plugins/hardware/ups/standard/rfc1628/mode/inputlines.pm
+++ b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/inputlines.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::standard::rfc1628::mode::inputlines;
+package hardware::ups::standard::rfc1628::snmp::mode::inputlines;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/standard/rfc1628/mode/outputlines.pm b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm
similarity index 99%
rename from centreon-plugins/hardware/ups/standard/rfc1628/mode/outputlines.pm
rename to centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm
index c1b647587..cf8a69429 100644
--- a/centreon-plugins/hardware/ups/standard/rfc1628/mode/outputlines.pm
+++ b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/outputlines.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::standard::rfc1628::mode::outputlines;
+package hardware::ups::standard::rfc1628::snmp::mode::outputlines;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/standard/rfc1628/mode/outputsource.pm b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/outputsource.pm
similarity index 98%
rename from centreon-plugins/hardware/ups/standard/rfc1628/mode/outputsource.pm
rename to centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/outputsource.pm
index 486460fd2..ab68aa5f0 100644
--- a/centreon-plugins/hardware/ups/standard/rfc1628/mode/outputsource.pm
+++ b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/mode/outputsource.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::standard::rfc1628::mode::outputsource;
+package hardware::ups::standard::rfc1628::snmp::mode::outputsource;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/centreon-plugins/hardware/ups/standard/rfc1628/plugin.pm b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/plugin.pm
similarity index 90%
rename from centreon-plugins/hardware/ups/standard/rfc1628/plugin.pm
rename to centreon-plugins/hardware/ups/standard/rfc1628/snmp/plugin.pm
index 40d371090..4250db082 100644
--- a/centreon-plugins/hardware/ups/standard/rfc1628/plugin.pm
+++ b/centreon-plugins/hardware/ups/standard/rfc1628/snmp/plugin.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package hardware::ups::standard::rfc1628::plugin;
+package hardware::ups::standard::rfc1628::snmp::plugin;
 
 use strict;
 use warnings;
@@ -47,11 +47,11 @@ sub new {
 
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                         'battery-status'   => 'hardware::ups::standard::rfc1628::mode::batterystatus',
-                         'input-lines'      => 'hardware::ups::standard::rfc1628::mode::inputlines',
-                         'output-lines'     => 'hardware::ups::standard::rfc1628::mode::outputlines',
-                         'output-source'    => 'hardware::ups::standard::rfc1628::mode::outputsource',
-                         'alarms'           => 'hardware::ups::standard::rfc1628::mode::alarms',
+                         'battery-status'   => 'hardware::ups::standard::rfc1628::snmp::mode::batterystatus',
+                         'input-lines'      => 'hardware::ups::standard::rfc1628::snmp::mode::inputlines',
+                         'output-lines'     => 'hardware::ups::standard::rfc1628::snmp::mode::outputlines',
+                         'output-source'    => 'hardware::ups::standard::rfc1628::snmp::mode::outputsource',
+                         'alarms'           => 'hardware::ups::standard::rfc1628::snmp::mode::alarms',
                          );
 
     return $self;