diff --git a/deps/cloud.userlibraries b/deps/cloud.userlibraries
index 33cce167690..cc9cda821c6 100644
--- a/deps/cloud.userlibraries
+++ b/deps/cloud.userlibraries
@@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <eclipse-userlibraries version="2">
     <library name="agent-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-libvirt-0.4.5.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-junit-4.8.1.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-commons-httpclient-3.1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-libvirt-0.4.5.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-junit-4.8.1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-commons-httpclient-3.1.jar"/>
     </library>
     <library name="api-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-gson.jar"/>
     </library>
     <library name="core-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-commons-httpclient-3.1.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-trilead-ssh2-build213.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-xenserver-5.6.100-1.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-xmlrpc-client-3.1.3.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-xmlrpc-common-3.1.3.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-commons-httpclient-3.1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-gson.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-trilead-ssh2-build213.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-xenserver-5.6.100-1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-xmlrpc-client-3.1.3.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-xmlrpc-common-3.1.3.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
     </library>
     <library name="corep-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/vmware-apputils.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-credstore.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-activation.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-core.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-jdom.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxrpc.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jdom.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-mailapi.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-saxpath.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-smtp.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-wbem.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-xalan.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-xerces.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-xml-apis.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-vim.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-vim25.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-axis.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-trilead-ssh2-build213.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-iControl.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-apputils.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-credstore.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-activation.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jaxen-core.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jaxen-jdom.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jaxrpc.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jdom.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-mailapi.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-saxpath.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-smtp.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-wbem.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-xalan.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-xerces.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-xml-apis.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-vim.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-vim25.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-axis.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-gson.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-trilead-ssh2-build213.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-iControl.jar"/>
     </library>
     <library name="proxy-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-gson.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
     </library>
     <library name="server-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-xenserver-5.6.100-1.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-email.jar"/>
-        <archive path="/home/kelven/cloud-dev/thirdparty/servlet-api.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-xstream-1.3.1.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-httpcore-4.0.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-gson.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-xenserver-5.6.100-1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-email.jar"/>
+        <archive path="${CLOUD_DEV}/thirdparty/servlet-api.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-xstream-1.3.1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-httpcore-4.0.jar"/>
     </library>
     <library name="serverp-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-apputils.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-credstore.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-activation.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-core.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxen-jdom.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jaxrpc.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-jdom.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-mailapi.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-saxpath.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-smtp.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-wbem.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-xalan.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-xerces.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-lib-xml-apis.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-vim.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/vmware-vim25.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-gson.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-axis.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-apputils.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-credstore.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-activation.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jaxen-core.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jaxen-jdom.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jaxrpc.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-jdom.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-mailapi.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-saxpath.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-smtp.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-wbem.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-xalan.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-xerces.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-lib-xml-apis.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-vim.jar"/>
+        <archive path="${CLOUD_DEV}/deps/vmware-vim25.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-gson.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-axis.jar"/>
     </library>
     <library name="test-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/thirdparty/selenium-java-client-driver.jar"/>
-        <archive path="/home/kelven/cloud-dev/thirdparty/selenium-server.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-commons-httpclient-3.1.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-mysql-connector-java-5.1.7-bin.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-trilead-ssh2-build213.jar"/>
+        <archive path="${CLOUD_DEV}/thirdparty/selenium-java-client-driver.jar"/>
+        <archive path="${CLOUD_DEV}/thirdparty/selenium-server.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-commons-httpclient-3.1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-mysql-connector-java-5.1.7-bin.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-trilead-ssh2-build213.jar"/>
     </library>
     <library name="usage-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-email.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-email.jar"/>
     </library>
     <library name="utils-deps" systemlibrary="false">
-        <archive path="/home/kelven/cloud-dev/deps/cloud-backport-util-concurrent-3.0.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-cglib.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-log4j.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-bcprov-jdk16-1.45.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-commons-dbcp-1.2.2.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-commons-pool-1.4.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-ehcache.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-jsch-0.1.42.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-commons-codec-1.4.jar"/>
-        <archive path="/home/kelven/cloud-dev/deps/cloud-junit-4.8.1.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-backport-util-concurrent-3.0.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-cglib.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-log4j.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-bcprov-jdk16-1.45.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-commons-dbcp-1.2.2.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-commons-pool-1.4.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-ehcache.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-jsch-0.1.42.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-commons-codec-1.4.jar"/>
+        <archive path="${CLOUD_DEV}/deps/cloud-junit-4.8.1.jar"/>
     </library>
 </eclipse-userlibraries>