diff --git a/include/Nebula.h b/include/Nebula.h
index 15e5268775..8767aa9942 100644
--- a/include/Nebula.h
+++ b/include/Nebula.h
@@ -237,7 +237,7 @@ private:
             log_location     = "/var/log/one/";
             var_location     = "/var/lib/one/";
             hook_location    = "/usr/share/one/hooks/";
-            remotes_location = "/usr/lib/one/remotes/";
+            remotes_location = "/var/lib/one/remotes/";
         }
         else
         {
@@ -253,7 +253,7 @@ private:
             log_location     = nebula_location + "var/";
             var_location     = nebula_location + "var/";
             hook_location    = nebula_location + "share/hooks/";
-            remotes_location = nebula_location + "lib/remotes/";
+            remotes_location = nebula_location + "var/remotes/";
         }
     };
 
diff --git a/install.sh b/install.sh
index 4d6059e806..2834543290 100755
--- a/install.sh
+++ b/install.sh
@@ -168,13 +168,7 @@ ETC_DIRS="$ETC_LOCATION/im_kvm \
           $ETC_LOCATION/ec2query_templates \
           $ETC_LOCATION/occi_templates"
 
-LIB_DIRS="$LIB_LOCATION/remotes \
-          $LIB_LOCATION/remotes/im \
-          $LIB_LOCATION/remotes/im/kvm.d \
-          $LIB_LOCATION/remotes/im/xen.d \
-          $LIB_LOCATION/remotes/vmm/xen \
-          $LIB_LOCATION/remotes/vmm/kvm \
-          $LIB_LOCATION/ruby \
+LIB_DIRS="$LIB_LOCATION/ruby \
           $LIB_LOCATION/ruby/OpenNebula \
           $LIB_LOCATION/ruby/cloud/ \
           $LIB_LOCATION/ruby/cloud/econe \
@@ -187,6 +181,13 @@ LIB_DIRS="$LIB_LOCATION/remotes \
           $LIB_LOCATION/tm_commands/lvm \
           $LIB_LOCATION/mads"
 
+VAR_DIRS="$VAR_LOCATION/remotes \
+          $VAR_LOCATION/remotes/im \
+          $VAR_LOCATION/remotes/im/kvm.d \
+          $VAR_LOCATION/remotes/im/xen.d \
+          $VAR_LOCATION/remotes/vmm/xen \
+          $VAR_LOCATION/remotes/vmm/kvm"
+
 LIB_ECO_CLIENT_DIRS="$LIB_LOCATION/ruby \
                  $LIB_LOCATION/ruby/OpenNebula
                  $LIB_LOCATION/ruby/cloud/ \
@@ -197,7 +198,7 @@ LIB_OCCI_CLIENT_DIRS="$LIB_LOCATION/ruby \
                  $LIB_LOCATION/ruby/cloud/occi"
 
 if [ "$CLIENT" = "no" ]; then
-    MAKE_DIRS="$MAKE_DIRS $SHARE_DIRS $ETC_DIRS $LIB_DIRS"
+    MAKE_DIRS="$MAKE_DIRS $SHARE_DIRS $ETC_DIRS $LIB_DIRS $VAR_DIRS"
 elif [ "$CLIENT" = "ec2" ]; then
     MAKE_DIRS="$MAKE_DIRS $LIB_ECO_CLIENT_DIRS"
 elif [ "$CLIENT" = "occi" ]; then
@@ -216,11 +217,11 @@ INSTALL_FILES[2]="LIB_FILES:$LIB_LOCATION"
 INSTALL_FILES[3]="RUBY_LIB_FILES:$LIB_LOCATION/ruby"
 INSTALL_FILES[4]="RUBY_OPENNEBULA_LIB_FILES:$LIB_LOCATION/ruby/OpenNebula"
 INSTALL_FILES[5]="MADS_LIB_FILES:$LIB_LOCATION/mads"
-INSTALL_FILES[6]="IM_PROBES_FILES:$LIB_LOCATION/remotes/im"
-INSTALL_FILES[7]="IM_PROBES_KVM_FILES:$LIB_LOCATION/remotes/im/kvm.d"
-INSTALL_FILES[8]="IM_PROBES_XEN_FILES:$LIB_LOCATION/remotes/im/xen.d"
-INSTALL_FILES[9]="VMM_SSH_KVM_SCRIPTS:$LIB_LOCATION/remotes/vmm/kvm"
-INSTALL_FILES[10]="VMM_SSH_XEN_SCRIPTS:$LIB_LOCATION/remotes/vmm/xen"
+INSTALL_FILES[6]="IM_PROBES_FILES:$VAR_LOCATION/remotes/im"
+INSTALL_FILES[7]="IM_PROBES_KVM_FILES:$VAR_LOCATION/remotes/im/kvm.d"
+INSTALL_FILES[8]="IM_PROBES_XEN_FILES:$VAR_LOCATION/remotes/im/xen.d"
+INSTALL_FILES[9]="VMM_SSH_KVM_SCRIPTS:$VAR_LOCATION/remotes/vmm/kvm"
+INSTALL_FILES[10]="VMM_SSH_XEN_SCRIPTS:$VAR_LOCATION/remotes/vmm/xen"
 INSTALL_FILES[11]="NFS_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/nfs"
 INSTALL_FILES[12]="SSH_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/ssh"
 INSTALL_FILES[13]="DUMMY_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/dummy"
diff --git a/src/cli/onehost b/src/cli/onehost
index 2bf1ec1eb3..8af1a3524a 100755
--- a/src/cli/onehost
+++ b/src/cli/onehost
@@ -387,7 +387,7 @@ when "disable"
 when "sync"
     check_parameters("sync", 0)
     if ONE_LOCATION
-        FileUtils.touch "#{ONE_LOCATION}/lib/remotes"
+        FileUtils.touch "#{ONE_LOCATION}/var/remotes"
     else
         FileUtils.touch "/var/lib/one/remotes"
     end
diff --git a/src/im_mad/im_sh/one_im_sh.rb b/src/im_mad/im_sh/one_im_sh.rb
index 79714d2934..71cf5e0a3e 100755
--- a/src/im_mad/im_sh/one_im_sh.rb
+++ b/src/im_mad/im_sh/one_im_sh.rb
@@ -21,13 +21,11 @@ ONE_LOCATION=ENV["ONE_LOCATION"]
 if !ONE_LOCATION
     RUBY_LIB_LOCATION="/usr/lib/one/ruby"
     ETC_LOCATION="/etc/one/"
-    PROBE_LOCATION="/usr/lib/one/im_probes/"
-    REMOTES_LOCATION="/usr/lib/one/remotes"
+    REMOTES_LOCATION="/var/lib/one/remotes"
 else
     RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
     ETC_LOCATION=ONE_LOCATION+"/etc/"
-    PROBE_LOCATION=ONE_LOCATION+"/lib/im_probes/"
-    REMOTES_LOCATION=ONE_LOCATION+"/lib/remotes/"
+    REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"
 end
 
 $: << RUBY_LIB_LOCATION
@@ -49,7 +47,7 @@ class InformationManager < OpenNebulaDriver
         @config     = read_configuration
         @hypervisor = hypervisor
 
-        @cmd_path   = "#{ENV['ONE_LOCATION']}/lib/remotes/im"
+        @cmd_path   = "#{REMOTES_LOCATION}/im"
 
         # register actions
         register_action(:MONITOR, method("action_monitor"))
diff --git a/src/im_mad/im_ssh/one_im_ssh.rb b/src/im_mad/im_ssh/one_im_ssh.rb
index 57dd1514c8..8884e89cec 100755
--- a/src/im_mad/im_ssh/one_im_ssh.rb
+++ b/src/im_mad/im_ssh/one_im_ssh.rb
@@ -21,13 +21,11 @@ ONE_LOCATION=ENV["ONE_LOCATION"]
 if !ONE_LOCATION
     RUBY_LIB_LOCATION="/usr/lib/one/ruby"
     ETC_LOCATION="/etc/one/"
-    PROBE_LOCATION="/usr/lib/one/im_probes/"
-    REMOTES_LOCATION="/usr/lib/one/remotes"
+    REMOTES_LOCATION="/var/lib/one/remotes"
 else
     RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
     ETC_LOCATION=ONE_LOCATION+"/etc/"
-    PROBE_LOCATION=ONE_LOCATION+"/lib/im_probes/"
-    REMOTES_LOCATION=ONE_LOCATION+"/lib/remotes/"
+    REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"
 end
 
 $: << RUBY_LIB_LOCATION