diff --git a/install.sh b/install.sh
index 032e16cd11..9af1fe8abe 100755
--- a/install.sh
+++ b/install.sh
@@ -419,10 +419,8 @@ MADS_LIB_FILES="src/mad/sh/madcommon.sh \
               src/vmm_mad/ec2/one_vmm_ec2 \
               src/vmm_mad/dummy/one_vmm_dummy.rb \
               src/vmm_mad/dummy/one_vmm_dummy \
-              src/im_mad/im_ssh/one_im_ssh.rb \
-              src/im_mad/im_ssh/one_im_ssh \
-              src/im_mad/im_sh/one_im_sh.rb \
-              src/im_mad/im_sh/one_im_sh \
+              src/im_mad/im_exec/one_im_exec.rb \
+              src/im_mad/im_exec/one_im_exec \
               src/im_mad/ec2/one_im_ec2.rb \
               src/im_mad/ec2/one_im_ec2 \
               src/im_mad/dummy/one_im_dummy.rb \
diff --git a/src/im_mad/im_ssh/one_im_ssh b/src/im_mad/im_exec/one_im_exec
similarity index 100%
rename from src/im_mad/im_ssh/one_im_ssh
rename to src/im_mad/im_exec/one_im_exec
diff --git a/src/im_mad/im_ssh/one_im_ssh.rb b/src/im_mad/im_exec/one_im_exec.rb
similarity index 94%
rename from src/im_mad/im_ssh/one_im_ssh.rb
rename to src/im_mad/im_exec/one_im_exec.rb
index 84e34b2788..b377ad43ec 100755
--- a/src/im_mad/im_ssh/one_im_ssh.rb
+++ b/src/im_mad/im_exec/one_im_exec.rb
@@ -35,14 +35,14 @@ require 'getoptlong'
 
 
 # The SSH Information Manager Driver
-class InformationManagerDriverSSH < OpenNebulaDriver
+class InformationManagerDriver < OpenNebulaDriver
 
     # Init the driver
     def initialize(hypervisor, options)
         @options={
             :threaded => true
         }.merge!(options)
-        
+
         super('im', @options)
 
         @hypervisor = hypervisor
@@ -103,6 +103,9 @@ if ARGV.length >= 1
     hypervisor = ARGV.shift
 end
 
-im = InformationManagerDriverSSH.new(hypervisor, threads, retries,
-    local_actions)
+im = InformationManagerDriver.new(hypervisor,
+    :threads => threads,
+    :retries => retries,
+    :local_actions => local_actions)
+
 im.start_driver