Renamed projects / packages com.gluster.* to org.gluster.*

author: Shireesh Anjal <shireesh@gluster.com> 2011-11-25 20:13:35 +0530
committer: Shireesh Anjal <shireesh@gluster.com> 2011-11-25 20:13:35 +0530
commit: 1142b0e41de39010de7845cf70d71dbb001fc1dc (patch)
tree: 3513487f65c1a7df47996bd2852393aceaac1b8a
parent: 92c52d8edf285945d31e446503fc742fde9dcc49 (diff)
839 files changed, 1910 insertions, 1853 deletions
diff --git a/.gitignore b/.gitignore
index f970eb8c..ea9afa10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-src/com.gluster.storage.management.client/bin
-src/com.gluster.storage.management.core/bin
-src/com.gluster.storage.management.console/bin
-src/com.gluster.storage.management.gateway/WebContent/WEB-INF/classes
-target
+src/org.gluster.storage.management.client/bin
+src/org.gluster.storage.management.core/bin
+src/org.gluster.storage.management.console/bin
+src/org.gluster.storage.management.gateway/WebContent/WEB-INF/classes
diff --git a/src/com.gluster.storage.management.console/preferences.ini b/src/com.gluster.storage.management.console/preferences.ini
deleted file mode 100644
index 7053b209..00000000
--- a/src/com.gluster.storage.management.console/preferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.console.KeyConfig
-org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html
-IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP=true
-\ No newline at end of file
diff --git a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 9ddbca69..00000000
--- a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Gluster Storage Platform Core
-Bundle-SymbolicName: com.gluster.storage.management.core
-Bundle-Version: 1.0.0
-Bundle-Vendor: GLUSTER
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.gluster.storage.management.core.constants,
- com.gluster.storage.management.core.exceptions,
- com.gluster.storage.management.core.model,
- com.gluster.storage.management.core.response,
- com.gluster.storage.management.core.utils
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
-Bundle-ClassPath: .
-Import-Package: com.gluster.storage.management.core.exceptions
diff --git a/src/com.gluster.storage.management.client/.classpath b/src/org.gluster.storage.management.client/.classpath
index d81daeeb..cd4aaff7 100644
--- a/src/com.gluster.storage.management.client/.classpath
+++ b/src/org.gluster.storage.management.client/.classpath
@@ -7,6 +7,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="keystore/" kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.gluster.storage.management.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.gluster.storage.management.core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/com.gluster.storage.management.client/.project b/src/org.gluster.storage.management.client/.project
index 61a0ec41..e8da4675 100644
--- a/src/com.gluster.storage.management.client/.project
+++ b/src/org.gluster.storage.management.client/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.client</name>
+	<name>org.gluster.storage.management.client</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs
index f8b5cc38..f8b5cc38 100644
--- a/src/com.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.client/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.client/META-INF/MANIFEST.MF
index 7958d8cd..0ff85d5f 100644
--- a/src/com.gluster.storage.management.client/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.client/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gluster Storage Platform Client
-Bundle-SymbolicName: com.gluster.storage.management.client
+Bundle-SymbolicName: org.gluster.storage.management.client
 Bundle-Version: 1.0.0
 Bundle-Vendor: GLUSTER
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.gluster.storage.management.core;bundle-version="1.0.0",
+Require-Bundle: org.gluster.storage.management.core;bundle-version="1.0.0",
  org.eclipse.equinox.common;bundle-version="3.6.0"
-Export-Package: com.gluster.storage.management.client,
- com.gluster.storage.management.client.constants
+Export-Package: org.gluster.storage.management.client,
+ org.gluster.storage.management.client.constants
 Bundle-ClassPath: .,
  lib/jersey-1.5/jersey-client-1.5.jar,
  lib/jersey-1.5/jersey-core-1.5.jar,
diff --git a/src/com.gluster.storage.management.client/build.properties b/src/org.gluster.storage.management.client/build.properties
index b9d04dbf..b9d04dbf 100644
--- a/src/com.gluster.storage.management.client/build.properties
+++ b/src/org.gluster.storage.management.client/build.properties
diff --git a/src/com.gluster.storage.management.client/keystore/gmc-trusted.keystore b/src/org.gluster.storage.management.client/keystore/gmc-trusted.keystore
index 5517b6e5..5517b6e5 100644
--- a/src/com.gluster.storage.management.client/keystore/gmc-trusted.keystore
+++ b/src/org.gluster.storage.management.client/keystore/gmc-trusted.keystore
diff --git a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar
index 62f790fa..62f790fa 100644
--- a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar
diff --git a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar
index 92b38466..92b38466 100644
--- a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar
diff --git a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar
index 1c134f05..1c134f05 100644
--- a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/AbstractClient.java
index a77e2a31..bef3f87b 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/AbstractClient.java
@@ -1,10 +1,10 @@
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.client.constants.ClientConstants.ALGORITHM_SUNX509;
-import static com.gluster.storage.management.client.constants.ClientConstants.KEYSTORE_TYPE_JKS;
-import static com.gluster.storage.management.client.constants.ClientConstants.PROTOCOL_TLS;
-import static com.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE;
-import static com.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE_ACCESS;
+import static org.gluster.storage.management.client.constants.ClientConstants.ALGORITHM_SUNX509;
+import static org.gluster.storage.management.client.constants.ClientConstants.KEYSTORE_TYPE_JKS;
+import static org.gluster.storage.management.client.constants.ClientConstants.PROTOCOL_TLS;
+import static org.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE;
+import static org.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE_ACCESS;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -22,8 +22,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 
-import com.gluster.storage.management.client.utils.ClientUtil;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.client.utils.ClientUtil;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.UniformInterfaceException;
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/ClustersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/ClustersClient.java
index d6bf962a..cbb08f2c 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/ClustersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/ClustersClient.java
@@ -16,15 +16,16 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
 
 import java.util.List;
 
-import com.gluster.storage.management.core.response.ClusterNameListResponse;
+import org.gluster.storage.management.core.response.ClusterNameListResponse;
+
 import com.sun.jersey.api.representation.Form;
 
 /**
@@ -41,7 +42,7 @@ public class ClustersClient extends AbstractClient {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.client.AbstractClient#getResourcePath()
+	 * @see org.gluster.storage.management.client.AbstractClient#getResourcePath()
 	 */
 	@Override
 	public String getResourcePath() {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/DiscoveredServersClient.java
index 6b7af5b0..b18e0d17 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/DiscoveredServersClient.java
@@ -16,19 +16,20 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
 
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.response.ServerListResponse;
-import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.response.ServerListResponse;
+import org.gluster.storage.management.core.response.ServerNameListResponse;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 public class DiscoveredServersClient extends AbstractClient {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java
index 5fefedc0..46200c9a 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java
@@ -16,24 +16,25 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
 
 import java.net.URI;
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.response.FsTypeListResponse;
-import com.gluster.storage.management.core.response.GlusterServerListResponse;
-import com.gluster.storage.management.core.response.StringListResponse;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.response.FsTypeListResponse;
+import org.gluster.storage.management.core.response.GlusterServerListResponse;
+import org.gluster.storage.management.core.response.StringListResponse;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/KeysClient.java
index 51fda466..de4abd69 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/KeysClient.java
@@ -18,14 +18,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import javax.ws.rs.core.MediaType;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.constants.RESTConstants;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
 
 public class KeysClient extends AbstractClient {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/TasksClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/TasksClient.java
index 46077371..80e10691 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/TasksClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/TasksClient.java
@@ -18,16 +18,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
 import java.net.URI;
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.response.TaskInfoListResponse;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.response.TaskInfoListResponse;
+
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/UsersClient.java
index 4e89e994..b35444f7 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/UsersClient.java
@@ -16,14 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
+
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Status;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Status;
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.Base64;
 
@@ -77,7 +78,7 @@ public class UsersClient extends AbstractClient {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.client.AbstractClient#getResourceName()
+	 * @see org.gluster.storage.management.client.AbstractClient#getResourceName()
 	 */
 	@Override
 	public String getResourcePath() {
@@ -87,7 +88,7 @@ public class UsersClient extends AbstractClient {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.client.AbstractClient#getSecurityToken()
+	 * @see org.gluster.storage.management.client.AbstractClient#getSecurityToken()
 	 */
 	@Override
 	public String getSecurityToken() {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/VolumesClient.java
index ec8d0212..221ae84a 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/VolumesClient.java
@@ -18,17 +18,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
 
 import java.net.URI;
 import java.util.Date;
@@ -37,19 +37,20 @@ import java.util.Set;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
-import com.gluster.storage.management.core.response.LogMessageListResponse;
-import com.gluster.storage.management.core.response.VolumeListResponse;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.DateUtil;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.response.LogMessageListResponse;
+import org.gluster.storage.management.core.response.VolumeListResponse;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java
index e253dfa5..4e6e5602 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.client.constants;
+package org.gluster.storage.management.client.constants;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/utils/ClientUtil.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java
index 3f87fd27..0c0bbc8d 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/utils/ClientUtil.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java
@@ -1,10 +1,11 @@
-package com.gluster.storage.management.client.utils;
+package org.gluster.storage.management.client.utils;
 
 import java.net.URI;
 
 import javax.ws.rs.core.UriBuilder;
 
-import com.gluster.storage.management.client.constants.ClientConstants;
+import org.gluster.storage.management.client.constants.ClientConstants;
+
 
 public class ClientUtil {
 
diff --git a/src/com.gluster.storage.management.console.feature.webstart/.project b/src/org.gluster.storage.management.console.feature.webstart/.project
index ebf9c846..f306a1c9 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/.project
+++ b/src/org.gluster.storage.management.console.feature.webstart/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console.feature.webstart</name>
+	<name>org.gluster.storage.management.console.feature.webstart</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/buckminster.cspex b/src/org.gluster.storage.management.console.feature.webstart/buckminster.cspex
index 252a5e15..252a5e15 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/buckminster.cspex
+++ b/src/org.gluster.storage.management.console.feature.webstart/buckminster.cspex
diff --git a/src/com.gluster.storage.management.console.feature.webstart/build.properties b/src/org.gluster.storage.management.console.feature.webstart/build.properties
index 322a3114..322a3114 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/build.properties
+++ b/src/org.gluster.storage.management.console.feature.webstart/build.properties
diff --git a/src/com.gluster.storage.management.console.feature.webstart/build/glustermc.ant b/src/org.gluster.storage.management.console.feature.webstart/build/glustermc.ant
index 93bf3ccb..93bf3ccb 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/build/glustermc.ant
+++ b/src/org.gluster.storage.management.console.feature.webstart/build/glustermc.ant
diff --git a/src/com.gluster.storage.management.console.feature.webstart/feature.xml b/src/org.gluster.storage.management.console.feature.webstart/feature.xml
index 24a76dc9..eb4ae9e9 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/feature.xml
+++ b/src/org.gluster.storage.management.console.feature.webstart/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.gluster.storage.management.console.feature.webstart"
+      id="org.gluster.storage.management.console.feature.webstart"
       label="Gluster Management Console - Webstart"
       version="1.0.0"
       provider-name="Gluster Inc."
@@ -21,7 +21,7 @@
    </license>
 
    <includes
-         id="com.gluster.storage.management.console.feature"
+         id="org.gluster.storage.management.console.feature"
          version="0.0.0"/>
 
    <requires>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
index 3ac01605..ee333971 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
+++ b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
@@ -20,7 +20,7 @@
 		<jar href="plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar" main="true"/>
 		<extension
 			name="Gluster Management Console"
-			href="com.gluster.storage.management.console.feature_1.0.0.jnlp"/>
+			href="org.gluster.storage.management.console.feature_1.0.0.jnlp"/>
 		<property
 			name="osgi.instance.area"
 			value="@user.home/Application Data/glustermc"/>
@@ -29,7 +29,7 @@
 			value="@user.home/Application Data/glustermc"/>
 		<property
 			name="eclipse.product"
-			value="com.gluster.storage.management.console.product"/>
+			value="org.gluster.storage.management.console.product"/>
 		<property
 			name="gluster.server.url"
 			value="$$codebase"/>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/splash.png b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/splash.png
index 74983f8a..74983f8a 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/splash.png
+++ b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/splash.png
diff --git a/src/com.gluster.storage.management.console.feature/.project b/src/org.gluster.storage.management.console.feature/.project
index a736d116..a4a4a321 100644
--- a/src/com.gluster.storage.management.console.feature/.project
+++ b/src/org.gluster.storage.management.console.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console.feature</name>
+	<name>org.gluster.storage.management.console.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console.feature/build.properties b/src/org.gluster.storage.management.console.feature/build.properties
index 64f93a9f..64f93a9f 100644
--- a/src/com.gluster.storage.management.console.feature/build.properties
+++ b/src/org.gluster.storage.management.console.feature/build.properties
diff --git a/src/com.gluster.storage.management.console.feature/feature.xml b/src/org.gluster.storage.management.console.feature/feature.xml
index aaf4a08c..3e1f0a2d 100644
--- a/src/com.gluster.storage.management.console.feature/feature.xml
+++ b/src/org.gluster.storage.management.console.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.gluster.storage.management.console.feature"
+      id="org.gluster.storage.management.console.feature"
       label="Gluster Management Console"
       version="1.0.0"
       provider-name="Gluster, Inc."
@@ -218,7 +218,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.console"
+         id="org.gluster.storage.management.console"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -621,7 +621,7 @@
          fragment="true"/>
 
    <plugin
-         id="com.gluster.storage.management.core"
+         id="org.gluster.storage.management.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -691,7 +691,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.client"
+         id="org.gluster.storage.management.client"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -773,7 +773,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.console.help"
+         id="org.gluster.storage.management.console.help"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
diff --git a/src/com.gluster.storage.management.console.help/.project b/src/org.gluster.storage.management.console.help/.project
index ba39c551..51640e5e 100644
--- a/src/com.gluster.storage.management.console.help/.project
+++ b/src/org.gluster.storage.management.console.help/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console.help</name>
+	<name>org.gluster.storage.management.console.help</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs
index 970d49e2..970d49e2 100644
--- a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs
+++ b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs
diff --git a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs
index d7503970..d7503970 100644
--- a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs
+++ b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs
diff --git a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.console.help/META-INF/MANIFEST.MF
index 7795e50d..ae61234a 100644
--- a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.console.help/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gluster Management Console - Help
-Bundle-SymbolicName: com.gluster.storage.management.console.help; singleton:=true
+Bundle-SymbolicName: org.gluster.storage.management.console.help;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: GLUSTER
 Require-Bundle: org.eclipse.help.ui;bundle-version="3.5.2",
diff --git a/src/com.gluster.storage.management.console.help/build.properties b/src/org.gluster.storage.management.console.help/build.properties
index 9fb97e12..9fb97e12 100644
--- a/src/com.gluster.storage.management.console.help/build.properties
+++ b/src/org.gluster.storage.management.console.help/build.properties
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/about_gmc.html b/src/org.gluster.storage.management.console.help/html/concepts/about_gmc.html
index ef79927b..ef79927b 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/about_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/about_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/about_gmg.html b/src/org.gluster.storage.management.console.help/html/concepts/about_gmg.html
index 34f9c860..34f9c860 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/about_gmg.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/about_gmg.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/common_terms.html b/src/org.gluster.storage.management.console.help/html/concepts/common_terms.html
index ccf6d218..ccf6d218 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/common_terms.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/common_terms.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/gluster_fs.html b/src/org.gluster.storage.management.console.help/html/concepts/gluster_fs.html
index 4efe5f36..4efe5f36 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/gluster_fs.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/gluster_fs.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html b/src/org.gluster.storage.management.console.help/html/concepts/maintopic.html
index a476078a..a476078a 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html b/src/org.gluster.storage.management.console.help/html/concepts/subtopic.html
index 8a61c501..8a61c501 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html b/src/org.gluster.storage.management.console.help/html/concepts/subtopic2.html
index 86bcbf9c..86bcbf9c 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/css/Builder/style.css b/src/org.gluster.storage.management.console.help/html/css/Builder/style.css
index 39efe946..39efe946 100644
--- a/src/com.gluster.storage.management.console.help/html/css/Builder/style.css
+++ b/src/org.gluster.storage.management.console.help/html/css/Builder/style.css
diff --git a/src/com.gluster.storage.management.console.help/html/css/builder-gluster/style.css b/src/org.gluster.storage.management.console.help/html/css/builder-gluster/style.css
index 80daf9fb..80daf9fb 100644
--- a/src/com.gluster.storage.management.console.help/html/css/builder-gluster/style.css
+++ b/src/org.gluster.storage.management.console.help/html/css/builder-gluster/style.css
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html
index 86bcbf9c..86bcbf9c 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html
index ff18004a..ff18004a 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/alerts.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/alerts.html
index 69033fff..69033fff 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/alerts.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/alerts.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/change_password.html
index d5189d98..d5189d98 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/change_password.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
index 76a44038..76a44038 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
index fa106b64..fa106b64 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
index 21ba31ec..21ba31ec 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
index 1b39f66a..1b39f66a 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html
index 8aee7171..8aee7171 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
index f8e5e954..f8e5e954 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html
index ee78defe..ee78defe 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html
index 77681663..77681663 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
index e6b44580..e6b44580 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html
index 94d26c03..94d26c03 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
index fad76f27..fad76f27 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html
index 96233f0e..96233f0e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html
index 17b7f0a8..17b7f0a8 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
index 790fc206..790fc206 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html
index 1326eb34..1326eb34 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
index a37ed7b4..a37ed7b4 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html
index 907f2d73..907f2d73 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html
index 723a6776..723a6776 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/security_keys.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/security_keys.html
index 5b723899..5b723899 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/security_keys.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/security_keys.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html
index 5673586e..5673586e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html
index e85d9324..e85d9324 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html
index 16db7708..16db7708 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html
index 13f9f54c..13f9f54c 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html
index 8f381665..8f381665 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
index 92641ccb..92641ccb 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
index 5ece5749..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
index d443ce80..d443ce80 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
index 86bcbf9c..86bcbf9c 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/tasks.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/tasks.html
index c5647b9a..c5647b9a 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/tasks.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/tasks.html
diff --git a/src/com.gluster.storage.management.console.help/html/help_home.html b/src/org.gluster.storage.management.console.help/html/help_home.html
index b9c17b9e..b9c17b9e 100644
--- a/src/com.gluster.storage.management.console.help/html/help_home.html
+++ b/src/org.gluster.storage.management.console.help/html/help_home.html
diff --git a/src/com.gluster.storage.management.console.help/html/images/Delete-brick.png b/src/org.gluster.storage.management.console.help/html/images/Delete-brick.png
index d93aa173..d93aa173 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Delete-brick.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Delete-brick.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg
index d57c6adc..d57c6adc 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg
index 7ae6ca8c..7ae6ca8c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg
index 06702e7b..06702e7b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_02.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_02.jpg
index 2aac60ff..2aac60ff 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_02.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_02.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_03.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_03.jpg
index 282c1407..282c1407 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_03.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_03.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_04.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_04.jpg
index 383aa719..383aa719 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_04.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_04.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_05.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_05.jpg
index 11f3096d..11f3096d 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_05.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_05.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_06.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_06.jpg
index 97323bd2..97323bd2 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_06.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_06.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_07.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_07.jpg
index fd7e4dd6..fd7e4dd6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_07.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_07.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_09.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_09.jpg
index 54a10c8c..54a10c8c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_09.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_09.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg
index 4480fd27..4480fd27 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg
index d609a373..d609a373 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg
index 4e39d5f4..4e39d5f4 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg
index e6b16ddb..e6b16ddb 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg
index 7b273913..7b273913 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg
index 9284e314..9284e314 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg
index 891ab993..891ab993 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg
index d3911aad..d3911aad 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg
index 452e8f20..452e8f20 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg
index c9674b51..c9674b51 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg
index 3c3d7d18..3c3d7d18 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg
index 08d26e41..08d26e41 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
index 66ac694e..66ac694e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
index 282c1407..282c1407 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
index e2aee777..e2aee777 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
index af7ba50a..af7ba50a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
index 6e39bc31..6e39bc31 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg
index 591b98dc..591b98dc 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
index 383aa719..383aa719 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
index 0f7dbfc5..0f7dbfc5 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg
index 74931bc9..74931bc9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_10.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_10.jpg
index 8a1bf08c..8a1bf08c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_10.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_10.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg
index 59c99311..59c99311 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg
index 133ef15d..133ef15d 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg
index d613a544..d613a544 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
index 7789034c..7789034c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg
index 4c5c2ae3..4c5c2ae3 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg
index a4b8a811..a4b8a811 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg
index 1ae4e0aa..1ae4e0aa 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg
index 1653d58b..1653d58b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg
index f8ab379a..f8ab379a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg
index e13b22a1..e13b22a1 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Charts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Charts.jpg
index b6d8edb0..b6d8edb0 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Charts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Charts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg
index ce31471c..ce31471c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg
index c6dcc77c..c6dcc77c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg
index 8af1267e..8af1267e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg
index 53e83ce6..53e83ce6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg
index 6a21e8b9..6a21e8b9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg
index 7529713c..7529713c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg
index 2f8ecfca..2f8ecfca 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg
index a128d182..a128d182 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg
index 51e97758..51e97758 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
index c6fc98f2..c6fc98f2 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg
index be89ddc7..be89ddc7 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg
index fe037755..fe037755 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg
index 1fdfb5f4..1fdfb5f4 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg
index 8bc1dc9e..8bc1dc9e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg
index 65e2bd9d..65e2bd9d 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
index 81ffa36c..81ffa36c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg
index 27ed8be4..27ed8be4 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg
index 7b684567..7b684567 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg
index 69366171..69366171 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg
index ef240296..ef240296 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg
index d57c6adc..d57c6adc 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg
index 7ae6ca8c..7ae6ca8c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg
index b1348c59..b1348c59 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg
index 78e33410..78e33410 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg
index 4d0f81e0..4d0f81e0 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg
index 2fa0cf6a..2fa0cf6a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg
index 1da58638..1da58638 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
index 45529823..45529823 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg
index 8f237ae5..8f237ae5 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg
index a62f4e60..a62f4e60 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
index e51eb1c6..e51eb1c6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg
index aaff5c0a..aaff5c0a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg
index 1198e0bf..1198e0bf 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg
index 4f970da7..4f970da7 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg
index 12a53350..12a53350 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg
index 62169ee8..62169ee8 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg
index ccef5b46..ccef5b46 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg
index 387e4b38..387e4b38 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
index b88c3030..b88c3030 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg
index c864ed1b..c864ed1b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
index cdf8f2f8..cdf8f2f8 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
index f6fd4f3b..f6fd4f3b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg
index 5b39e612..5b39e612 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg
index 3f0873a9..3f0873a9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg
index 603307e6..603307e6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg
index 1eeb7a0c..1eeb7a0c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
index 04813d79..04813d79 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
index 36d99160..36d99160 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
index 1d06d499..1d06d499 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg
index 4775a814..4775a814 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg
index 23287308..23287308 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg
index 1084c0f9..1084c0f9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg
index 6f70bc46..6f70bc46 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg
index c31f4a09..c31f4a09 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg
index 40d732ce..40d732ce 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg
index 693d94ff..693d94ff 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg
index 625bbe27..625bbe27 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
index 63f9cf9e..63f9cf9e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
index 63f9cf9e..63f9cf9e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg
index f5eb5fd3..f5eb5fd3 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg
index eee50db5..eee50db5 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
index 112af00e..112af00e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
index 08b4d358..08b4d358 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg
index f011d164..f011d164 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg
index c9153cf1..c9153cf1 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg
index c4f12744..c4f12744 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg
index 9e310025..9e310025 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
index a7c1d8ed..a7c1d8ed 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg
index e5626e4c..e5626e4c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg
index 8a1bf08c..8a1bf08c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg
index 049d15aa..049d15aa 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_settings.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_settings.jpg
index bd655794..bd655794 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_settings.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_settings.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg
index 99f3895f..99f3895f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg
index f9c78eb7..f9c78eb7 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg
index 0aa6668f..0aa6668f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg
index 99f3895f..99f3895f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg
index 2c5f7c2f..2c5f7c2f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg
index cf67682c..cf67682c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg
index d2d79b58..d2d79b58 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg b/src/org.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg
index 2c606b59..2c606b59 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg
index b093fc29..b093fc29 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png
index b506db1f..b506db1f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png
+++ b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg b/src/org.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg
index 64618ddf..64618ddf 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Migration.png b/src/org.gluster.storage.management.console.help/html/images/Migration.png
index 4ed6e054..4ed6e054 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Migration.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Migration.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Preferences-alerts .png b/src/org.gluster.storage.management.console.help/html/images/Preferences-alerts .png
index d7cefac3..d7cefac3 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Preferences-alerts .png
+++ b/src/org.gluster.storage.management.console.help/html/images/Preferences-alerts .png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Preferences-charts.png b/src/org.gluster.storage.management.console.help/html/images/Preferences-charts.png
index 89cabb06..89cabb06 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Preferences-charts.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Preferences-charts.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Preferences-gluster .png b/src/org.gluster.storage.management.console.help/html/images/Preferences-gluster .png
index f279b9fb..f279b9fb 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Preferences-gluster .png
+++ b/src/org.gluster.storage.management.console.help/html/images/Preferences-gluster .png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png b/src/org.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
index 7f3b192f..7f3b192f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol.jpg
index 124a1180..124a1180 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg
index ad87228b..ad87228b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg
index 6955996c..6955996c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg
index 581bf389..581bf389 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png b/src/org.gluster.storage.management.console.help/html/images/discovered_servers.png
index 2a4e2c5c..2a4e2c5c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png
+++ b/src/org.gluster.storage.management.console.help/html/images/discovered_servers.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/java-web-start.jpg b/src/org.gluster.storage.management.console.help/html/images/java-web-start.jpg
index 2a445b60..2a445b60 100644
--- a/src/com.gluster.storage.management.console.help/html/images/java-web-start.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/java-web-start.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/java_web_start.jpg b/src/org.gluster.storage.management.console.help/html/images/java_web_start.jpg
index 2a445b60..2a445b60 100644
--- a/src/com.gluster.storage.management.console.help/html/images/java_web_start.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/java_web_start.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/login-dialog.png b/src/org.gluster.storage.management.console.help/html/images/login-dialog.png
index 50051b96..50051b96 100644
--- a/src/com.gluster.storage.management.console.help/html/images/login-dialog.png
+++ b/src/org.gluster.storage.management.console.help/html/images/login-dialog.png
diff --git a/src/com.gluster.storage.management.console.help/html/reference/maintopic.html b/src/org.gluster.storage.management.console.help/html/reference/maintopic.html
index 8caa4cc2..8caa4cc2 100644
--- a/src/com.gluster.storage.management.console.help/html/reference/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/reference/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic.html b/src/org.gluster.storage.management.console.help/html/reference/subtopic.html
index c68dc748..c68dc748 100644
--- a/src/com.gluster.storage.management.console.help/html/reference/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/reference/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html b/src/org.gluster.storage.management.console.help/html/reference/subtopic2.html
index e5e31cd1..e5e31cd1 100644
--- a/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/reference/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html b/src/org.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
index 79c42427..79c42427 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/add_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/add_brick.html
index de0dc6ea..de0dc6ea 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/add_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/add_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html b/src/org.gluster.storage.management.console.help/html/tasks/add_servers.html
index b554a1dc..b554a1dc 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/add_servers.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/configure_gmc.html b/src/org.gluster.storage.management.console.help/html/tasks/configure_gmc.html
index 3c385014..3c385014 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/configure_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/configure_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html b/src/org.gluster.storage.management.console.help/html/tasks/create_cluster.html
index a2e0dff8..a2e0dff8 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/create_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html b/src/org.gluster.storage.management.console.help/html/tasks/create_volume.html
index 814835ec..814835ec 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/create_volume.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/delete_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/delete_brick.html
index a5de99af..a5de99af 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/delete_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/delete_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html b/src/org.gluster.storage.management.console.help/html/tasks/delete_volume.html
index 43d51231..43d51231 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/delete_volume.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html b/src/org.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
index 688fa54d..688fa54d 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/display_log.html b/src/org.gluster.storage.management.console.help/html/tasks/display_log.html
index 4575fd18..4575fd18 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/display_log.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/display_log.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/download_log.html b/src/org.gluster.storage.management.console.help/html/tasks/download_log.html
index 4d36b0c4..4d36b0c4 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/download_log.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/download_log.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html b/src/org.gluster.storage.management.console.help/html/tasks/initialize_disk.html
index d50e4a9f..d50e4a9f 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/initialize_disk.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/logging.html b/src/org.gluster.storage.management.console.help/html/tasks/logging.html
index e936e7ed..e936e7ed 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/logging.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/logging.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html b/src/org.gluster.storage.management.console.help/html/tasks/maintopic (3).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/maintopic (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html b/src/org.gluster.storage.management.console.help/html/tasks/maintopic.html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/migrate_brick.html
index b5202f25..b5202f25 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/migrate_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html b/src/org.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
index 63bf3050..63bf3050 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html b/src/org.gluster.storage.management.console.help/html/tasks/register_cluster.html
index ef1c66bd..ef1c66bd 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/register_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/remove_brick.html
index fbbfb89e..fbbfb89e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/remove_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html b/src/org.gluster.storage.management.console.help/html/tasks/remove_server.html
index d432143d..d432143d 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/remove_server.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html b/src/org.gluster.storage.management.console.help/html/tasks/select_cluster.html
index a3dc9466..a3dc9466 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/select_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html b/src/org.gluster.storage.management.console.help/html/tasks/start_vol.html
index 4b3e76d6..4b3e76d6 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/start_vol.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html b/src/org.gluster.storage.management.console.help/html/tasks/starting_gmc.html
index 933e72ed..933e72ed 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/starting_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html b/src/org.gluster.storage.management.console.help/html/tasks/stop_vol.html
index c97d1d91..c97d1d91 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/stop_vol.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
index 5ece5749..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2.html
index 5ece5749..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic3.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic3.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic3.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic3.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic4.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic4.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic4.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic4.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic5.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic5.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic5.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic5.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic6.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic6.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic6.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic6.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html b/src/org.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html
index b9dc0e72..b9dc0e72 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/volumes.html b/src/org.gluster.storage.management.console.help/html/tasks/volumes.html
index 84532085..84532085 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/volumes.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/volumes.html
diff --git a/src/com.gluster.storage.management.console.help/html/toc.html b/src/org.gluster.storage.management.console.help/html/toc.html
index 83401387..83401387 100644
--- a/src/com.gluster.storage.management.console.help/html/toc.html
+++ b/src/org.gluster.storage.management.console.help/html/toc.html
diff --git a/src/com.gluster.storage.management.console.help/plugin.xml b/src/org.gluster.storage.management.console.help/plugin.xml
index 13c39574..13c39574 100644
--- a/src/com.gluster.storage.management.console.help/plugin.xml
+++ b/src/org.gluster.storage.management.console.help/plugin.xml
diff --git a/src/com.gluster.storage.management.console.help/toc.xml b/src/org.gluster.storage.management.console.help/toc.xml
index 99a3ff5c..99a3ff5c 100644
--- a/src/com.gluster.storage.management.console.help/toc.xml
+++ b/src/org.gluster.storage.management.console.help/toc.xml
diff --git a/src/com.gluster.storage.management.console.help/tocconcepts.xml b/src/org.gluster.storage.management.console.help/tocconcepts.xml
index 23a9c2a0..23a9c2a0 100644
--- a/src/com.gluster.storage.management.console.help/tocconcepts.xml
+++ b/src/org.gluster.storage.management.console.help/tocconcepts.xml
diff --git a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml b/src/org.gluster.storage.management.console.help/tocgettingstarted.xml
index e25ec655..e25ec655 100644
--- a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
+++ b/src/org.gluster.storage.management.console.help/tocgettingstarted.xml
diff --git a/src/com.gluster.storage.management.console.help/tocreference.xml b/src/org.gluster.storage.management.console.help/tocreference.xml
index 660cdecc..660cdecc 100644
--- a/src/com.gluster.storage.management.console.help/tocreference.xml
+++ b/src/org.gluster.storage.management.console.help/tocreference.xml
diff --git a/src/com.gluster.storage.management.console.help/toctasks.xml b/src/org.gluster.storage.management.console.help/toctasks.xml
index ced68d9f..ced68d9f 100644
--- a/src/com.gluster.storage.management.console.help/toctasks.xml
+++ b/src/org.gluster.storage.management.console.help/toctasks.xml
diff --git a/src/com.gluster.storage.management.console/.classpath b/src/org.gluster.storage.management.console/.classpath
index ad32c83a..ad32c83a 100644
--- a/src/com.gluster.storage.management.console/.classpath
+++ b/src/org.gluster.storage.management.console/.classpath
diff --git a/src/com.gluster.storage.management.console/.project b/src/org.gluster.storage.management.console/.project
index 179cac7b..dff371c7 100644
--- a/src/com.gluster.storage.management.console/.project
+++ b/src/org.gluster.storage.management.console/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console</name>
+	<name>org.gluster.storage.management.console</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
index abf7cf5a..abf7cf5a 100644
--- a/src/com.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.console/META-INF/MANIFEST.MF
index 4194aae3..7643adf4 100644
--- a/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.console/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: glustersp-gui
-Bundle-SymbolicName: com.gluster.storage.management.console;singleton:=true
+Bundle-SymbolicName: org.gluster.storage.management.console;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-Activator: com.gluster.storage.management.console.Activator
+Bundle-Activator: org.gluster.storage.management.console.Activator
 Bundle-Vendor: Gluster
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui.forms;bundle-version="3.5.2",
  org.eclipse.rcp;bundle-version="3.6.0",
- com.gluster.storage.management.core;bundle-version="1.0.0",
- com.gluster.storage.management.client;bundle-version="1.0.0",
+ org.gluster.storage.management.core;bundle-version="1.0.0",
+ org.gluster.storage.management.client;bundle-version="1.0.0",
  org.eclipse.core.databinding;bundle-version="1.3.100",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
  org.eclipse.core.databinding.property;bundle-version="1.3.0",
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  com.richclientgui.rcptoolbox;bundle-version="1.0.5",
  org.eclipse.core.resources,
  org.apache.commons.lang;bundle-version="2.3.0",
- com.gluster.storage.management.console.help;bundle-version="1.0.0",
+ org.gluster.storage.management.console.help;bundle-version="1.0.0",
  org.eclipse.tm.terminal;bundle-version="3.1.0",
  org.eclipse.tm.terminal.ssh;bundle-version="2.1.0",
  org.eclipse.tm.terminal.view;bundle-version="2.2.0"
diff --git a/src/com.gluster.storage.management.console/build.properties b/src/org.gluster.storage.management.console/build.properties
index bebdd10c..bebdd10c 100644
--- a/src/com.gluster.storage.management.console/build.properties
+++ b/src/org.gluster.storage.management.console/build.properties
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-down.png b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
index 3dd7fccd..3dd7fccd 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-up.png b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
index fa9a7d71..fa9a7d71 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/bricks.png b/src/org.gluster.storage.management.console/icons/tango/16x16/bricks.png
index ed381bd5..ed381bd5 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/bricks.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/bricks.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/close_task.png b/src/org.gluster.storage.management.console/icons/tango/16x16/close_task.png
index 933272b4..933272b4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/close_task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/close_task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/cluster.png b/src/org.gluster.storage.management.console/icons/tango/16x16/cluster.png
index c9348a21..c9348a21 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/cluster.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/cluster.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-available.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-available.png
index c3c5f3b1..c3c5f3b1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-available.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-available.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-error.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-error.png
index 314fa2f3..314fa2f3 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-error.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-error.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
index 71d0107c..71d0107c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
index e4954c6a..e4954c6a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
index ba3b48a4..ba3b48a4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk.png
index b74fb20e..b74fb20e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png b/src/org.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
index f92e472d..f92e472d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/help.png b/src/org.gluster.storage.management.console/icons/tango/16x16/help.png
index f25fc3fb..f25fc3fb 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/help.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/help.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/logs.png b/src/org.gluster.storage.management.console/icons/tango/16x16/logs.png
index 124f322f..124f322f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/logs.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/logs.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/offline-brick.png b/src/org.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
index 48812db8..48812db8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/online-brick.png b/src/org.gluster.storage.management.console/icons/tango/16x16/online-brick.png
index da895838..da895838 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/online-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/online-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/pause.png b/src/org.gluster.storage.management.console/icons/tango/16x16/pause.png
index 04923149..04923149 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/pause.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/pause.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/question.png b/src/org.gluster.storage.management.console/icons/tango/16x16/question.png
index 30a47032..30a47032 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/question.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/question.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/running-task.png b/src/org.gluster.storage.management.console/icons/tango/16x16/running-task.png
index ad679b8b..ad679b8b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/running-task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/running-task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/server.png b/src/org.gluster.storage.management.console/icons/tango/16x16/server.png
index d0b397be..d0b397be 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/servers.png b/src/org.gluster.storage.management.console/icons/tango/16x16/servers.png
index 0efee57e..0efee57e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/servers.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/servers.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/settings.png b/src/org.gluster.storage.management.console/icons/tango/16x16/settings.png
index d90ab661..d90ab661 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/settings.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/settings.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/start.png b/src/org.gluster.storage.management.console/icons/tango/16x16/start.png
index d4413259..d4413259 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/start.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/start.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/status-offline.png b/src/org.gluster.storage.management.console/icons/tango/16x16/status-offline.png
index dbd0204e..dbd0204e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/status-offline.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/status-offline.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/status-online.png b/src/org.gluster.storage.management.console/icons/tango/16x16/status-online.png
index a31ba599..a31ba599 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/status-online.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/status-online.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/stop.png b/src/org.gluster.storage.management.console/icons/tango/16x16/stop.png
index 8f591c63..8f591c63 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/stop.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/stop.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/task-completed.png b/src/org.gluster.storage.management.console/icons/tango/16x16/task-completed.png
index 5de2361a..5de2361a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/task-completed.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/task-completed.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/task-error.png b/src/org.gluster.storage.management.console/icons/tango/16x16/task-error.png
index 1fc66ad2..1fc66ad2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/task-error.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/task-error.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png b/src/org.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png
index c5b797a7..c5b797a7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/view-refresh.png b/src/org.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
index 3fd71d6e..3fd71d6e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-create.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-create.png
index 628f4d50..628f4d50 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-create.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-create.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-options.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-options.png
index d7665cb7..d7665cb7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-options.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-options.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volume.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volume.png
index 41376404..41376404 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volumes.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volumes.png
index 18c2ad8b..18c2ad8b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volumes.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volumes.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png b/src/org.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
index 73ecf4c0..73ecf4c0 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png b/src/org.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
index b7c166ab..b7c166ab 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png b/src/org.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
index 983012ad..983012ad 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png b/src/org.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png
index 48a66c8c..48a66c8c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
index 3a627598..3a627598 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-server.png b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-server.png
index 5900c724..5900c724 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-volume.png b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-volume.png
index fa3a64f9..fa3a64f9 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/server-warning.png b/src/org.gluster.storage.management.console/icons/tango/22x22/server-warning.png
index 9e2da0bc..9e2da0bc 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/server-warning.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/server-warning.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/system-search.png b/src/org.gluster.storage.management.console/icons/tango/22x22/system-search.png
index 4e522b23..4e522b23 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/system-search.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/system-search.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png b/src/org.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png
index ceb0fb99..ceb0fb99 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png b/src/org.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
index 4539822c..4539822c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
index 925c8b44..925c8b44 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick.png b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick.png
index 81304ab4..81304ab4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-server.png b/src/org.gluster.storage.management.console/icons/tango/32x32/add-server.png
index 29a512f2..29a512f2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/add-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/add-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
index af8884e3..af8884e3 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task.png b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task.png
index db17be6b..db17be6b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png
index 89ccbd4d..89ccbd4d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task.png b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task.png
index ff0c9452..ff0c9452 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
index d7b69f97..d7b69f97 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume.png
index b43289b6..b43289b6 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/disk.png b/src/org.gluster.storage.management.console/icons/tango/32x32/disk.png
index b34d8b77..b34d8b77 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/disk.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/disk.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/download-log.png b/src/org.gluster.storage.management.console/icons/tango/32x32/download-log.png
index 62bf9d7e..62bf9d7e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/download-log.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/download-log.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/help.png b/src/org.gluster.storage.management.console/icons/tango/32x32/help.png
index d60425f7..d60425f7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/help.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/help.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/log-rotate.png b/src/org.gluster.storage.management.console/icons/tango/32x32/log-rotate.png
index a1ceebbf..a1ceebbf 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/log-rotate.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/log-rotate.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/logs.png b/src/org.gluster.storage.management.console/icons/tango/32x32/logs.png
index b62959e4..b62959e4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/logs.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/logs.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png
index 8a1e82a7..8a1e82a7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png
index 999332a5..999332a5 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png
index 7b023e3d..7b023e3d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/pause.png b/src/org.gluster.storage.management.console/icons/tango/32x32/pause.png
index 597bc014..597bc014 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/pause.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/pause.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
index 8dbbf3c1..8dbbf3c1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
index 83a657a2..83a657a2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
index 3f31d216..3f31d216 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server.png
index fba00869..fba00869 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
index 5eb09cfd..5eb09cfd 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
index b7392805..b7392805 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
index c4c955f5..c4c955f5 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
index 77203284..77203284 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/server.png b/src/org.gluster.storage.management.console/icons/tango/32x32/server.png
index e34eb4e4..e34eb4e4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/servers.png b/src/org.gluster.storage.management.console/icons/tango/32x32/servers.png
index dca03af4..dca03af4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/servers.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/servers.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/settings.png b/src/org.gluster.storage.management.console/icons/tango/32x32/settings.png
index 565f406d..565f406d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/settings.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/settings.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-disabled.png
index 3f38a449..3f38a449 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
index ad14408b..ad14408b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume.png
index d357d291..d357d291 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start.png
index 578736ec..578736ec 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png
index 3c778c3d..3c778c3d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
index b70b2042..b70b2042 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
index 5cc5e1fb..5cc5e1fb 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop.png
index 615e465b..615e465b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png b/src/org.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png
index f86c7840..f86c7840 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/view-refresh.png b/src/org.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
index 606ea9eb..606ea9eb 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
index 35d49af7..35d49af7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
index eb63ec20..eb63ec20 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/volume.png
index 3e0d9add..3e0d9add 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/add-server.png b/src/org.gluster.storage.management.console/icons/tango/48x48/add-server.png
index 3e615b62..3e615b62 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/add-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/add-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/create-volume.png b/src/org.gluster.storage.management.console/icons/tango/48x48/create-volume.png
index 88a494cc..88a494cc 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/create-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/create-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
index 368b6696..368b6696 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/server.png b/src/org.gluster.storage.management.console/icons/tango/48x48/server.png
index a568c0b8..a568c0b8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
index fcf25df4..fcf25df4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
index f418875a..f418875a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/8x8/offline.png b/src/org.gluster.storage.management.console/icons/tango/8x8/offline.png
index 6b33d298..6b33d298 100644
--- a/src/com.gluster.storage.management.console/icons/tango/8x8/offline.png
+++ b/src/org.gluster.storage.management.console/icons/tango/8x8/offline.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/8x8/online.png b/src/org.gluster.storage.management.console/icons/tango/8x8/online.png
index 58a61f1a..58a61f1a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/8x8/online.png
+++ b/src/org.gluster.storage.management.console/icons/tango/8x8/online.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/8x8/star.png b/src/org.gluster.storage.management.console/icons/tango/8x8/star.png
index 5f8fc748..5f8fc748 100644
--- a/src/com.gluster.storage.management.console/icons/tango/8x8/star.png
+++ b/src/org.gluster.storage.management.console/icons/tango/8x8/star.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/add_brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
index b1fb427c..b1fb427c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/add_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
index 66307f36..66307f36 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/brick.svg
index 365110f2..365110f2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
index 1fa4e0d4..1fa4e0d4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/bricks.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/bricks.svg
index 39af40f2..39af40f2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/bricks.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/bricks.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/cloud.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/cloud.svg
index d51128ac..d51128ac 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/cloud.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/cloud.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
index 2cc8da4e..2cc8da4e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
index 14a5823f..14a5823f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
index bfe35cce..bfe35cce 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
index 79f172df..79f172df 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk.svg
index 730e9b27..730e9b27 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_available.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
index 667535c1..667535c1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_error.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
index 1dda3bbf..1dda3bbf 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
index 5bffaa8f..5bffaa8f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
index 5d5388b2..5d5388b2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
index f3cdd2ee..f3cdd2ee 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/download_log.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/download_log.svg
index 2ac27d12..2ac27d12 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/download_log.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/download_log.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
index 1ed67ab8..1ed67ab8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
index 0ee3b389..0ee3b389 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/log.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/log.svg
index 42559766..42559766 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/log.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/log.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
index dc5faa1b..dc5faa1b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
index fb587339..fb587339 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline.svg
index 9ee10367..9ee10367 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg
index bf1963df..bf1963df 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
index 5bc030db..5bc030db 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_server.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
index f1f50c40..f1f50c40 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
index 8146a910..8146a910 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
index 8cef7653..8cef7653 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/online.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/online.svg
index c25a4232..c25a4232 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/online.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/online.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/remove-server.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
index 4280df60..4280df60 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
index 450b24c8..450b24c8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
index 83055628..83055628 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
index cd048c2b..cd048c2b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/running_task.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/running_task.svg
index d9cf0582..d9cf0582 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/running_task.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/running_task.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
index f3027569..f3027569 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
index 3ef559c7..3ef559c7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/start_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
index 5e738c33..5e738c33 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
index 315bb09b..315bb09b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_clear.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
index 02b0b919..02b0b919 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_commit.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
index 29817471..29817471 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_pause.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
index ff9b5f3e..ff9b5f3e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_paused.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
index 9d6930e1..9d6930e1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_resume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
index 2bd8732c..2bd8732c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_running.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_running.svg
index fa15b7b8..fa15b7b8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_running.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_running.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
index ce0bf238..ce0bf238 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
index 5fb8b116..5fb8b116 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stop.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
index 07227fd4..07227fd4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
index d900f03f..d900f03f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg
index 995fb90b..995fb90b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
index 565f6dad..565f6dad 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volume.svg
index b5e50a46..b5e50a46 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_option.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
index 3fb4a928..3fb4a928 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
index 78fdc384..78fdc384 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volumes.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volumes.svg
index 3c99b006..3c99b006 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volumes.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volumes.svg
diff --git a/src/com.gluster.storage.management.console/images/gauge.png b/src/org.gluster.storage.management.console/images/gauge.png
index 6f5764ea..6f5764ea 100644
--- a/src/com.gluster.storage.management.console/images/gauge.png
+++ b/src/org.gluster.storage.management.console/images/gauge.png
diff --git a/src/com.gluster.storage.management.console/images/gauge_small.png b/src/org.gluster.storage.management.console/images/gauge_small.png
index 71e424fe..71e424fe 100644
--- a/src/com.gluster.storage.management.console/images/gauge_small.png
+++ b/src/org.gluster.storage.management.console/images/gauge_small.png
diff --git a/src/com.gluster.storage.management.console/images/gluster-about.png b/src/org.gluster.storage.management.console/images/gluster-about.png
index 9518b2b2..9518b2b2 100644
--- a/src/com.gluster.storage.management.console/images/gluster-about.png
+++ b/src/org.gluster.storage.management.console/images/gluster-about.png
diff --git a/src/com.gluster.storage.management.console/images/login-screen-with-text.psd b/src/org.gluster.storage.management.console/images/login-screen-with-text.psd
index f6e7ab35..f6e7ab35 100644
--- a/src/com.gluster.storage.management.console/images/login-screen-with-text.psd
+++ b/src/org.gluster.storage.management.console/images/login-screen-with-text.psd
diff --git a/src/com.gluster.storage.management.console/images/login-screen.psd b/src/org.gluster.storage.management.console/images/login-screen.psd
index a9bfc27e..a9bfc27e 100644
--- a/src/com.gluster.storage.management.console/images/login-screen.psd
+++ b/src/org.gluster.storage.management.console/images/login-screen.psd
diff --git a/src/com.gluster.storage.management.console/images/splash-dialog.bmp b/src/org.gluster.storage.management.console/images/splash-dialog.bmp
index 932032fb..932032fb 100644
--- a/src/com.gluster.storage.management.console/images/splash-dialog.bmp
+++ b/src/org.gluster.storage.management.console/images/splash-dialog.bmp
diff --git a/src/com.gluster.storage.management.console/images/splash-screen.psd b/src/org.gluster.storage.management.console/images/splash-screen.psd
index 43544f41..43544f41 100644
--- a/src/com.gluster.storage.management.console/images/splash-screen.psd
+++ b/src/org.gluster.storage.management.console/images/splash-screen.psd
diff --git a/src/com.gluster.storage.management.console/plugin.properties b/src/org.gluster.storage.management.console/plugin.properties
index 5393818f..5393818f 100644
--- a/src/com.gluster.storage.management.console/plugin.properties
+++ b/src/org.gluster.storage.management.console/plugin.properties
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/org.gluster.storage.management.console/plugin.xml
index fa949443..f80c72e1 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/org.gluster.storage.management.console/plugin.xml
@@ -7,7 +7,7 @@
          point="org.eclipse.core.runtime.applications">
       <application>
          <run
-               class="com.gluster.storage.management.console.Application">
+               class="org.gluster.storage.management.console.Application">
          </run>
       </application>
    </extension>
@@ -15,163 +15,163 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             name="Gluster Perspective"
-            class="com.gluster.storage.management.console.Perspective"
-            id="com.gluster.storage.management.console.Perspective">
+            class="org.gluster.storage.management.console.Perspective"
+            id="org.gluster.storage.management.console.Perspective">
       </perspective>
    </extension>
    <extension
          point="org.eclipse.ui.views">
       <view
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.NavigationView"
-            id="com.gluster.storage.management.console.views.NavigationView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.NavigationView"
+            id="org.gluster.storage.management.console.views.NavigationView"
             name="Cluster Navigation Tree"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.DiscoveredServersView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.DiscoveredServersView"
             icon="icons/tango/16x16/servers.png"
-            id="com.gluster.storage.management.console.views.DiscoveredServersView"
+            id="org.gluster.storage.management.console.views.DiscoveredServersView"
             name="Discovered Servers"
             restorable="true">
       </view>
       <view
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.DiscoveredServerView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.DiscoveredServerView"
             icon="icons/tango/16x16/server.png"
-            id="com.gluster.storage.management.console.views.DiscoveredServerView"
+            id="org.gluster.storage.management.console.views.DiscoveredServerView"
             name="Discovered Server"
             restorable="true">
       </view>
       <category
-            id="com.gluster.storage.management.console.category"
+            id="org.gluster.storage.management.console.category"
             name="Gluster Managament Console">
       </category>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumesView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumesView"
             icon="icons/tango/16x16/volumes.png"
-            id="com.gluster.storage.management.console.views.VolumesView"
+            id="org.gluster.storage.management.console.views.VolumesView"
             name="Volumes"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumesSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumesSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.VolumesSummaryView"
+            id="org.gluster.storage.management.console.views.VolumesSummaryView"
             name="Summary (Volumes)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.ClusterSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.ClusterSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.ClusterSummaryView"
+            id="org.gluster.storage.management.console.views.ClusterSummaryView"
             name="Summary (Cluster)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.VolumeSummaryView"
+            id="org.gluster.storage.management.console.views.VolumeSummaryView"
             name="Summary (Volume)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeBricksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeBricksView"
             icon="icons/tango/16x16/bricks.png"
-            id="com.gluster.storage.management.console.views.VolumeBricksView"
+            id="org.gluster.storage.management.console.views.VolumeBricksView"
             name="Bricks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeOptionsView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeOptionsView"
             icon="icons/tango/16x16/volume-options.png"
-            id="com.gluster.storage.management.console.views.VolumeOptionsView"
+            id="org.gluster.storage.management.console.views.VolumeOptionsView"
             name="Volume Options"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeLogsView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeLogsView"
             icon="icons/tango/16x16/logs.png"
-            id="com.gluster.storage.management.console.views.VolumeLogsView"
+            id="org.gluster.storage.management.console.views.VolumeLogsView"
             name="Volume Logs"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServersSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServersSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.GlusterServersSummaryView"
+            id="org.gluster.storage.management.console.views.GlusterServersSummaryView"
             name="Summary (Servers)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServersView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServersView"
             icon="icons/tango/16x16/servers.png"
-            id="com.gluster.storage.management.console.views.GlusterServersView"
+            id="org.gluster.storage.management.console.views.GlusterServersView"
             name="Servers"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.DisksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.DisksView"
             icon="icons/tango/16x16/disk.png"
-            id="com.gluster.storage.management.console.views.DisksView"
+            id="org.gluster.storage.management.console.views.DisksView"
             name="Disks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServerSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServerSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.GlusterServerSummaryView"
+            id="org.gluster.storage.management.console.views.GlusterServerSummaryView"
             name="Summary (Server)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServerDisksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServerDisksView"
             icon="icons/tango/16x16/disk.png"
-            id="com.gluster.storage.management.console.views.GlusterServerDisksView"
+            id="org.gluster.storage.management.console.views.GlusterServerDisksView"
             name="Server Disks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServerLogsView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServerLogsView"
             icon="icons/tango/16x16/logs.png"
-            id="com.gluster.storage.management.console.views.GlusterServerLogsView"
+            id="org.gluster.storage.management.console.views.GlusterServerLogsView"
             name="Server Logs"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.TasksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.TasksView"
             icon="icons/tango/16x16/running-task.png"
-            id="com.gluster.storage.management.console.views.TasksView"
+            id="org.gluster.storage.management.console.views.TasksView"
             name="Tasks"
             restorable="true">
       </view>
@@ -180,221 +180,221 @@
          point="org.eclipse.ui.commands">
       <category
             name="Gluster Commands"
-            id="com.gluster.storage.management.console.category">
+            id="org.gluster.storage.management.console.category">
       </category>
       <command
             name="Create Volume"
             description="Create a new Volume"
-            categoryId="com.gluster.storage.management.console.category"
-            id="com.gluster.storage.management.console.commands.CreateVolume">
+            categoryId="org.gluster.storage.management.console.category"
+            id="org.gluster.storage.management.console.commands.CreateVolume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Delete Volume"
-            id="com.gluster.storage.management.console.commands.DeleteVolume"
+            id="org.gluster.storage.management.console.commands.DeleteVolume"
             name="Delete Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Start Volume"
-            id="com.gluster.storage.management.console.commands.StartVolume"
+            id="org.gluster.storage.management.console.commands.StartVolume"
             name="Start Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Stop Volume"
-            id="com.gluster.storage.management.console.commands.StopVolume"
+            id="org.gluster.storage.management.console.commands.StopVolume"
             name="Stop Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Edit Volume"
-            id="com.gluster.storage.management.console.commands.EditVolume"
+            id="org.gluster.storage.management.console.commands.EditVolume"
             name="Edit Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Reset all options of a Volume"
-            id="com.gluster.storage.management.console.commands.ResetVolumeOptions"
+            id="org.gluster.storage.management.console.commands.ResetVolumeOptions"
             name="Reset Options">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Rebalance Volume"
-            id="com.gluster.storage.management.console.commands.RebalanceVolume"
+            id="org.gluster.storage.management.console.commands.RebalanceVolume"
             name="Rebalance Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Add Server(s) to Cluster"
-            id="com.gluster.storage.management.console.commands.AddServer"
+            id="org.gluster.storage.management.console.commands.AddServer"
             name="Add Server(s)">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Remove Server(s) from Cluster"
-            id="com.gluster.storage.management.console.commands.RemoveServer"
+            id="org.gluster.storage.management.console.commands.RemoveServer"
             name="Remove Server(s)">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Migrate Brick"
-            id="com.gluster.storage.management.console.commands.MigrateDisk"
+            id="org.gluster.storage.management.console.commands.MigrateDisk"
             name="Migrate Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Remove Brick"
-            id="com.gluster.storage.management.console.commands.RemoveDisk"
+            id="org.gluster.storage.management.console.commands.RemoveDisk"
             name="Remove Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Add Brick"
-            id="com.gluster.storage.management.console.commands.AddDisk"
+            id="org.gluster.storage.management.console.commands.AddDisk"
             name="Add Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Pause Task"
-            id="com.gluster.storage.management.console.commands.Pause"
+            id="org.gluster.storage.management.console.commands.Pause"
             name="Pause">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Resume Task"
-            id="com.gluster.storage.management.console.commands.Resume"
+            id="org.gluster.storage.management.console.commands.Resume"
             name="Resume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Stop Task"
-            id="com.gluster.storage.management.console.commands.Stop"
+            id="org.gluster.storage.management.console.commands.Stop"
             name="Stop">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Delete Task"
-            id="com.gluster.storage.management.console.commands.Delete"
+            id="org.gluster.storage.management.console.commands.Delete"
             name="Delete">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Change Password"
-            id="com.gluster.storage.management.console.commands.ChangePassword"
+            id="org.gluster.storage.management.console.commands.ChangePassword"
             name="Change Password">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Refresh Data"
-            id="com.gluster.storage.management.console.commands.Refresh"
+            id="org.gluster.storage.management.console.commands.Refresh"
             name="Refresh Data">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Terminal"
-            id="com.gluster.storage.management.console.commands.Terminal"
+            id="org.gluster.storage.management.console.commands.Terminal"
             name="Terminal">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Settings"
-            id="com.gluster.storage.management.console.commands.Preferences"
+            id="org.gluster.storage.management.console.commands.Preferences"
             name="Settings">
       </command>
       <command
             description="Volume Log Rotate"
-            id="com.gluster.storage.management.console.commands.LogRotate"
+            id="org.gluster.storage.management.console.commands.LogRotate"
             name="LogRotate">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="com.gluster.storage.management.console.commands.CreateVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.CreateVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+C">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.DeleteVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.DeleteVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+D">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.StartVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.StartVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+S">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.StopVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.StopVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+T">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.EditVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.EditVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+E">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.RebalanceVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.RebalanceVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+B">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.AddServer"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.AddServer"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+A">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.RemoveServer"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.RemoveServer"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+R">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.MigrateDisk"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.MigrateDisk"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+M">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.Preferences"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.Preferences"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+P">
       </key>
       <key
             commandId="org.eclipse.ui.window.showKeyAssist"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+L">
       </key>
       <key
             commandId="org.eclipse.ui.navigate.nextTab"
             contextId="org.eclipse.ui.contexts.window"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="ALT+ARROW_RIGHT">
       </key>
       <key
             commandId="org.eclipse.ui.navigate.previousTab"
             contextId="org.eclipse.ui.contexts.window"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="ALT+ARROW_LEFT">
       </key>
       <scheme
             description="Default Key Bindings Scheme for Gluster Management Console"
-            id="com.gluster.storage.management.console.KeyConfig"
+            id="org.gluster.storage.management.console.KeyConfig"
             name="Gluster">
       </scheme>
       <key
-            commandId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.ResetVolumeOptions"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+O">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.Refresh"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.Refresh"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="F5">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.Terminal"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.Terminal"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+T">
       </key>
    </extension>
@@ -403,7 +403,7 @@
          name="Gluster Management Console"
          point="org.eclipse.core.runtime.products">
       <product
-            application="com.gluster.storage.management.console.application"
+            application="org.gluster.storage.management.console.application"
             name="Gluster Management Console">
          <property
                name="aboutText"
@@ -431,18 +431,18 @@
          point="org.eclipse.ui.actionSets">
       <actionSet
             description="Set of actions that can be performed on multiple Volumes"
-            id="com.gluster.storage.management.console.actionsets.volumes"
+            id="org.gluster.storage.management.console.actionsets.volumes"
             label="Volumes Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                disabledIcon="icons/tango/32x32/remove-volume-disabled.png"
                icon="icons/tango/32x32/remove-volume.png"
-               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume(s)"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -452,13 +452,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StopVolume"
+               class="org.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StopVolume"
                disabledIcon="icons/tango/32x32/stop-volume-disabled.png"
                icon="icons/tango/32x32/stop-volume.png"
-               id="com.gluster.storage.management.console.actions.StopVolumeAction"
+               id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume(s)"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -468,13 +468,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StartVolume"
+               class="org.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StartVolume"
                disabledIcon="icons/tango/32x32/start-volume-disabled.png"
                icon="icons/tango/32x32/start-volume.png"
-               id="com.gluster.storage.management.console.actions.StartVolumeAction"
+               id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume(s)"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -484,12 +484,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -499,11 +499,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -512,7 +512,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.actionsets.volumes"
+               id="org.gluster.storage.management.console.actionsets.volumes"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -522,27 +522,27 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on a single volume"
-            id="com.gluster.storage.management.console.actionsets.volume"
+            id="org.gluster.storage.management.console.actionsets.volume"
             label="Volume Actions"
             visible="false">
          <action
-               class="com.gluster.storage.management.console.actions.ForceStartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.ForceStartVolume"
+               class="org.gluster.storage.management.console.actions.ForceStartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.ForceStartVolume"
                icon="icons/tango/32x32/start-volume.png"
-               id="com.gluster.storage.management.console.actions.ForceStartVolumeAction"
+               id="org.gluster.storage.management.console.actions.ForceStartVolumeAction"
                label="Start Offline Bricks"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                style="push"
                toolbarPath="Normal"
                tooltip="Start all Offline Bricks of the selected Volume">
          </action>
          <action
-               class="com.gluster.storage.management.console.actions.VolumeLogRotateAction"
-               definitionId="com.gluster.storage.management.console.commands.LogRotate"
+               class="org.gluster.storage.management.console.actions.VolumeLogRotateAction"
+               definitionId="org.gluster.storage.management.console.commands.LogRotate"
                icon="icons/tango/32x32/log-rotate.png"
-               id="com.gluster.storage.management.console.actions.LogRotateAction"
+               id="org.gluster.storage.management.console.actions.LogRotateAction"
                label="L&amp;og Rotate"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                state="true"
                style="push"
@@ -551,13 +551,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.MigrateBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.MigrateDisk"
+               class="org.gluster.storage.management.console.actions.MigrateBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.MigrateDisk"
                disabledIcon="icons/tango/32x32/migrate-brick-disabled.png"
                icon="icons/tango/32x32/migrate-brick.png"
-               id="com.gluster.storage.management.console.actions.MigrateDiskAction"
+               id="org.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Brick"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -566,19 +566,19 @@
                tooltip="Migrate Brick">
                <enablement>
                    <objectClass
-                         name="com.gluster.storage.management.core.model.Brick">
+                         name="org.gluster.storage.management.core.model.Brick">
                    </objectClass>
                </enablement>
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                disabledIcon="icons/tango/32x32/remove-volume-disabled.png"
                icon="icons/tango/32x32/remove-volume.png"
-               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -588,12 +588,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
-               definitionId="com.gluster.storage.management.console.commands.DownloadVolumeLogs"
+               class="org.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
+               definitionId="org.gluster.storage.management.console.commands.DownloadVolumeLogs"
                icon="icons/tango/32x32/download-log.png"
-               id="com.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
+               id="org.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
                label="Download &amp;Logs"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -603,13 +603,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
-               definitionId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
+               class="org.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
+               definitionId="org.gluster.storage.management.console.commands.ResetVolumeOptions"
                disabledIcon="icons/tango/32x32/reset-volume-option-disabled.png"
                icon="icons/tango/32x32/reset-volume-option.png"
-               id="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
+               id="org.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
                label="Reset &amp;Options"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -619,13 +619,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
+               class="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.RebalanceVolume"
                disabledIcon="icons/tango/32x32/volume-rebalance-disabled.png"
                icon="icons/tango/32x32/volume-rebalance.png"
-               id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               id="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -635,13 +635,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StopVolume"
+               class="org.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StopVolume"
                disabledIcon="icons/tango/32x32/stop-volume-disabled.png"
                icon="icons/tango/32x32/stop-volume.png"
-               id="com.gluster.storage.management.console.actions.StopVolumeAction"
+               id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -651,13 +651,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StartVolume"
+               class="org.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StartVolume"
                disabledIcon="icons/tango/32x32/start-volume-disabled.png"
                icon="icons/tango/32x32/start-volume.png"
-               id="com.gluster.storage.management.console.actions.StartVolumeAction"
+               id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -667,13 +667,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RemoveBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveDisk"
+               class="org.gluster.storage.management.console.actions.RemoveBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveDisk"
                disabledIcon="icons/tango/32x32/remove-brick-disabled.png"
                icon="icons/tango/32x32/remove-brick.png"
-               id="com.gluster.storage.management.console.actions.RemoveDiskAction"
+               id="org.gluster.storage.management.console.actions.RemoveDiskAction"
                label="Remove Brick"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -683,13 +683,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.AddDisk"
+               class="org.gluster.storage.management.console.actions.AddBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.AddDisk"
                disabledIcon="icons/tango/32x32/add-brick-disabled.png"
                icon="icons/tango/32x32/add-brick.png"
-               id="com.gluster.storage.management.console.actions.AddDiskAction"
+               id="org.gluster.storage.management.console.actions.AddDiskAction"
                label="&amp;Add Brick"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -699,13 +699,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                disabledIcon="icons/tango/32x32/create-volume-disabled.png"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -715,11 +715,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -728,7 +728,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.volume"
+               id="org.gluster.storage.management.console.menu.volume"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -738,18 +738,18 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on multiple Gluster Servers"
-            id="com.gluster.storage.management.console.actionsets.glusterservers"
+            id="org.gluster.storage.management.console.actionsets.glusterservers"
             label="Gluster Servers Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               class="org.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveServer"
                disabledIcon="icons/tango/32x32/remove-server-disabled.png"
                icon="icons/tango/32x32/remove-server.png"
-               id="com.gluster.storage.management.console.actions.RemoveServerAction"
+               id="org.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
+               menubarPath="org.gluster.storage.management.console.menu.servers/servers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -759,12 +759,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
+               menubarPath="org.gluster.storage.management.console.menu.servers/servers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -774,11 +774,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
+               menubarPath="org.gluster.storage.management.console.menu.servers/servers"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -787,7 +787,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.servers"
+               id="org.gluster.storage.management.console.menu.servers"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -797,18 +797,18 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed in the &quot;Gluster Server&quot; contextt; context"
-            id="com.gluster.storage.management.console.actionsets.glusterserver"
+            id="org.gluster.storage.management.console.actionsets.glusterserver"
             label="Gluster Server Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               class="org.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveServer"
                disabledIcon="icons/tango/32x32/remove-server-disabled.png"
                icon="icons/tango/32x32/remove-server.png"
-               id="com.gluster.storage.management.console.actions.RemoveServerAction"
+               id="org.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
+               menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -818,12 +818,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
+               menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -833,11 +833,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
+               menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -846,7 +846,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.glusterserver"
+               id="org.gluster.storage.management.console.menu.glusterserver"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -856,17 +856,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on multiple Discovered Servers"
-            id="com.gluster.storage.management.console.actionsets.serversdiscovered"
+            id="org.gluster.storage.management.console.actionsets.serversdiscovered"
             label="Discovered Servers Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
                icon="icons/tango/32x32/add-server.png"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -876,12 +876,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -891,11 +891,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -904,7 +904,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.discoveredservers"
+               id="org.gluster.storage.management.console.menu.discoveredservers"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -914,17 +914,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on single Discovered Server"
-            id="com.gluster.storage.management.console.actionsets.serverdiscovered"
+            id="org.gluster.storage.management.console.actionsets.serverdiscovered"
             label="Discovered Server Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
                icon="icons/tango/32x32/add-server.png"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -934,12 +934,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -949,11 +949,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -962,7 +962,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.discoveredserver"
+               id="org.gluster.storage.management.console.menu.discoveredserver"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -972,18 +972,18 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed from &quot;Cluster&quot; context"
-            id="com.gluster.storage.management.console.actionsets.task"
+            id="org.gluster.storage.management.console.actionsets.task"
             label="Task Action Set"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ClearTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Clear"
+               class="org.gluster.storage.management.console.actions.ClearTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Clear"
                disabledIcon="icons/tango/32x32/clear-task-disabled.png"
                icon="icons/tango/32x32/clear-task.png"
-               id="com.gluster.storage.management.console.actions.Clear"
+               id="org.gluster.storage.management.console.actions.Clear"
                label="&amp;Clear Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -993,13 +993,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CommitTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Commit"
+               class="org.gluster.storage.management.console.actions.CommitTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Commit"
                disabledIcon="icons/tango/32x32/commit-task-disabled.png"
                icon="icons/tango/32x32/commit-task.png"
-               id="com.gluster.storage.management.console.actions.Commit"
+               id="org.gluster.storage.management.console.actions.Commit"
                label="&amp;Commit Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1009,13 +1009,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Stop"
+               class="org.gluster.storage.management.console.actions.StopTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Stop"
                disabledIcon="icons/tango/32x32/stop-disabled.png"
                icon="icons/tango/32x32/stop.png"
-               id="com.gluster.storage.management.console.actions.Stop"
+               id="org.gluster.storage.management.console.actions.Stop"
                label="&amp;Stop Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1025,13 +1025,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ResumeTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Pause"
+               class="org.gluster.storage.management.console.actions.ResumeTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Pause"
                disabledIcon="icons/tango/32x32/start-disabled.png"
                icon="icons/tango/32x32/start.png"
-               id="com.gluster.storage.management.console.actions.Resume"
+               id="org.gluster.storage.management.console.actions.Resume"
                label="&amp;Resume Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1041,13 +1041,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.PauseTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Pause"
+               class="org.gluster.storage.management.console.actions.PauseTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Pause"
                disabledIcon="icons/tango/32x32/pause-disabled.png"
                icon="icons/tango/32x32/pause.png"
-               id="com.gluster.storage.management.console.actions.Pause"
+               id="org.gluster.storage.management.console.actions.Pause"
                label="&amp;Pause Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1057,12 +1057,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1071,7 +1071,7 @@
                tooltip="Create a new Volume">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.task"
+               id="org.gluster.storage.management.console.menu.task"
                label="&amp;Gluster">
             <groupMarker
                   name="task">
@@ -1080,17 +1080,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed at Cluster context"
-            id="com.gluster.storage.management.console.actionsets.gluster"
+            id="org.gluster.storage.management.console.actionsets.gluster"
             label="Gluster Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.gluster/gluster"
+               menubarPath="org.gluster.storage.management.console.menu.gluster/gluster"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1100,11 +1100,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.gluster/gluster"
+               menubarPath="org.gluster.storage.management.console.menu.gluster/gluster"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1113,7 +1113,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.gluster"
+               id="org.gluster.storage.management.console.menu.gluster"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -1123,17 +1123,17 @@
       </actionSet>
       <actionSet
             description="Set of Actions in &quot;Edit&quot; menu"
-            id="com.gluster.storage.management.console.actionsets.edit"
+            id="org.gluster.storage.management.console.actionsets.edit"
             label="Edit Action Set"
             visible="true">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RefreshDataAction"
-               definitionId="com.gluster.storage.management.console.commands.Refresh"
+               class="org.gluster.storage.management.console.actions.RefreshDataAction"
+               definitionId="org.gluster.storage.management.console.commands.Refresh"
                icon="icons/tango/32x32/view-refresh.png"
-               id="com.gluster.storage.management.console.actions.RefreshDataAction"
+               id="org.gluster.storage.management.console.actions.RefreshDataAction"
                label="&amp;Refresh"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1143,12 +1143,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.PreferencesAction"
-               definitionId="com.gluster.storage.management.console.commands.Preferences"
+               class="org.gluster.storage.management.console.actions.PreferencesAction"
+               definitionId="org.gluster.storage.management.console.commands.Preferences"
                icon="icons/tango/32x32/settings.png"
-               id="com.gluster.storage.management.console.actions.PreferencesAction"
+               id="org.gluster.storage.management.console.actions.PreferencesAction"
                label="&amp;Settings"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1158,12 +1158,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.TerminalAction"
-               definitionId="com.gluster.storage.management.console.commands.Terminal"
+               class="org.gluster.storage.management.console.actions.TerminalAction"
+               definitionId="org.gluster.storage.management.console.commands.Terminal"
                icon="icons/tango/32x32/utilities-terminal.png"
-               id="com.gluster.storage.management.console.actions.TerminalAction"
+               id="org.gluster.storage.management.console.actions.TerminalAction"
                label="&amp;Terminal"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1173,11 +1173,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ChangePasswordAction"
-               definitionId="com.gluster.storage.management.console.commands.ChangePassword"
-               id="com.gluster.storage.management.console.actions.ChangePasswordAction"
+               class="org.gluster.storage.management.console.actions.ChangePasswordAction"
+               definitionId="org.gluster.storage.management.console.commands.ChangePassword"
+               id="org.gluster.storage.management.console.actions.ChangePasswordAction"
                label="&amp;Change Password"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1187,11 +1187,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ExportSshKeysAction"
-               definitionId="com.gluster.storage.management.console.commands.ExportSshKeys"
-               id="com.gluster.storage.management.console.actions.ExportSshKeysAction"
+               class="org.gluster.storage.management.console.actions.ExportSshKeysAction"
+               definitionId="org.gluster.storage.management.console.commands.ExportSshKeys"
+               id="org.gluster.storage.management.console.actions.ExportSshKeysAction"
                label="&amp;Export Keys"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1201,11 +1201,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ImportSshKeysAction"
-               definitionId="com.gluster.storage.management.console.commands.ImportSshKeys"
-               id="com.gluster.storage.management.console.actions.ImportSshKeysAction"
+               class="org.gluster.storage.management.console.actions.ImportSshKeysAction"
+               definitionId="org.gluster.storage.management.console.commands.ImportSshKeys"
+               id="org.gluster.storage.management.console.actions.ImportSshKeysAction"
                label="&amp;Import Keys"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1214,7 +1214,7 @@
                tooltip="Import SSH keys">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.edit"
+               id="org.gluster.storage.management.console.menu.edit"
                label="&amp;Edit"
                path="additions">
             <groupMarker
@@ -1224,14 +1224,14 @@
       </actionSet>
       <actionSet
             description="Set of Actions in &quot;Edit&quot; menu"
-            id="com.gluster.storage.management.console.actionsets.help"
+            id="org.gluster.storage.management.console.actionsets.help"
             label="Help Action Set"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.SupportAction"
-               definitionId="com.gluster.storage.management.console.commands.Support"
-               id="com.gluster.storage.management.console.actions.SupportAction"
+               class="org.gluster.storage.management.console.actions.SupportAction"
+               definitionId="org.gluster.storage.management.console.commands.Support"
+               id="org.gluster.storage.management.console.actions.SupportAction"
                label="&amp;Support"
                menubarPath="help/helpEnd"
                pulldown="false"
@@ -1248,7 +1248,7 @@
             targetID="*">
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.NavigationView"
+               id="org.gluster.storage.management.console.views.NavigationView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
@@ -1260,192 +1260,192 @@
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.ClusterSummaryView"
+               id="org.gluster.storage.management.console.views.ClusterSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="right"
-               relative="com.gluster.storage.management.console.views.navigator.NavigationView"
+               relative="org.gluster.storage.management.console.views.navigator.NavigationView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.DiscoveredServersView"
+               id="org.gluster.storage.management.console.views.DiscoveredServersView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.DiscoveredServerView"
+               id="org.gluster.storage.management.console.views.DiscoveredServerView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumesSummaryView"
+               id="org.gluster.storage.management.console.views.VolumesSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumesView"
+               id="org.gluster.storage.management.console.views.VolumesView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.VolumesSummaryView"
+               relative="org.gluster.storage.management.console.views.VolumesSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeSummaryView"
+               id="org.gluster.storage.management.console.views.VolumeSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeBricksView"
+               id="org.gluster.storage.management.console.views.VolumeBricksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeOptionsView"
+               id="org.gluster.storage.management.console.views.VolumeOptionsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeLogsView"
+               id="org.gluster.storage.management.console.views.VolumeLogsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServersSummaryView"
+               id="org.gluster.storage.management.console.views.GlusterServersSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServersView"
+               id="org.gluster.storage.management.console.views.GlusterServersView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.DisksView"
+               id="org.gluster.storage.management.console.views.DisksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServerSummaryView"
+               id="org.gluster.storage.management.console.views.GlusterServerSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServerDisksView"
+               id="org.gluster.storage.management.console.views.GlusterServerDisksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServerLogsView"
+               id="org.gluster.storage.management.console.views.GlusterServerLogsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.TasksView"
+               id="org.gluster.storage.management.console.views.TasksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
@@ -1457,7 +1457,7 @@
                moveable="false"
                ratio="0.60f"
                relationship="bottom"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
@@ -1468,8 +1468,8 @@
          point="org.eclipse.ui.decorators">
       <decorator
             adaptable="false"
-            class="com.gluster.storage.management.console.views.NavigationTreeLabelDecorator"
-            id="com.gluster.storage.management.console.views.navigator.decorator"
+            class="org.gluster.storage.management.console.views.NavigationTreeLabelDecorator"
+            id="org.gluster.storage.management.console.views.navigator.decorator"
             label="Navigation Tree Decorator"
             lightweight="true"
             location="BOTTOM_LEFT"
@@ -1479,52 +1479,52 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
-            id="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            id="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
             name="Gluster">
       </page>
       <page
-            category="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
-            class="com.gluster.storage.management.console.preferences.AlertsPreferencePage"
-            id="com.gluster.storage.management.console.preferences.AlertsPreferencePage"
+            category="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="org.gluster.storage.management.console.preferences.AlertsPreferencePage"
+            id="org.gluster.storage.management.console.preferences.AlertsPreferencePage"
             name="Alerts">
       </page>
       <page
-            category="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
-            class="com.gluster.storage.management.console.preferences.ChartsPreferencePage"
-            id="com.gluster.storage.management.console.preferences.ChartsPreferencePage"
+            category="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="org.gluster.storage.management.console.preferences.ChartsPreferencePage"
+            id="org.gluster.storage.management.console.preferences.ChartsPreferencePage"
             name="Charts">
       </page>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="com.gluster.storage.management.console.preferences.PreferenceInitializer">
+            class="org.gluster.storage.management.console.preferences.PreferenceInitializer">
       </initializer>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
             id="gluster.context.menu.glusterserver"
-            objectClass="com.gluster.storage.management.core.model.GlusterServer">
+            objectClass="org.gluster.storage.management.core.model.GlusterServer">
          <action
-               class="com.gluster.storage.management.console.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               class="org.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveServer"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.RemoveServerAction"
+               id="org.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server"
                menubarPath="additions">
          </action>
       </objectContribution>
       <objectContribution
             id="gluster.context.menu.volume"
-            objectClass="com.gluster.storage.management.core.model.Volume">
+            objectClass="org.gluster.storage.management.core.model.Volume">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.MigrateBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.MigrateDisk"
+               class="org.gluster.storage.management.console.actions.MigrateBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.MigrateDisk"
                enablesFor="1"
-               id="com.gluster.storage.management.console.actions.MigrateDiskAction"
+               id="org.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Disk"
                menubarPath="additions"
                pulldown="false"
@@ -1536,10 +1536,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                enablesFor="1"
-               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1551,10 +1551,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
+               class="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.RebalanceVolume"
                enablesFor="1"
-               id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               id="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1566,10 +1566,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StopVolume"
+               class="org.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StopVolume"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.StopVolumeAction"
+               id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1581,10 +1581,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StartVolume"
+               class="org.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StartVolume"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.StartVolumeAction"
+               id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1597,13 +1597,13 @@
       </objectContribution>
       <objectContribution
             id="gluster.context.menu.server"
-            objectClass="com.gluster.storage.management.core.model.Server">
+            objectClass="org.gluster.storage.management.core.model.Server">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
                pulldown="false"
@@ -1616,19 +1616,19 @@
          <visibility>
             <not>
                <objectClass
-                     name="com.gluster.storage.management.core.model.GlusterServer">
+                     name="org.gluster.storage.management.core.model.GlusterServer">
                </objectClass>
             </not>
          </visibility>
       </objectContribution>
       <objectContribution
             id="gluster.context.menu.entityGroup"
-            objectClass="com.gluster.storage.management.core.model.EntityGroup">
+            objectClass="org.gluster.storage.management.core.model.EntityGroup">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="&amp;Create Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1640,9 +1640,9 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
                pulldown="false"
diff --git a/src/org.gluster.storage.management.console/preferences.ini b/src/org.gluster.storage.management.console/preferences.ini
new file mode 100644
index 00000000..5a4c6846
--- /dev/null
+++ b/src/org.gluster.storage.management.console/preferences.ini
@@ -0,0 +1,3 @@
+org.eclipse.ui/KEY_CONFIGURATION_ID = org.gluster.storage.management.console.KeyConfig
+org.eclipse.help.base/help_home=/org.gluster.storage.management.console.help/html/help_home.html
+IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP=true
+\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/splash.bmp b/src/org.gluster.storage.management.console/splash.bmp
index d4510414..d4510414 100644
--- a/src/com.gluster.storage.management.console/splash.bmp
+++ b/src/org.gluster.storage.management.console/splash.bmp
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Activator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Activator.java
index 8edae7f4..0edd74cf 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Activator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Activator.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "com.gluster.storage.management.console"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.gluster.storage.management.console"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/AlertsManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/AlertsManager.java
index a5b3a4e6..c44dea09 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/AlertsManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/AlertsManager.java
@@ -18,26 +18,26 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class AlertsManager {
 	private List<Alert> alerts = new ArrayList<Alert>();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Application.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Application.java
index e84dac47..f5a88479 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Application.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Application.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,16 +32,16 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
+import org.gluster.storage.management.console.dialogs.LoginDialog;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.dialogs.LoginDialog;
-import com.gluster.storage.management.core.model.Entity;
 
 /**
  * This class controls all aspects of the application's execution
  */
 public class Application implements IApplication {
 
-	public static final String PLUGIN_ID = "com.gluster.storage.management.console";
+	public static final String PLUGIN_ID = "org.gluster.storage.management.console";
 	private static Application instance;
 	private List<IEntityListener> entityListeners = Collections.synchronizedList(new ArrayList<IEntityListener>());
 	private IStatusLineManager statusLineManager;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationActionBarAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java
index e8d2dd8c..df608eea 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationActionBarAdvisor.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.ICoolBarManager;
@@ -31,8 +31,8 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 /**
  * An action bar advisor is responsible for creating, adding, and disposing of the actions added to a workbench window.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
index 8d6c81da..e0fa5539 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
@@ -28,9 +28,9 @@ import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+import org.gluster.storage.management.console.jobs.DataSyncJob;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
 
-import com.gluster.storage.management.console.jobs.DataSyncJob;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
 
 /**
  * This workbench advisor creates the window advisor, and specifies
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
index 2411dcb5..41043b27 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
@@ -16,15 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 	private final static int DEFAULT_WIDTH = 1024;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/BrickTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/BrickTableLabelProvider.java
index 4796578e..80b4c812 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/BrickTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/BrickTableLabelProvider.java
@@ -16,17 +16,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.BricksPage.BRICK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.console.views.pages.DisksPage.DISK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.BricksPage.BRICK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.console.views.pages.DisksPage.DISK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ConsoleConstants.java
index 6c7449f2..ced7f9e7 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ConsoleConstants.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/DeviceTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/DeviceTableLabelProvider.java
index 3d8fa432..6b6f7669 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/DeviceTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/DeviceTableLabelProvider.java
@@ -16,20 +16,20 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class DeviceTableLabelProvider extends LabelProvider implements ITableLabelProvider {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/EntityGroupContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/EntityGroupContentProvider.java
index 9035e4e2..ca83d520 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/EntityGroupContentProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/EntityGroupContentProvider.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.gluster.storage.management.core.model.EntityGroup;
 
-import com.gluster.storage.management.core.model.EntityGroup;
 
 public class EntityGroupContentProvider<T> implements
 		IStructuredContentProvider {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java
index 68d338f2..94d3c59c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,41 +26,41 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.gluster.storage.management.client.DiscoveredServersClient;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_TYPE;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
 
-import com.gluster.storage.management.client.DiscoveredServersClient;
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Device.DEVICE_TYPE;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 
 public class GlusterDataModelManager {
 	private static GlusterDataModelManager instance = new GlusterDataModelManager();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterServerTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterServerTableLabelProvider.java
index 71d252ef..3ea52446 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterServerTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterServerTableLabelProvider.java
@@ -16,15 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.GlusterServersPage.GLUSTER_SERVER_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.GlusterServersPage.GLUSTER_SERVER_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class GlusterServerTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ICommandIds.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ICommandIds.java
index 36cfd9dc..c7772a03 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ICommandIds.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ICommandIds.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 /**
  * Interface defining the application's command IDs.
@@ -27,7 +27,7 @@ package com.gluster.storage.management.console;
  */
 public interface ICommandIds {
 
-    public static final String CMD_OPEN = "com.gluster.storage.management.console.open";
-    public static final String CMD_OPEN_MESSAGE = "com.gluster.storage.management.console.openMessage";
+    public static final String CMD_OPEN = "org.gluster.storage.management.console.open";
+    public static final String CMD_OPEN_MESSAGE = "org.gluster.storage.management.console.openMessage";
     
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IEntityListener.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IEntityListener.java
index 91d90afe..e9e837ba 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IEntityListener.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IEntityListener.java
@@ -16,9 +16,9 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
-import com.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Entity;
 
 /**
  * Any class that is interested in changes to entities in application scope should implement this interface and register
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java
index cecdb002..eba97ccc 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 public interface IImageKeys {
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
index 54ed5349..53610c3b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 
-import com.gluster.storage.management.console.views.GlusterServerSummaryView.NETWORK_INTERFACE_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.NetworkInterface;
+import org.gluster.storage.management.console.views.GlusterServerSummaryView.NETWORK_INTERFACE_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.NetworkInterface;
+
 
 public class NetworkInterfaceTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Perspective.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Perspective.java
index 9593bb88..e2a867ed 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Perspective.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Perspective.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerDiskTableLabelProvider.java
index d733701c..aa4c23c4 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerDiskTableLabelProvider.java
@@ -16,19 +16,20 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
+
+import static org.gluster.storage.management.console.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
 
-import static com.gluster.storage.management.console.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java
index eccf67ec..1afbddac 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
+
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServersPage.SERVER_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServersPage.SERVER_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class ServerTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TableLabelProviderAdapter.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TableLabelProviderAdapter.java
index 5c527082..622d3dfc 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TableLabelProviderAdapter.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TableLabelProviderAdapter.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TasksTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java
index 66fbefd3..ad2a8a7d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TasksTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java
@@ -18,14 +18,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.TasksPage.TASK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.TasksPage.TASK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 
 public class TasksTableLabelProvider extends TableLabelProviderAdapter {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeLogTableLabelProvider.java
index 07c5cc77..246bd7ca 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeLogTableLabelProvider.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 
-import com.gluster.storage.management.console.views.pages.VolumeLogsPage.LOG_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.console.views.pages.VolumeLogsPage.LOG_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.utils.DateUtil;
+
 
 public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsContentProvider.java
index 1289f0f4..0cc0b536 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsContentProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsContentProvider.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.gluster.storage.management.core.model.VolumeOptions;
 
-import com.gluster.storage.management.core.model.VolumeOptions;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
index 5a1089de..250066bc 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.Map.Entry;
 
-import com.gluster.storage.management.console.views.pages.VolumeOptionsPage.OPTIONS_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.console.views.pages.VolumeOptionsPage.OPTIONS_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.VolumeOption;
+
 
 public class VolumeOptionsTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeTableLabelProvider.java
index 908c23d5..e19a40b1 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeTableLabelProvider.java
@@ -16,16 +16,16 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumesPage.VOLUME_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumesPage.VOLUME_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class VolumeTableLabelProvider implements ITableLabelProvider {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractActionDelegate.java
index 29481286..efff2a3d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractActionDelegate.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -26,9 +26,9 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.internal.UIPlugin;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.model.Entity;
 
 /**
  * All action delegates in the application should extend from this class. It provides common functionality of grabbing
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java
index 1669d273..00972f9f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -24,8 +24,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.gluster.storage.management.console.ConsoleConstants;
 
-import com.gluster.storage.management.console.ConsoleConstants;
 
 /**
  * Any action that can potentially run for a long time, and supports monitoring and progress dialog should extend from
@@ -33,7 +33,7 @@ import com.gluster.storage.management.console.ConsoleConstants;
  */
 public abstract class AbstractMonitoredActionDelegate extends AbstractActionDelegate {
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(final IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ActionConstants.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ActionConstants.java
index a1b70ad0..bde96570 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ActionConstants.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ActionConstants.java
@@ -16,21 +16,21 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 public class ActionConstants {
-	public static final String ACTION_SET_CLUSTER = "com.gluster.storage.management.console.actionsets.gluster";
-	public static final String ACTION_SET_VOLUMES = "com.gluster.storage.management.console.actionsets.volumes";
-	public static final String ACTION_SET_VOLUME = "com.gluster.storage.management.console.actionsets.volume";
-	public static final String ACTION_SET_DISKS = "com.gluster.storage.management.console.actionsets.disks";
-	public static final String ACTION_SET_DISK = "com.gluster.storage.management.console.actionsets.disk";
-	public static final String ACTION_SET_GLUSTER_SERVERS = "com.gluster.storage.management.console.actionsets.glusterservers";
-	public static final String ACTION_SET_GLUSTER_SERVER = "com.gluster.storage.management.console.actionsets.glusterserver";
-	public static final String ACTION_SET_DISCOVERED_SERVERS = "com.gluster.storage.management.console.actionsets.serversdiscovered";
-	public static final String ACTION_SET_DISCOVERED_SERVER = "com.gluster.storage.management.console.actionsets.serverdiscovered";
-	public static final String ACTION_SET_TASK = "com.gluster.storage.management.console.actionsets.task";
-	public static final String ACTION_SET_EDIT = "com.gluster.storage.management.console.actionsets.edit";
+	public static final String ACTION_SET_CLUSTER = "org.gluster.storage.management.console.actionsets.gluster";
+	public static final String ACTION_SET_VOLUMES = "org.gluster.storage.management.console.actionsets.volumes";
+	public static final String ACTION_SET_VOLUME = "org.gluster.storage.management.console.actionsets.volume";
+	public static final String ACTION_SET_DISKS = "org.gluster.storage.management.console.actionsets.disks";
+	public static final String ACTION_SET_DISK = "org.gluster.storage.management.console.actionsets.disk";
+	public static final String ACTION_SET_GLUSTER_SERVERS = "org.gluster.storage.management.console.actionsets.glusterservers";
+	public static final String ACTION_SET_GLUSTER_SERVER = "org.gluster.storage.management.console.actionsets.glusterserver";
+	public static final String ACTION_SET_DISCOVERED_SERVERS = "org.gluster.storage.management.console.actionsets.serversdiscovered";
+	public static final String ACTION_SET_DISCOVERED_SERVER = "org.gluster.storage.management.console.actionsets.serverdiscovered";
+	public static final String ACTION_SET_TASK = "org.gluster.storage.management.console.actionsets.task";
+	public static final String ACTION_SET_EDIT = "org.gluster.storage.management.console.actionsets.edit";
 	
-	public static final String COMMAND_CREATE_VOLUME = "com.gluster.storage.management.console.commands.CreateVolume";
-	public static final String COMMAND_ADD_SERVER = "com.gluster.storage.management.console.commands.AddServer";
+	public static final String COMMAND_CREATE_VOLUME = "org.gluster.storage.management.console.commands.CreateVolume";
+	public static final String COMMAND_ADD_SERVER = "org.gluster.storage.management.console.commands.AddServer";
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java
index 479353ff..e67cf9ab 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddBrickAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java
@@ -19,15 +19,15 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.dialogs.AddBrickWizard;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.dialogs.AddBrickWizard;
-import com.gluster.storage.management.core.model.Volume;
 
 public class AddBrickAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java
index c3b24eba..2a622384 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -24,13 +24,13 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.dialogs.ServerAdditionDialog;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Server;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.dialogs.ServerAdditionDialog;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Server;
 
 public class AddServerAction extends AbstractMonitoredActionDelegate {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ChangePasswordAction.java
index a06f13b4..07d59332 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ChangePasswordAction.java
@@ -1,8 +1,8 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.dialogs.ChangePasswordDialog;
 
-import com.gluster.storage.management.console.dialogs.ChangePasswordDialog;
 
 public class ChangePasswordAction extends AbstractActionDelegate {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java
index 7cb9a873..fcdb67ee 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public class ClearTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CommitTaskAction.java
index e2e1e12c..3fb59f91 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CommitTaskAction.java
@@ -1,18 +1,18 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
 
 public class CommitTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CreateVolumeAction.java
index f8590171..55d10eda 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CreateVolumeAction.java
@@ -16,15 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.gluster.storage.management.console.dialogs.CreateVolumeWizard;
 
-import com.gluster.storage.management.console.dialogs.CreateVolumeWizard;
 
 public class CreateVolumeAction extends AbstractActionDelegate {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DeleteVolumeAction.java
index ba2ef5c7..fb9e4cc2 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DeleteVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class DeleteVolumeAction extends AbstractMonitoredActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
index 81abb01f..b67e0b2e 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
@@ -16,15 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Volume;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/EditVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/EditVolumeAction.java
index 610cbdf6..efb7b780 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/EditVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/EditVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ExportSshKeysAction.java
index 51cf49c1..a4b57800 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ExportSshKeysAction.java
@@ -18,13 +18,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
+import org.gluster.storage.management.client.KeysClient;
 
-import com.gluster.storage.management.client.KeysClient;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ForceStartVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ForceStartVolumeAction.java
index 9201aadb..3c57256a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ForceStartVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ForceStartVolumeAction.java
@@ -1,18 +1,18 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.Set;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.VolumeBricksView;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.VolumeBricksView;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 public class ForceStartVolumeAction extends AbstractActionDelegate {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ImportSshKeysAction.java
index 4bdb3835..083cf193 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ImportSshKeysAction.java
@@ -1,11 +1,11 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
+import org.gluster.storage.management.client.KeysClient;
 
-import com.gluster.storage.management.client.KeysClient;
 
 public class ImportSshKeysAction extends AbstractActionDelegate {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateBrickAction.java
index a8667c33..01cc837c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateBrickAction.java
@@ -16,18 +16,18 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.Set;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.gluster.storage.management.console.dialogs.MigrateBrickWizard;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.dialogs.MigrateBrickWizard;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
 
 public class MigrateBrickAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateVolumeAction.java
index 66013222..ed4b47f6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PauseTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PauseTaskAction.java
index 92a79c73..675095ee 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PauseTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PauseTaskAction.java
@@ -18,16 +18,16 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
 
 
 public class PauseTaskAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PreferencesAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PreferencesAction.java
index b81a2a51..11db53e0 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PreferencesAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PreferencesAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.actions.ActionFactory;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
index 016ffb8b..beae73c6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
@@ -16,20 +16,20 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.net.URI;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.Volume;
 
 public class RebalanceVolumeAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RefreshDataAction.java
index 4d492f8d..5e791768 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RefreshDataAction.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.jobs.DataSyncJob;
 
-import com.gluster.storage.management.console.jobs.DataSyncJob;
 
 /**
  *
@@ -34,7 +34,7 @@ public class RefreshDataAction extends AbstractActionDelegate {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveBrickAction.java
index 105ab0da..658394ed 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveBrickAction.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,16 +10,16 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.VolumeBricksView;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.VolumeBricksView;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 public class RemoveBrickAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveServerAction.java
index 7f33828a..94f69be8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveServerAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,13 +28,13 @@ import java.util.Set;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class RemoveServerAction extends AbstractMonitoredActionDelegate {
 	private static final GlusterLogger logger = GlusterLogger.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
index cd2b3ff5..ef21aac7 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
@@ -1,13 +1,13 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Volume;
 
 public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	private Volume volume;
@@ -47,7 +47,7 @@ public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * org.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
 	 * , org.eclipse.jface.viewers.ISelection)
 	 */
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResumeTaskAction.java
index d672a760..4ecb283d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResumeTaskAction.java
@@ -1,13 +1,13 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
 
 public class ResumeTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ServerAdditionAction.java
index f47f6347..c0ed3beb 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ServerAdditionAction.java
@@ -1,9 +1,9 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.dialogs.ServerAdditionDialog;
+import org.gluster.storage.management.console.utils.GlusterLogger;
 
-import com.gluster.storage.management.console.dialogs.ServerAdditionDialog;
-import com.gluster.storage.management.console.utils.GlusterLogger;
 
 public class ServerAdditionAction extends AbstractActionDelegate {
 	private static final GlusterLogger logger = GlusterLogger.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java
index a0fc2331..4a8db975 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,16 +27,16 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.osgi.internal.signedcontent.Base64;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.AlertsManager;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.AlertsManager;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 	//private Volume volume;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java
index 25afa320..e5ba017d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public class StopTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java
index 85103963..e1b67c1d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
@@ -201,7 +201,7 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * org.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
 	 * , org.eclipse.jface.viewers.ISelection)
 	 */
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/SupportAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/SupportAction.java
index 5d0bc833..9b698df9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/SupportAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/SupportAction.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.dialogs.GlusterSupportDialog;
 
-import com.gluster.storage.management.console.dialogs.GlusterSupportDialog;
 
 /**
  *
@@ -28,7 +28,7 @@ import com.gluster.storage.management.console.dialogs.GlusterSupportDialog;
 public class SupportAction extends AbstractActionDelegate {
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TerminalAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TerminalAction.java
index 992cc11b..433bff69 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TerminalAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TerminalAction.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 /**
  *
@@ -35,7 +35,7 @@ public class TerminalAction extends AbstractActionDelegate {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TestPopupMenuAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TestPopupMenuAction.java
index 0cf32adf..dfb2af2f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TestPopupMenuAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TestPopupMenuAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/VolumeLogRotateAction.java
index 4c538be4..7477358c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/VolumeLogRotateAction.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -6,13 +6,13 @@ import java.util.Set;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.VolumeBricksView;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.VolumeBricksView;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 
 
 public class VolumeLogRotateAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java
index b2cb3582..df42f12a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -28,12 +28,12 @@ import java.util.Set;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.richclientgui.toolbox.duallists.DualListComposite.ListContentChangedListener;
 import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickWizard.java
index 734dd5e4..da40f1d9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickWizard.java
@@ -18,19 +18,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java
index 1e4de2ef..99f6d201 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -36,16 +36,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.TableLabelProviderAdapter;
+import org.gluster.storage.management.console.utils.EntityViewerFilter;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.TableLabelProviderAdapter;
-import com.gluster.storage.management.console.utils.EntityViewerFilter;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.utils.NumberUtil;
 import com.richclientgui.toolbox.duallists.CustomTableDualListComposite;
 import com.richclientgui.toolbox.duallists.DualListComposite.ListContentChangedListener;
 import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ChangePasswordDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
index 1576ffe3..09b4b08c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -45,12 +45,12 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.client.UsersClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.validators.StringRequiredValidator;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ConnectionDetails;
 
-import com.gluster.storage.management.client.UsersClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.validators.StringRequiredValidator;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ConnectionDetails;
 
 public class ChangePasswordDialog extends Dialog {
 	public static final int RETURN_CODE_ERROR = 2;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
index cbbcbd46..44b9e963 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -43,11 +43,11 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 /**
  * Cluster selection dialog, which prompts for the cluster name to be managed
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumePage1.java
index d7d98d24..9f1ec929 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumePage1.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -47,16 +47,16 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.utils.ValidationUtil;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.utils.ValidationUtil;
 
 public class CreateVolumePage1 extends WizardPage {
 	public static final String PAGE_NAME = "create.volume.page.1";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
index 1558749c..6aa81b7f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
@@ -16,22 +16,22 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
 public class CreateVolumeWizard extends Wizard {
 	private static final String title = "Gluster Management Console - Create Volume";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/GlusterSupportDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java
index a2659650..6eb414f5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/GlusterSupportDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -36,8 +36,8 @@ import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormText;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 public class GlusterSupportDialog extends FormDialog {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitDiskDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/InitDiskDialog.java
index 870de286..4d06fd3a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitDiskDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/InitDiskDialog.java
@@ -19,7 +19,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -43,8 +43,8 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 public class InitDiskDialog extends Dialog  {
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java
index 6120f5e3..ccbea44f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -47,19 +47,19 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.client.ClustersClient;
+import org.gluster.storage.management.client.UsersClient;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.validators.StringRequiredValidator;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ConnectionDetails;
 
-import com.gluster.storage.management.client.ClustersClient;
-import com.gluster.storage.management.client.UsersClient;
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.validators.StringRequiredValidator;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ConnectionDetails;
 
 /**
  * Login dialog, which prompts for the user's account info, and has Login and Cancel buttons.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
index e3d9d2bf..80265949 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -43,14 +43,14 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.TableLabelProviderAdapter;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.TableLabelProviderAdapter;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class MigrateBrickPage1 extends WizardPage {
 	private static final String PAGE_NAME = "migrate.disk.page.1";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
index 589b065f..f5cc0249 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
@@ -16,23 +16,23 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.net.URI;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
 
 public class MigrateBrickWizard extends Wizard {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/SelectDisksDialog.java
index 42c5e782..cc6eb83b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/SelectDisksDialog.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 import java.util.Set;
@@ -31,9 +31,9 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
 
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Device;
 
 public class SelectDisksDialog extends Dialog {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
index 9781f348..99d056e6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.net.URI;
 import java.util.List;
@@ -40,11 +40,11 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class ServerAdditionDialog extends Dialog {
 	public static final int RETURN_CODE_ERROR = 2;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/jobs/DataSyncJob.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java
index 907d7b84..ee4daafe 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/jobs/DataSyncJob.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java
@@ -16,17 +16,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.jobs;
+package org.gluster.storage.management.console.jobs;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.model.GlusterDataModel;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.model.GlusterDataModel;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/AlertsPreferencePage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/AlertsPreferencePage.java
index be8513fc..7855f289 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/AlertsPreferencePage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/AlertsPreferencePage.java
@@ -1,11 +1,11 @@
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 public class AlertsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/ChartsPreferencePage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/ChartsPreferencePage.java
index 8eeb84ab..6c4f9506 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/ChartsPreferencePage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/ChartsPreferencePage.java
@@ -16,14 +16,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/GlusterPreferencePage.java
index 2fc8de0e..44ff55ed 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/GlusterPreferencePage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import java.util.List;
 
@@ -26,9 +26,9 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.gluster.storage.management.client.ClustersClient;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.client.ClustersClient;
-import com.gluster.storage.management.console.Activator;
 
 /**
  * This class represents a preference page that
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceConstants.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceConstants.java
index 650ae1a9..1422a77d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceConstants.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceConstants.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 /**
  * Constant definitions for plug-in preferences
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceInitializer.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceInitializer.java
index 72e62447..36d8b652 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceInitializer.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceInitializer.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 /**
  * Class used to initialize default preference values.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/GlusterToolbarManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
index ebd1db07..fc8ef865 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
@@ -16,22 +16,22 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.toolbar;
+package org.gluster.storage.management.console.toolbar;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.gluster.storage.management.console.actions.ActionConstants;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.actions.ActionConstants;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.Volume;
 
 public class GlusterToolbarManager implements ToolbarManager {
 	private enum ENTITY_TYPE {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/ToolbarManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/ToolbarManager.java
index 8dc14ffd..e4b8d320 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/ToolbarManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/ToolbarManager.java
@@ -16,9 +16,9 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.toolbar;
+package org.gluster.storage.management.console.toolbar;
 
-import com.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Entity;
 
 /**
  * Whenever the current selection/action demands changes to the toolbar, the toolbar manager is used to update the
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartUtil.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java
index 57121f5b..b5d2a602 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartUtil.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,15 +34,15 @@ import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.NetworkInterface;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
 
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.NetworkInterface;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 import com.ibm.icu.util.Calendar;
 
 /**
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartViewerComposite.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartViewerComposite.java
index 9e67ed29..4f2e7ecf 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartViewerComposite.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartViewerComposite.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/EntityViewerFilter.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/EntityViewerFilter.java
index 60161324..2ee6d535 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/EntityViewerFilter.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/EntityViewerFilter.java
@@ -16,15 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.Map.Entry;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
+import org.gluster.storage.management.core.model.Filterable;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.core.model.Filterable;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 public class EntityViewerFilter extends ViewerFilter {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GUIHelper.java
index b8f8d83e..600a941c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GUIHelper.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -75,16 +75,16 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.progress.IProgressConstants;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.views.NavigationView;
+import org.gluster.storage.management.console.views.TasksView;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.utils.JavaUtil;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.views.NavigationView;
-import com.gluster.storage.management.console.views.TasksView;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.utils.JavaUtil;
 
 public class GUIHelper {
 	private static final GUIHelper instance = new GUIHelper();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterChartPalette.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java
index 3c5b0b62..4c579103 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterChartPalette.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java
@@ -9,7 +9,7 @@
  * Actuate Corporation - initial API and implementation
  ***********************************************************************/
 
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterLogger.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterLogger.java
index b633678a..4a2ba53b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterLogger.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterLogger.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Status;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ImageUtil.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ImageUtil.java
index d278704b..eb4a31b9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ImageUtil.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ImageUtil.java
@@ -18,14 +18,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.core.utils.LRUCache;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.core.utils.LRUCache;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/TableViewerComparator.java
index 7e11cc6f..9df3942a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/TableViewerComparator.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/validators/StringRequiredValidator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/validators/StringRequiredValidator.java
index cac65829..5d364606 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/validators/StringRequiredValidator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/validators/StringRequiredValidator.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.validators;
+package org.gluster.storage.management.console.validators;
 
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterAdapterFactory.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterAdapterFactory.java
index d904c8f3..a830d4ea 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterAdapterFactory.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterAdapterFactory.java
@@ -16,22 +16,22 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Volume;
 
 public class ClusterAdapterFactory implements IAdapterFactory {
 	private IWorkbenchAdapter entityAdapter = new IWorkbenchAdapter() {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterSummaryView.java
index 6be9f8d9..41d2daa7 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterSummaryView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -41,30 +41,30 @@ import org.eclipse.ui.forms.widgets.ImageHyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.actions.ActionConstants;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.ChartUtil;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
 
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.actions.ActionConstants;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.ChartUtil;
-import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServerView.java
index abc9ec2f..7ae6fe61 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServerView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -26,10 +26,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServersView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServersView.java
index ab3cd556..e3e7ec8a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServersView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServersView.java
@@ -18,19 +18,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServersPage;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Server;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServersPage;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Server;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DisksView.java
index 7ba1a88a..1263a07f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DisksView.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,12 +6,12 @@ import java.util.List;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.DisksPage;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.DisksPage;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class DisksView extends ViewPart {
 	public static final String ID = DisksView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerDisksView.java
index d3cd98e8..8aa0fde1 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerDisksView.java
@@ -18,20 +18,20 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServerDisksPage;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServerDisksPage;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class GlusterServerDisksView extends ViewPart {
 	public static final String ID = GlusterServerDisksView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerLogsView.java
index 33c85be2..2e8ebe60 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerLogsView.java
@@ -18,15 +18,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServerLogsPage;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServerLogsPage;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class GlusterServerLogsView extends ViewPart {
 	public static final String ID = GlusterServerLogsView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java
index 08344f84..e5570ad9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -52,29 +52,29 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.NetworkInterfaceTableLabelProvider;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.console.utils.ChartUtil;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.NetworkInterfaceTableLabelProvider;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.console.utils.ChartUtil;
-import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
-import com.gluster.storage.management.core.utils.NumberUtil;
 import com.ibm.icu.util.Calendar;
 import com.richclientgui.toolbox.gauges.CoolGauge;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersSummaryView.java
index afca5ad5..c7435166 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersSummaryView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -31,23 +31,23 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersView.java
index 66017990..fe4e3bb3 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -26,12 +26,12 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.GlusterServersPage;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.GlusterServersPage;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterViewsManager.java
index 05c30626..a4d0a98f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterViewsManager.java
@@ -18,19 +18,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Volume;
 
 /**
  * @see ViewsManager
@@ -43,7 +43,7 @@ public class GlusterViewsManager implements ViewsManager {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.ViewsManager#updateViews(com.gluster.storage.management.core.model.Entity)
+	 * @see org.gluster.storage.management.console.views.ViewsManager#updateViews(org.gluster.storage.management.core.model.Entity)
 	 */
 	@SuppressWarnings("rawtypes")
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
index d7448e76..45f7119f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
@@ -16,19 +16,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Volume;
 
 public class NavigationTreeLabelDecorator implements ILightweightLabelDecorator {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationView.java
index 21fc4c7a..0c565a24 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationView.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -33,15 +33,15 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.model.BaseWorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Volume;
 
 public class NavigationView extends ViewPart implements ISelectionListener {
 	public static final String ID = NavigationView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/TasksView.java
index e408e64e..9732a460 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/TasksView.java
@@ -1,14 +1,14 @@
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import java.util.List;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.views.pages.TasksPage;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.views.pages.TasksPage;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public class TasksView extends ViewPart {
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ViewsManager.java
index 5b19ea98..76581416 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ViewsManager.java
@@ -18,9 +18,9 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
-import com.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Entity;
 
 /**
  * Whenever the current selection/action demands opening different set of views, the views manager is used to open
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeBricksView.java
index 33cd1f38..33f7c970 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeBricksView.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.BricksPage;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.BricksPage;
-import com.gluster.storage.management.core.model.Volume;
 
 public class VolumeBricksView extends ViewPart {
 	public static final String ID = VolumeBricksView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java
index 74ef5616..eeffe6d5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -8,13 +8,13 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumeLogsPage;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.utils.DateUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumeLogsPage;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.utils.DateUtil;
 
 public class VolumeLogsView extends ViewPart implements IDoubleClickListener {
 	VolumeLogsPage logsPage;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeOptionsView.java
index 7129df5d..144f1441 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeOptionsView.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumeOptionsPage;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumeOptionsPage;
-import com.gluster.storage.management.core.model.Volume;
 
 public class VolumeOptionsView extends ViewPart {
 	public static final String ID = VolumeOptionsView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java
index 78c7caf2..2257c56f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -33,29 +33,29 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.utils.NumberUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.ValidationUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.utils.NumberUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.core.utils.ValidationUtil;
 
 public class VolumeSummaryView extends ViewPart {
 	public static final String ID = VolumeSummaryView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeView.java
index ced9335b..27df48c1 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -26,10 +26,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesSummaryView.java
index cd937215..549353e8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesSummaryView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
@@ -29,23 +29,23 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesView.java
index 4deeace2..41ccba1d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesView.java
@@ -18,19 +18,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumesPage;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumesPage;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Volume;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractDisksPage.java
index 43a7e61a..6d2959d2 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractDisksPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -39,26 +39,26 @@ import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.ImageHyperlink;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IEntityListener;
+import org.gluster.storage.management.console.dialogs.InitDiskDialog;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IEntityListener;
-import com.gluster.storage.management.console.dialogs.InitDiskDialog;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk> implements IEntityListener {
 	protected List<Disk> disks;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
index 7414bbc3..55535637 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -42,11 +42,11 @@ import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.Disk;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.Disk;
 
 public abstract class AbstractTableTreeViewerPage<T> extends Composite implements ISelectionListener {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
index c80740f3..88468eb3 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -50,11 +50,11 @@ import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.TableViewerComparator;
+import org.gluster.storage.management.core.model.ClusterListener;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.TableViewerComparator;
-import com.gluster.storage.management.core.model.ClusterListener;
 
 public abstract class AbstractTableViewerPage<T> extends Composite implements ISelectionListener {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/BricksPage.java
index 674074c3..c9660a77 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/BricksPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.Collection;
 import java.util.List;
@@ -30,13 +30,13 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.BrickTableLabelProvider;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.BrickTableLabelProvider;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Volume;
 
 public class BricksPage extends AbstractTableViewerPage<Brick> {
 	private List<Brick> bricks;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
index 79b54aa1..a7518d3c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
@@ -16,16 +16,16 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
 
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Partition;
 
 public class DiskTreeContentProvider implements ITreeContentProvider {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java
index 8501bef3..21704d4c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DisksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java
@@ -16,17 +16,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.DeviceTableLabelProvider;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.DeviceTableLabelProvider;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
 
 public class DisksPage extends AbstractDisksPage {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/GlusterServersPage.java
index 3ef05a2a..bf0e797d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/GlusterServersPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,16 +30,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.EntityGroupContentProvider;
+import org.gluster.storage.management.console.GlusterServerTableLabelProvider;
+import org.gluster.storage.management.console.utils.TableViewerComparator;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.EntityGroupContentProvider;
-import com.gluster.storage.management.console.GlusterServerTableLabelProvider;
-import com.gluster.storage.management.console.utils.TableViewerComparator;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class GlusterServersPage extends AbstractTableViewerPage<GlusterServer> {
 	private List<GlusterServer> glusterServers;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
index ed6aea64..676e0ee4 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,12 +12,12 @@ import org.eclipse.jface.viewers.ComboBoxCellEditor;
 import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.model.VolumeOptions;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeOption;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
-import com.gluster.storage.management.core.model.VolumeOptions;
 
 /**
  * Editing support for the "value" column in volume options table viewer.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
index faf4fbe6..b2493f0f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -13,13 +13,13 @@ import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeOption;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
 
 /**
  * Editing support for the "value" column in volume options table viewer.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerDisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java
index a2982590..da25e49f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerDisksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java
@@ -16,17 +16,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.ServerDiskTableLabelProvider;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.ServerDiskTableLabelProvider;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
 
 public class ServerDisksPage  extends AbstractDisksPage {
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerLogsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java
index 7b3f3946..ec7c65c6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerLogsPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ListViewer;
@@ -36,9 +36,9 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class ServerLogsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServersPage.java
index d97827c6..ae34e948 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServersPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,14 +30,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.EntityGroupContentProvider;
+import org.gluster.storage.management.console.ServerTableLabelProvider;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Server;
 
-import com.gluster.storage.management.console.EntityGroupContentProvider;
-import com.gluster.storage.management.console.ServerTableLabelProvider;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Server;
 
 public class ServersPage extends AbstractTableViewerPage<Server> {
 	private List<Server> servers;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/TasksPage.java
index c166af0f..aeea018c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/TasksPage.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -33,13 +33,13 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.TasksTableLabelProvider;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.console.TasksTableLabelProvider;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	private List<TaskInfo> taskInfoList;
@@ -58,7 +58,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#createClusterListener()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#createClusterListener()
 	 */
 	@Override
 	protected ClusterListener createClusterListener() {
@@ -89,7 +89,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getColumnNames()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getColumnNames()
 	 */
 	@Override
 	protected String[] getColumnNames() {
@@ -97,7 +97,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#setColumnProperties(org.eclipse.swt.widgets.Table)
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#setColumnProperties(org.eclipse.swt.widgets.Table)
 	 */
 	@Override
 	protected void setColumnProperties(Table table) {
@@ -106,7 +106,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getLabelProvider()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getLabelProvider()
 	 */
 	@Override
 	protected IBaseLabelProvider getLabelProvider() {
@@ -114,7 +114,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getContentProvider()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getContentProvider()
 	 */
 	@Override
 	protected IContentProvider getContentProvider() {
@@ -122,7 +122,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getAllEntities()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getAllEntities()
 	 */
 	@Override
 	protected List<TaskInfo> getAllEntities() {
@@ -130,7 +130,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeLogsPage.java
index 162160f8..d32589bb 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeLogsPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -48,15 +48,15 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.VolumeLogTableLabelProvider;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants.VOLUME_LOG_LEVELS;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.VolumeLogTableLabelProvider;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants.VOLUME_LOG_LEVELS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
 
 public class VolumeLogsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
index dd02a672..4363b7e9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -49,17 +49,17 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.VolumeOptionsContentProvider;
+import org.gluster.storage.management.console.VolumeOptionsTableLabelProvider;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.VolumeOptionsContentProvider;
-import com.gluster.storage.management.console.VolumeOptionsTableLabelProvider;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeOption;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
 
 public class VolumeOptionsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumesPage.java
index 484f91b0..60d00a7f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumesPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,16 +30,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.EntityGroupContentProvider;
+import org.gluster.storage.management.console.VolumeTableLabelProvider;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.EntityGroupContentProvider;
-import com.gluster.storage.management.console.VolumeTableLabelProvider;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Volume;
 
 public class VolumesPage extends AbstractTableViewerPage<Volume> {
 	private List<Volume> volumes;
diff --git a/src/com.gluster.storage.management.console/src/test.xml b/src/org.gluster.storage.management.console/src/test.xml
index 12bbf745..12bbf745 100644
--- a/src/com.gluster.storage.management.console/src/test.xml
+++ b/src/org.gluster.storage.management.console/src/test.xml
diff --git a/src/com.gluster.storage.management.core/.classpath b/src/org.gluster.storage.management.core/.classpath
index b41cbcdb..b41cbcdb 100644
--- a/src/com.gluster.storage.management.core/.classpath
+++ b/src/org.gluster.storage.management.core/.classpath
diff --git a/src/com.gluster.storage.management.core/.project b/src/org.gluster.storage.management.core/.project
index c016cd3c..4db56096 100644
--- a/src/com.gluster.storage.management.core/.project
+++ b/src/org.gluster.storage.management.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.core</name>
+	<name>org.gluster.storage.management.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs
index f22cedf1..f22cedf1 100644
--- a/src/com.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/org.gluster.storage.management.core/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..4f6c2282
--- /dev/null
+++ b/src/org.gluster.storage.management.core/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Gluster Storage Platform Core
+Bundle-SymbolicName: org.gluster.storage.management.core
+Bundle-Version: 1.0.0
+Bundle-Vendor: GLUSTER
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.gluster.storage.management.core.constants,
+ org.gluster.storage.management.core.exceptions,
+ org.gluster.storage.management.core.model,
+ org.gluster.storage.management.core.response,
+ org.gluster.storage.management.core.utils
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
+Bundle-ClassPath: .
+Import-Package: org.gluster.storage.management.core.exceptions
diff --git a/src/com.gluster.storage.management.core/build.properties b/src/org.gluster.storage.management.core/build.properties
index 89d32a46..89d32a46 100644
--- a/src/com.gluster.storage.management.core/build.properties
+++ b/src/org.gluster.storage.management.core/build.properties
diff --git a/src/com.gluster.storage.management.core/junit/core.junit.launch b/src/org.gluster.storage.management.core/junit/core.junit.launch
index 0bf6dc30..3d6e7deb 100644
--- a/src/com.gluster.storage.management.core/junit/core.junit.launch
+++ b/src/org.gluster.storage.management.core/junit/core.junit.launch
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.gluster.storage.management.core"/>
+<listEntry value="/org.gluster.storage.management.core"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.gluster.storage.management.core"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.gluster.storage.management.core"/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.gluster.storage.management.core"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.gluster.storage.management.core"/>
 </launchConfiguration>
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/AlertTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/AlertTest.java
index 81c7a601..7ab59398 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/AlertTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/AlertTest.java
@@ -1,13 +1,14 @@
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
 
 /**
  * The class <code>AlertTest</code> contains tests for the class <code>{@link Alert}</code>.
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/BrickTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/BrickTest.java
index 329ee926..60cb7767 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/BrickTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/BrickTest.java
@@ -1,14 +1,15 @@
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
 
 /**
  * The class <code>BrickTest</code> contains tests for the class <code>{@link Brick}</code>.
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/ClusterTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/ClusterTest.java
index c2e488b1..3b4e6f72 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/ClusterTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/ClusterTest.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -7,17 +7,23 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_TYPE;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Device.DEVICE_TYPE;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
 /**
  * The class <code>ClusterTest</code> contains tests for the class <code>{@link Cluster}</code>.
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/DiskTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java
index b6bd4142..0187eb87 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/DiskTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -12,12 +12,16 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_TYPE;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Device.DEVICE_TYPE;
 
 /**
  * The class <code>DiskTest</code> contains tests for the class <code>{@link Disk}</code>.
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/TestAll.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/TestAll.java
index 159ff256..2df91d09 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/model/TestAll.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/TestAll.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.RunWith;
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/DateUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/DateUtilTest.java
index c19b75d2..df782b00 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/DateUtilTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/DateUtilTest.java
@@ -1,15 +1,16 @@
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.DateUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 
 /**
  * The class <code>DateUtilTest</code> contains tests for the class <code>{@link DateUtil}</code>.
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/FileUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java
index 9302619e..db3dd177 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/FileUtilTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import static org.junit.Assert.*;
 
@@ -8,11 +8,12 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.FileUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 
 
 /**
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java
index dc8c6c80..d39723c4 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.gluster.storage.management.core.utils.StringUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/com.gluster.storage.management.core/junit/test/test.txt b/src/org.gluster.storage.management.core/junit/test/test.txt
index 267ce144..267ce144 100644
--- a/src/com.gluster.storage.management.core/junit/test/test.txt
+++ b/src/org.gluster.storage.management.core/junit/test/test.txt
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/CoreConstants.java
index 42f0e7a9..c6806ce0 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/CoreConstants.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.constants;
+package org.gluster.storage.management.core.constants;
 
 
 /**
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/GlusterConstants.java
index cbc51b10..c5a8713d 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/GlusterConstants.java
@@ -16,11 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.constants;
+package org.gluster.storage.management.core.constants;
 
 import java.util.List;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/RESTConstants.java
index 4b1251b6..8d320fcc 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/RESTConstants.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.constants;
+package org.gluster.storage.management.core.constants;
 
 /**
  * All constants related to the Gluster REST server and client
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/ConnectionException.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/ConnectionException.java
index ec19ffd8..ac6f198c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/ConnectionException.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/ConnectionException.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.exceptions;
+package org.gluster.storage.management.core.exceptions;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterRuntimeException.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterRuntimeException.java
index e7e604fc..7d012644 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterRuntimeException.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterRuntimeException.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.exceptions;
+package org.gluster.storage.management.core.exceptions;
 
 public class GlusterRuntimeException extends RuntimeException {
 	private static final long serialVersionUID = 1L;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterValidationException.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterValidationException.java
index ca5e01f8..399106c7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterValidationException.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterValidationException.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.exceptions;
+package org.gluster.storage.management.core.exceptions;
 
 public class GlusterValidationException extends GlusterRuntimeException {
 	private static final long serialVersionUID = 1L;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java
index ceb3e77e..58a11049 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import org.eclipse.osgi.internal.signedcontent.Base64;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Brick.java
index 0b8ad6fd..2deaaccf 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Brick.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class Brick extends Entity {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Cluster.java
index e11199f6..ade82ea3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Cluster.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ClusterListener.java
index eb8c191e..f13cb7c6 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ClusterListener.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Interface for a cluster listener. Every registered listener will be notified
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ConnectionDetails.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ConnectionDetails.java
index 9f66ba5b..f0fbb852 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ConnectionDetails.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ConnectionDetails.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Class used for binding UI fields on login / password-change dialog boxes
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/DefaultClusterListener.java
index eb98090f..593afb51 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/DefaultClusterListener.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Default listener - doesn't do anything. Sub-class and override the method for
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Device.java
index b0de9aa7..5619c4ae 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Device.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 
 /**
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Disk.java
index 93485926..854fe744 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Disk.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement(name="disk")
 public class Disk extends Device {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Entity.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java
index b905afc3..927bbac4 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Entity.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,8 +25,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.eclipse.core.runtime.PlatformObject;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.core.utils.StringUtil;
 
 @XmlRootElement
 public class Entity extends PlatformObject implements Filterable {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/EntityGroup.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java
index 8e0311f5..351e40e5 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/EntityGroup.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Event.java
index fe7b8495..085e1f66 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Event.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 public class Event {
 	public enum EVENT_TYPE {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Filterable.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Filterable.java
index 9a2ed405..20243d17 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Filterable.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Filterable.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * By default, the {@link EntityViewerFilter} filters the objects by parsing the
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDataModel.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDataModel.java
index 733527c3..99b283c2 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDataModel.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDataModel.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java
index 2139bbd7..1bb3ddab 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java
@@ -16,18 +16,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+
 
 public class GlusterDummyModel {
 	// private Server discoveredServer1, discoveredServer2, discoveredServer3, discoveredServer4, discoveredServer5;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterServer.java
index 9c7ac80b..6d6d9b74 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterServer.java
@@ -16,11 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement(name = "glusterServer")
 public class GlusterServer extends Server {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/InitDiskStatusResponse.java
index f09dfc88..eb844613 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/InitDiskStatusResponse.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/NetworkInterface.java
index 181b8e66..a07c0658 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/NetworkInterface.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Partition.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Partition.java
index ecf4035b..90722087 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Partition.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Partition.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Response.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Response.java
index 96ea8497..b27bd6f7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Response.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Response.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Interface for server response. Any request handled by the Gluster Management
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java
index 3662188c..9ba7b886 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement(name = "server")
 public class Server extends Entity {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStats.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStats.java
index 042af256..7dc94948 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStats.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStats.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStatsRow.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStatsRow.java
index 0088cef6..a6280be0 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStatsRow.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStatsRow.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StatsMetadata.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/StatsMetadata.java
index 22b42671..db5db29e 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StatsMetadata.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/StatsMetadata.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Status.java
index fc824db2..912ec409 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Status.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessResult;
+
 
 @XmlRootElement(name = "status")
 public class Status {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskInfo.java
index 43299863..cecc1c26 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskInfo.java
@@ -18,12 +18,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class TaskInfo extends Entity {
@@ -104,7 +105,7 @@ public class TaskInfo extends Entity {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.core.model.Entity#filter(java.lang.String, boolean)
+	 * @see org.gluster.storage.management.core.model.Entity#filter(java.lang.String, boolean)
 	 */
 	@Override
 	public boolean filter(String filterString, boolean caseSensitive) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskStatus.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskStatus.java
index 579cc9da..e24fdd41 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskStatus.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskStatus.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 public class TaskStatus extends Status {
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/User.java
index ed5d12f7..d6a1e230 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/User.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Version.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Version.java
index 887506a9..447fa1d5 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Version.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Version.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Volume.java
index 9356f14a..41e9d291 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Volume.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,9 +33,10 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class Volume extends Entity {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeLogMessage.java
index 7b7b77c8..de038a70 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeLogMessage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.Date;
 
@@ -24,8 +24,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import com.gluster.storage.management.core.model.adapters.VolumeLogDateAdapter;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.model.adapters.VolumeLogDateAdapter;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class VolumeLogMessage implements Filterable {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOption.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOption.java
index 6eb0c1bf..40736751 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOption.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOption.java
@@ -16,11 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptionInfo.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptionInfo.java
index 2cafc4b5..264095f7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptionInfo.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptionInfo.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptions.java
index edeec768..618feede 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptions.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java
index fac208ad..7656249c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java
@@ -17,13 +17,14 @@
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
 
-package com.gluster.storage.management.core.model.adapters;
+package org.gluster.storage.management.core.model.adapters;
 
 import java.util.Date;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import com.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.core.utils.DateUtil;
+
 
 /**
  * Adapter class used for converting timestamp from Gluster volume log files to Date object.
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/AbstractResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java
index 9a6a48f5..14eab4eb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/AbstractResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java
@@ -16,10 +16,10 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
-import com.gluster.storage.management.core.model.Response;
-import com.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.Response;
+import org.gluster.storage.management.core.model.Status;
 
 public abstract class AbstractResponse implements Response {
 	private Status status;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ClusterNameListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ClusterNameListResponse.java
index 3b10ac86..87904f67 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ClusterNameListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ClusterNameListResponse.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/FsTypeListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/FsTypeListResponse.java
index 0235fa5f..c2762706 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/FsTypeListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/FsTypeListResponse.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerListResponse.java
index 868e2fc2..2c985796 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerListResponse.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +26,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.GlusterServer;
+
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerResponse.java
index 7af9b240..af029893 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerResponse.java
@@ -1,10 +1,11 @@
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Status;
+
 
 @XmlRootElement(name = "response")
 public class GlusterServerResponse extends AbstractResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/LogMessageListResponse.java
index 8c362fa9..0036cacd 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/LogMessageListResponse.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+
 
 @XmlRootElement(name = "logMessages")
 public class LogMessageListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerListResponse.java
index 05627ab1..7c9b2ad5 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerListResponse.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Server;
+
 
 @XmlRootElement(name = "servers")
 public class ServerListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerNameListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerNameListResponse.java
index 2211f29f..2313f4d9 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerNameListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerNameListResponse.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/StringListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/StringListResponse.java
index 785c6efb..aaae7e0e 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/StringListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/StringListResponse.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,8 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.Status;
+
 
 @XmlRootElement(name = "response")
 public class StringListResponse extends AbstractResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskIdResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskIdResponse.java
index f2610104..d585d7ad 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskIdResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskIdResponse.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskInfoListResponse.java
index ba1c4f9f..939d21c6 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskInfoListResponse.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +26,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskInfo;
+
 
 @XmlRootElement(name = "tasks")
 public class TaskInfoListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskResponse.java
index a11c9903..00e1de87 100755
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskResponse.java
@@ -18,12 +18,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+
 
 @XmlRootElement(name = "response")
 public class TaskResponse  extends AbstractResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeListResponse.java
index 6518f0d5..8cb4c577 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeListResponse.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume;
+
 
 @XmlRootElement(name = "volumes")
 public class VolumeListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java
index dfacf19f..36a4dcb2 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+
 
 @XmlRootElement(name = "options")
 public class VolumeOptionInfoListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/DateUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/DateUtil.java
index 5fd9ae8b..6daeeb1c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/DateUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/DateUtil.java
@@ -16,15 +16,16 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
 
 public class DateUtil {
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/FileUtil.java
index 601a3790..10c03fe1 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/FileUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.UUID;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
 
 public class FileUtil {
 	public static String readFileAsString(File file) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/GlusterCoreUtil.java
index 39794b79..47121da1 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/GlusterCoreUtil.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,11 +28,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Server;
+
 
 
 public class GlusterCoreUtil {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/JavaUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/JavaUtil.java
index fe2fc860..6487c0bf 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/JavaUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/JavaUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/LRUCache.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/LRUCache.java
index f3c9c72d..67b35476 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/LRUCache.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/LRUCache.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/MD5.java
index e0daaf81..08f38fb8 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/MD5.java
@@ -54,7 +54,7 @@
  * Initial revision
  *
  */
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 /**
  * Contains internal state of the MD5 class
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5Crypt.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/MD5Crypt.java
index 25c757a2..3d101ab6 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5Crypt.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/MD5Crypt.java
@@ -3,7 +3,7 @@
  MD5Crypt
  ------------------------------------------------------------------------------*/
 
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 
 /**
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/NumberUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/NumberUtil.java
index 9b1cd5e2..830526bb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/NumberUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/NumberUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.text.NumberFormat;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessResult.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessResult.java
index c297a9c4..ccb7b1b8 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessResult.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessResult.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessUtil.java
index 87c74cf0..f040d859 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessUtil.java
@@ -16,9 +16,9 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
-import static com.gluster.storage.management.core.constants.CoreConstants.NEWLINE;
+import static org.gluster.storage.management.core.constants.CoreConstants.NEWLINE;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -26,7 +26,8 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
 
 /**
  * Utility class for creating processes (foreground/background) with given
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/StringUtil.java
index 26c244dd..b3b0a4b5 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/StringUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java
index df0b749a..55659d3c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.regex.Pattern;
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch b/src/org.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
index 1cae618a..1cae618a 100644
--- a/src/com.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
+++ b/src/org.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
diff --git a/src/com.gluster.storage.management.gateway.scripts/.project b/src/org.gluster.storage.management.gateway.scripts/.project
index bc0ebd63..46369752 100644
--- a/src/com.gluster.storage.management.gateway.scripts/.project
+++ b/src/org.gluster.storage.management.gateway.scripts/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gateway.scripts</name>
+	<name>org.gluster.storage.management.gateway.scripts</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
index 4d1b701a..4d1b701a 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
index 653d0dda..653d0dda 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
index ff73af6f..ff73af6f 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py
index 5476e090..5476e090 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py
index 2e1a1574..2e1a1574 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
index 374a7e9c..374a7e9c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py
index 5a27ab87..5a27ab87 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py
index aeda989f..aeda989f 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py
index 572d819c..572d819c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device.py
index 8630635c..8630635c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py
index a804a59c..a804a59c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py
index b72321d7..b72321d7 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py
index de4b4bb0..de4b4bb0 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py
index 532f1585..532f1585 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
index da08fde1..da08fde1 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
index 07a9d7d0..07a9d7d0 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
index ee28ca13..ee28ca13 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index 26b9059a..26b9059a 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
index 2814f10f..2814f10f 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py
index 026c3c00..026c3c00 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-provision-block b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-provision-block
index 0385b82c..0385b82c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-provision-block
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-provision-block
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
index 97bc01ee..97bc01ee 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
index 9ea7e021..9ea7e021 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py
index d56b1f59..d56b1f59 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d
index 7cfbe44a..7cfbe44a 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py
index cb5de70c..cb5de70c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl
index 30a66342..30a66342 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl
index 5c47cd81..5c47cd81 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl
index 6ae128fd..6ae128fd 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py
index 5d5187f4..5d5187f4 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py
index e16c87c2..e16c87c2 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py
index d67d9061..d67d9061 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh b/src/org.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
index b081d6db..b081d6db 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py
index 64297a87..64297a87 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py b/src/org.gluster.storage.management.gateway.scripts/src/common/Globals.py
index 49a12b69..49a12b69 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/common/Globals.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/org.gluster.storage.management.gateway.scripts/src/common/Utils.py
index 3c90c533..3c90c533 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/common/Utils.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py b/src/org.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
index d55ef07a..d55ef07a 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
index adfd031c..adfd031c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
index 8a43e7dc..8a43e7dc 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
index a86e7264..a86e7264 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
index 925a3548..925a3548 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
index c072a556..c072a556 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh b/src/org.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
index 6c7ac998..b39fe6b5 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
@@ -23,4 +23,4 @@ do
 done
 export CLASSPATH=${PWD}/WEB-INF/classes:${CLASSPATH}
 cd ${CURR_DIR}
-java com.gluster.storage.management.gateway.utils.PasswordManager reset ${1}
+java org.gluster.storage.management.gateway.utils.PasswordManager reset ${1}
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/grun.py
index 6519d726..6519d726 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/grun.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
index ded207c0..ded207c0 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
index 27fb9b92..27fb9b92 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
index e7e0a4a0..e7e0a4a0 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
index e5576c45..e5576c45 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway/.classpath b/src/org.gluster.storage.management.gateway/.classpath
index 107e139d..894a6c4d 100644
--- a/src/com.gluster.storage.management.gateway/.classpath
+++ b/src/org.gluster.storage.management.gateway/.classpath
@@ -8,8 +8,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.gluster.storage.management.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.gluster.storage.management.core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="/com.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar"/>
 	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
 </classpath>
diff --git a/src/com.gluster.storage.management.gateway/.project b/src/org.gluster.storage.management.gateway/.project
index 83fea45d..c0861c4e 100644
--- a/src/com.gluster.storage.management.gateway/.project
+++ b/src/org.gluster.storage.management.gateway/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gateway</name>
+	<name>org.gluster.storage.management.gateway</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.gateway/.settings/.jsdtscope b/src/org.gluster.storage.management.gateway/.settings/.jsdtscope
index 3a28de0c..3a28de0c 100644
--- a/src/com.gluster.storage.management.gateway/.settings/.jsdtscope
+++ b/src/org.gluster.storage.management.gateway/.settings/.jsdtscope
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs
index d159aeca..d159aeca 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
index 476db350..476db350 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5d9c71b6..5d9c71b6 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
index 3d5a50bf..5d8e9376 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="com.gluster.storage.management.gateway">
+    <wb-module deploy-name="org.gluster.storage.management.gateway">
         <wb-resource deploy-path="/" source-path="/WebContent"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/junit"/>
-        <property name="java-output-path" value="/com.gluster.storage.management.gateway/build/classes"/>
+        <property name="java-output-path" value="/org.gluster.storage.management.gateway/build/classes"/>
         <property name="context-root" value="glustermg"/>
     </wb-module>
 </project-modules>
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8f960f27..8f960f27 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a4..3bd5d0a4 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b6..05bd71b6 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
index e5ca6272..e5ca6272 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
diff --git a/src/com.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
index 5e949512..5e949512 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt
index d24fbfdb..d24fbfdb 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt
index b3acf520..b3acf520 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
index 3702b645..3702b645 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
index 578b1a0c..578b1a0c 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
index 8217cae0..8217cae0 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
index 41e230fe..41e230fe 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
index 8758a96b..8758a96b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
index dc8ae8df..dc8ae8df 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
index ca367aae..ca367aae 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
index c8c4dbb9..c8c4dbb9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
index 3eddd42f..3eddd42f 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
index c0a9ac7b..c0a9ac7b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
index 4c9ac4e9..4c9ac4e9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
index c1c81141..c1c81141 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
index a3248188..a3248188 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
index faf12cf6..faf12cf6 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
index ca612580..ca612580 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
index 57c2c670..57c2c670 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
index 8f692f4f..8f692f4f 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
index 62f790fa..62f790fa 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
index 92b38466..92b38466 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
index 01d8c83b..01d8c83b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
index 1c134f05..1c134f05 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
index a29d7409..a29d7409 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
index c79b4490..c79b4490 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
index e4e9c8c3..e4e9c8c3 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
index 23782c02..23782c02 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
index ec8bc818..ec8bc818 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
index 6d225b76..6d225b76 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
index 3f9d8476..3f9d8476 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
index 48cc9295..48cc9295 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
index a5d37aa1..a5d37aa1 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
index db6f529f..db6f529f 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
index 7cd3a626..7cd3a626 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
index 11fc11b9..11fc11b9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
index f2e2e927..f2e2e927 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
index bd1367d8..bd1367d8 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
index e46f9eb8..e46f9eb8 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
index ea9500d6..ea9500d6 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
index 6ef99d8d..6ef99d8d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
index e149290e..e149290e 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
index dcd1e4d9..dcd1e4d9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
index f7a3b837..f7a3b837 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
index 9cea2aef..9cea2aef 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
index d0550ccd..d0550ccd 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
index 1688cf74..1688cf74 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
index b3aa6af8..b3aa6af8 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
index 237995c5..237995c5 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
index 2f52122b..2f52122b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
index 5a2381a0..5a2381a0 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
index 6ec9d681..6ec9d681 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
index 6d13bd40..6d13bd40 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
index e351ae7b..e351ae7b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
index e5bc672b..e5bc672b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
index f1f4fdd2..f1f4fdd2 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt
index 261eeb9e..261eeb9e 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt
index 261eeb9e..261eeb9e 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
index 78818fc5..78818fc5 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
index a8077d5d..a8077d5d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
index 26611b55..26611b55 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
index 750ef171..4903f01d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
@@ -23,18 +23,18 @@
     <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
   </listener>
   <listener>
-  	<listener-class>com.gluster.storage.management.gateway.listeners.ShutdownListener</listener-class>
+    <listener-class>org.gluster.storage.management.gateway.listeners.ShutdownListener</listener-class>
   </listener>
   <servlet>
     <servlet-name>gluster-resources-1.0</servlet-name>
     <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>com.gluster.storage.management.gateway.resources.v1_0</param-value>
+      <param-value>org.gluster.storage.management.gateway.resources.v1_0</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
-      <param-value>com.gluster.storage.management.gateway.filters.GlusterResourceFilterFactory</param-value>
+      <param-value>org.gluster.storage.management.gateway.filters.GlusterResourceFilterFactory</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
index 4c3d81d1..4c3d81d1 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
index 4f61fc9d..4f61fc9d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
index 5bd73813..5bd73813 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
index 17ca62d2..17ca62d2 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/index.html b/src/org.gluster.storage.management.gateway/WebContent/index.html
index 5947cf11..5947cf11 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/index.html
+++ b/src/org.gluster.storage.management.gateway/WebContent/index.html
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/Globals.py
index 7d230498..7d230498 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/Globals.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
index 7ecad84d..7ecad84d 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/Utils.py
index df26ff44..df26ff44 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/Utils.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
index 880349a1..880349a1 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
index fec57917..fec57917 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
index 03752d57..03752d57 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
index d517e46c..d517e46c 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
index be9e627c..be9e627c 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
index 3eff03fd..3eff03fd 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh b/src/org.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
index 13b9a40b..13b9a40b 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/grun.py
index 5e56bfbb..5e56bfbb 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/grun.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
index 6288f182..6288f182 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
index 32d1dec4..32d1dec4 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
index e3f44800..e3f44800 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
index 8496fae4..8496fae4 120000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
diff --git a/src/com.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore b/src/org.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
index 2efe19b0..2efe19b0 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
+++ b/src/org.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
diff --git a/src/com.gluster.storage.management.gateway/buckminster.cspex b/src/org.gluster.storage.management.gateway/buckminster.cspex
index 31eb9d67..31eb9d67 100644
--- a/src/com.gluster.storage.management.gateway/buckminster.cspex
+++ b/src/org.gluster.storage.management.gateway/buckminster.cspex
diff --git a/src/com.gluster.storage.management.gateway/build/glusterserver.ant b/src/org.gluster.storage.management.gateway/build/glusterserver.ant
index 98120ba4..9ba36f55 100644
--- a/src/com.gluster.storage.management.gateway/build/glusterserver.ant
+++ b/src/org.gluster.storage.management.gateway/build/glusterserver.ant
@@ -1,4 +1,4 @@
-<project name="com.gluster.storage.management.gateway" basedir="." default="archive">
+<project name="org.gluster.storage.management.gateway" basedir="." default="archive">
 	<echo message="basedir=${basedir}" />
 	<echo message="buckminster.output=${buckminster.output}" />
 	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
diff --git a/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml b/src/org.gluster.storage.management.gateway/src/META-INF/persistence.xml
index 36b252ea..36b252ea 100644
--- a/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml
+++ b/src/org.gluster.storage.management.gateway/src/META-INF/persistence.xml
diff --git a/src/com.gluster.storage.management.gateway/src/log4j.properties b/src/org.gluster.storage.management.gateway/src/log4j.properties
index bde9e66f..3ffa6b9e 100644
--- a/src/com.gluster.storage.management.gateway/src/log4j.properties
+++ b/src/org.gluster.storage.management.gateway/src/log4j.properties
@@ -17,4 +17,4 @@ log4j.appender.R.layout.ConversionPattern=%d{dd MMM, yyyy HH:mm:ss} %p: %c %t -
 
 log4j.logger.org=ERROR
 log4j.logger.com=ERROR
-log4j.logger.com.gluster=DEBUG
-\ No newline at end of file
+log4j.logger.org.gluster=DEBUG
+\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ClusterInfo.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java
index 3e5ea01a..ba197b92 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ClusterInfo.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/GlusterDataSource.java
index 0802fe93..f0b0311e 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/GlusterDataSource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import javax.servlet.ServletContext;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/PersistenceDao.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/PersistenceDao.java
index eb7d6514..49348084 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/PersistenceDao.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/PersistenceDao.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ServerInfo.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ServerInfo.java
index a3f8c920..84df2f1a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ServerInfo.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ServerInfo.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuditFilter.java
index f6702238..76b329ee 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuditFilter.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.gateway.filters;
+package org.gluster.storage.management.gateway.filters;
 
 import java.security.Principal;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
index 73a1085e..4bb7f37c 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.filters;
+package org.gluster.storage.management.gateway.filters;
 
 import java.io.CharArrayWriter;
 import java.io.IOException;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
index 1c480f3f..8772cdcd 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.gateway.filters;
+package org.gluster.storage.management.gateway.filters;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/listeners/ShutdownListener.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/listeners/ShutdownListener.java
index 44b72252..8c6bb42b 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/listeners/ShutdownListener.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/listeners/ShutdownListener.java
@@ -16,12 +16,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.listeners;
+package org.gluster.storage.management.gateway.listeners;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import com.gluster.storage.management.gateway.utils.DBUtil;
+import org.gluster.storage.management.gateway.utils.DBUtil;
+
 
 /**
  * Shuts down the Derby database when gateway is being stopped.
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
index 9fc4fceb..8e26c838 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
index d0da6696..3c9b3bd2 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,12 +38,12 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.response.ClusterNameListResponse;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.services.ClusterService;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.response.ClusterNameListResponse;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.services.ClusterService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
index f47675d8..12358f56 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
 
 import java.util.List;
 
@@ -32,12 +32,12 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.response.ServerListResponse;
+import org.gluster.storage.management.core.response.ServerNameListResponse;
+import org.gluster.storage.management.gateway.services.DiscoveredServerService;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.response.ServerListResponse;
-import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.gateway.services.DiscoveredServerService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
index fc9115da..dfe4c85c 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -25,8 +25,8 @@ import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
 
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 
 @Provider
 public class GenericExceptionMapper implements ExceptionMapper<Exception> {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index 3c6910fd..1b9a3b71 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -16,29 +16,29 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
-
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FSTYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MOUNTPOINT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_DISK_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_INTERFACE;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_PERIOD;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DISKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_FSTYPES;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_STATISTICS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_CPU;
-import static com.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_MEMORY;
-import static com.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_NETWORK;
+package org.gluster.storage.management.gateway.resources.v1_0;
+
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FSTYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MOUNTPOINT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_DISK_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_INTERFACE;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_PERIOD;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DISKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_FSTYPES;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_STATISTICS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_CPU;
+import static org.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_MEMORY;
+import static org.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_NETWORK;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,25 +55,25 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.response.FsTypeListResponse;
+import org.gluster.storage.management.core.response.GlusterServerListResponse;
+import org.gluster.storage.management.core.response.ServerNameListResponse;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.GlusterServerService;
+import org.gluster.storage.management.gateway.tasks.InitializeDiskTask;
+import org.gluster.storage.management.gateway.utils.CpuStatsFactory;
+import org.gluster.storage.management.gateway.utils.MemoryStatsFactory;
+import org.gluster.storage.management.gateway.utils.NetworkStatsFactory;
+import org.gluster.storage.management.gateway.utils.StatsFactory;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.response.FsTypeListResponse;
-import com.gluster.storage.management.core.response.GlusterServerListResponse;
-import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterServerService;
-import com.gluster.storage.management.gateway.tasks.InitializeDiskTask;
-import com.gluster.storage.management.gateway.utils.CpuStatsFactory;
-import com.gluster.storage.management.gateway.utils.MemoryStatsFactory;
-import com.gluster.storage.management.gateway.utils.NetworkStatsFactory;
-import com.gluster.storage.management.gateway.utils.StatsFactory;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
index 186fa59f..3063c23e 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
@@ -18,9 +18,9 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_KEYS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_KEYS;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -39,12 +39,12 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.utils.SshUtil;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.multipart.FormDataParam;
 
 @Path(RESOURCE_PATH_KEYS)
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
index 16faf7de..b57232fe 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
@@ -18,13 +18,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_TASK_ID;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_TASK_ID;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,15 +42,15 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.response.TaskInfoListResponse;
+import org.gluster.storage.management.gateway.tasks.Task;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.response.TaskInfoListResponse;
-import com.gluster.storage.management.gateway.tasks.Task;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_TASKS)
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
index 6914e505..6594ed0f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_USER;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_USERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_USER;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_USERS;
 
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
@@ -33,6 +33,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.dao.SaltSource;
 import org.springframework.security.authentication.encoding.PasswordEncoder;
@@ -43,9 +46,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.JdbcUserDetailsManager;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Status;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Singleton
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 14e7be8c..18ed0314 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -18,46 +18,46 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_AUTO_COMMIT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_ENABLE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FIX_LAYOUT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCED_DATA_MIGRATE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MIGRATE_DATA;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SOURCE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TARGET;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCE;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_VOLUME_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICK_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DELETE_OPTION;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DOWNLOAD;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_FROM_TIMESTAMP;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LINE_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LOG_SEVERITY;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TO_TIMESTAMP;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DEFAULT_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DOWNLOAD;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_LOGS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_VOLUMES;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_AUTO_COMMIT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_ENABLE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FIX_LAYOUT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCED_DATA_MIGRATE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MIGRATE_DATA;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SOURCE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TARGET;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_VOLUME_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICK_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DELETE_OPTION;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DOWNLOAD;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_FROM_TIMESTAMP;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LINE_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LOG_SEVERITY;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TO_TIMESTAMP;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DEFAULT_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DOWNLOAD;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_LOGS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_VOLUMES;
 
 import java.io.File;
 import java.util.Arrays;
@@ -76,20 +76,20 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.LogMessageListResponse;
+import org.gluster.storage.management.core.response.VolumeListResponse;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.VolumeService;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.response.LogMessageListResponse;
-import com.gluster.storage.management.core.response.VolumeListResponse;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.VolumeService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
index e806051c..a73f2d61 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.security;
+package org.gluster.storage.management.gateway.security;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/UserAuthDao.java
index cb2ecb24..b0473f0c 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/UserAuthDao.java
@@ -18,15 +18,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.security;
+package org.gluster.storage.management.gateway.security;
 
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 
 /**
  * 
@@ -36,7 +36,7 @@ public class UserAuthDao extends JdbcDaoImpl implements GlusterUserDetailsServic
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.gateway.security.GlusterUserDetailsService#changePassword(java.lang.String,
+	 * @see org.gluster.storage.management.gateway.security.GlusterUserDetailsService#changePassword(java.lang.String,
 	 * java.lang.String)
 	 */
 	@Override
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/AbstractGlusterInterface.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
index 93db0267..99935749 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  * Abstract Gluster Interface - provides functionality common across all versions of GlusterFS e.g. version check.
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/ClusterService.java
index 4bc68c5e..e7a5af3d 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/ClusterService.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,19 +24,19 @@ import java.util.List;
 import javax.persistence.EntityTransaction;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.utils.LRUCache;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.PersistenceDao;
+import org.gluster.storage.management.gateway.data.ServerInfo;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
+import org.gluster.storage.management.gateway.utils.SshUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.utils.LRUCache;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.PersistenceDao;
-import com.gluster.storage.management.gateway.data.ServerInfo;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
-import com.gluster.storage.management.gateway.utils.SshUtil;
 
 /**
  * Service class for functionality related to clusters
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/DiscoveredServerService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/DiscoveredServerService.java
index 6fad758c..95a8eecb 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/DiscoveredServerService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/DiscoveredServerService.java
@@ -16,20 +16,20 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/Gluster323InterfaceService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/Gluster323InterfaceService.java
index a4cc5575..ec7ae77e 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/Gluster323InterfaceService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/Gluster323InterfaceService.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,22 +24,22 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.StringUtil;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 /**
  * Gluster Interface for GlusterFS version 3.2.3
@@ -66,7 +66,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	private static final Logger logger = Logger.getLogger(Gluster323InterfaceService.class);
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void addServer(String existingServer, String newServer) {
@@ -76,7 +76,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void startVolume(String volumeName, String knownServer, Boolean force) {
@@ -84,7 +84,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopVolume(String volumeName, String knownServer, Boolean force) {
@@ -93,7 +93,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void resetOptions(String volumeName, String knownServer) {
@@ -101,7 +101,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void createVolume(String knownServer, String volumeName, String volumeTypeStr, String transportTypeStr,
@@ -148,7 +148,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
 	 */
 	@Override
 	public void createOptions(String volumeName, Map<String, String> options, String knownServer) {
@@ -173,7 +173,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void setOption(String volumeName, String key, String value, String knownServer) {
@@ -182,7 +182,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void deleteVolume(String volumeName, String knownServer) {
@@ -323,7 +323,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public Volume getVolume(String volumeName, String knownServer) {
@@ -331,7 +331,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
 	 */
 	@Override
 	public List<Volume> getAllVolumes(String knownServer) {
@@ -403,7 +403,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void addBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -416,7 +416,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public String getLogLocation(String volumeName, String brickName, String knownServer) {
@@ -431,7 +431,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
 	 */
 	@Override
 	public String getLogFileNameForBrickDir(String serverName, String brickDir) {
@@ -444,7 +444,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void removeBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -456,7 +456,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void removeServer(String existingServer, String serverName) {
@@ -464,7 +464,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkRebalanceStatus(String serverName, String volumeName) {
@@ -483,7 +483,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopRebalance(String serverName, String volumeName) {
@@ -516,7 +516,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String,
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String,
 	 * java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
@@ -526,7 +526,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void pauseBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -535,7 +535,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -544,7 +544,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void commitBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -553,7 +553,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkBrickMigrationStatus(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -579,7 +579,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
 	 */
 	@Override
 	public VolumeOptionInfoListResponse getVolumeOptionsInfo(String serverName) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterface.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterface.java
index a4641e07..71c9e081 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterface.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterface.java
@@ -1,13 +1,14 @@
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.List;
 import java.util.Map;
 
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+
 
 /**
  * Interface for interacting with GlusterFS. Every version of GlusterFS supported by the Gluster Management Gateway will
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterfaceService.java
index 584d5f50..07e152b8 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterfaceService.java
@@ -18,17 +18,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
 
 @Component
 public class GlusterInterfaceService extends AbstractGlusterInterface {
@@ -61,7 +61,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void addServer(String existingServer, String newServer) {
@@ -69,7 +69,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void startVolume(String volumeName, String knownServer, Boolean force) {
@@ -77,7 +77,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopVolume(String volumeName, String knownServer, Boolean force) {
@@ -89,7 +89,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void resetOptions(String volumeName, String knownServer) {
@@ -97,7 +97,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void createVolume(String knownServer, String volumeName, String volumeTypeStr, String transportTypeStr,
@@ -107,7 +107,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
 	 */
 	@Override
 	public void createOptions(String volumeName, Map<String, String> options, String knownServer) {
@@ -115,7 +115,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void setOption(String volumeName, String key, String value, String knownServer) {
@@ -123,7 +123,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void deleteVolume(String volumeName, String knownServer) {
@@ -131,7 +131,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public Volume getVolume(String volumeName, String knownServer) {
@@ -139,7 +139,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
 	 */
 	@Override
 	public List<Volume> getAllVolumes(String knownServer) {
@@ -147,7 +147,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void addBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -155,7 +155,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public String getLogLocation(String volumeName, String brickName, String knownServer) {
@@ -163,7 +163,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
 	 */
 	@Override
 	public String getLogFileNameForBrickDir(String serverName, String brickDir) {
@@ -171,7 +171,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void removeBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -179,7 +179,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void removeServer(String existingServer, String serverName) {
@@ -187,7 +187,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkRebalanceStatus(String serverName, String volumeName) {
@@ -195,7 +195,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopRebalance(String serverName, String volumeName) {
@@ -203,7 +203,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void startBrickMigration(String onlineServerName, String volumeName, String fromBrick, String toBrick) {
@@ -212,7 +212,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void pauseBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -221,7 +221,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -230,7 +230,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void commitBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -239,7 +239,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkBrickMigrationStatus(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -247,7 +247,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
 	 */
 	@Override
 	public VolumeOptionInfoListResponse getVolumeOptionsInfo(String serverName) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java
index b20fb2fe..58482958 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java
@@ -16,33 +16,33 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.response.StringListResponse;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.ServerInfo;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
+import org.gluster.storage.management.gateway.utils.SshUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.response.StringListResponse;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.ServerInfo;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
-import com.gluster.storage.management.gateway.utils.SshUtil;
 
 /**
  *
@@ -134,7 +134,7 @@ public class GlusterServerService {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServer(com.gluster.storage.management.core.model.GlusterServer, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServer(org.gluster.storage.management.core.model.GlusterServer, java.lang.String)
 	 */
 	public GlusterServer getGlusterServer(String onlineServer, String serverName) {
 		List<GlusterServer> servers = getGlusterServers(onlineServer);
@@ -165,7 +165,7 @@ public class GlusterServerService {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServers(com.gluster.storage.management.core.model.GlusterServer)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServers(org.gluster.storage.management.core.model.GlusterServer)
 	 */
 	public List<GlusterServer> getGlusterServers(String knownServerName) {
 		String output = getPeerStatus(knownServerName);
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/VolumeService.java
index 66f839d1..4235d674 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/VolumeService.java
@@ -16,11 +16,11 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.TASK_START;
-import static com.gluster.storage.management.core.constants.RESTConstants.TASK_STOP;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.TASK_START;
+import static org.gluster.storage.management.core.constants.RESTConstants.TASK_STOP;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,33 +33,33 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.LogMessageListResponse;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.resources.v1_0.TasksResource;
+import org.gluster.storage.management.gateway.tasks.MigrateBrickTask;
+import org.gluster.storage.management.gateway.tasks.RebalanceVolumeTask;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.response.LogMessageListResponse;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.DateUtil;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.resources.v1_0.TasksResource;
-import com.gluster.storage.management.gateway.tasks.MigrateBrickTask;
-import com.gluster.storage.management.gateway.tasks.RebalanceVolumeTask;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
index db95e8b6..3193d926 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.tasks;
+package org.gluster.storage.management.gateway.tasks;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -32,6 +32,10 @@ import java.util.List;
 import javax.servlet.ServletContext;
 
 import org.apache.derby.tools.ij;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.PersistenceDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
@@ -40,10 +44,6 @@ import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.PersistenceDao;
 
 /**
  * Initializes the Gluster Management Server.
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
index 73b1e78f..45be980a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
@@ -18,21 +18,21 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.tasks;
-
+package org.gluster.storage.management.gateway.tasks;
+
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.model.InitDiskStatusResponse;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.InitDiskStatusResponse.FORMAT_STATUS;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.model.InitDiskStatusResponse;
-import com.gluster.storage.management.core.model.InitDiskStatusResponse.FORMAT_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class InitializeDiskTask extends Task {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
index e5cb17f1..8a31f9a9 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
@@ -18,19 +18,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.tasks;
-
+package org.gluster.storage.management.gateway.tasks;
+
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.GlusterInterfaceService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class MigrateBrickTask extends Task {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
index 410260ca..288179e9 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
@@ -18,19 +18,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.tasks;
+package org.gluster.storage.management.gateway.tasks;
 
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.GlusterInterfaceService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class RebalanceVolumeTask extends Task {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/ServerSyncTask.java
index 8d788925..c3073d97 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/ServerSyncTask.java
@@ -18,27 +18,27 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.tasks;
+package org.gluster.storage.management.gateway.tasks;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.PersistenceDao;
+import org.gluster.storage.management.gateway.data.ServerInfo;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.DiscoveredServerService;
+import org.gluster.storage.management.gateway.services.GlusterServerService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.PersistenceDao;
-import com.gluster.storage.management.gateway.data.ServerInfo;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.DiscoveredServerService;
-import com.gluster.storage.management.gateway.services.GlusterServerService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  * Task for syncing server details. This performs two things: <br>
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/Task.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/Task.java
index 1ba360bc..0fee3c2e 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/Task.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/Task.java
@@ -18,13 +18,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.tasks;
+package org.gluster.storage.management.gateway.tasks;
+
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
 
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
 
 public abstract class Task {
 	public String[] TASK_TYPE_STR = { "Format Disk", "Migrate Brick", "Volume Rebalance" };
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
index 7f3045ba..ebc1ccba 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
@@ -16,17 +16,17 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/CpuStatsFactory.java
index b6ef9ef2..412794eb 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/CpuStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import org.springframework.stereotype.Component;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/DBUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/DBUtil.java
index ca4821d1..1c186a0a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/DBUtil.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/DBUtil.java
@@ -16,14 +16,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
index dc88bf52..691662e6 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
@@ -16,14 +16,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
index fdc4b1d2..03c252a9 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
@@ -16,21 +16,21 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.NetworkInterface;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
+import org.gluster.storage.management.core.utils.ProcessUtil;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.NetworkInterface;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
-import com.gluster.storage.management.core.utils.ProcessUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/PasswordManager.java
index 6af08049..a44b5bf3 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/PasswordManager.java
@@ -16,15 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import org.apache.derby.jdbc.EmbeddedDriver;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.gateway.security.UserAuthDao;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.security.authentication.dao.ReflectionSaltSource;
 import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.gateway.security.UserAuthDao;
 
 /**
  * Tool to reset password of default user gluster
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java
index 63f2bbf4..f65c5640 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -33,21 +33,21 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.response.StringListResponse;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.services.GlusterInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.response.StringListResponse;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
 
 @Component
 public class ServerUtil {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/SshUtil.java
index 706fef31..074cbd5b 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/SshUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -26,6 +26,12 @@ import java.io.InputStreamReader;
 import java.util.Arrays;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.core.utils.LRUCache;
+import org.gluster.storage.management.core.utils.ProcessResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -35,12 +41,6 @@ import ch.ethz.ssh2.SCPClient;
 import ch.ethz.ssh2.Session;
 import ch.ethz.ssh2.StreamGobbler;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.core.utils.LRUCache;
-import com.gluster.storage.management.core.utils.ProcessResult;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/StatsFactory.java
index 09851367..f856c05a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/StatsFactory.java
@@ -16,11 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
-import com.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStats;
+
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/rebel.xml b/src/org.gluster.storage.management.gateway/src/rebel.xml
index 0f2140c9..08707b75 100644
--- a/src/com.gluster.storage.management.gateway/src/rebel.xml
+++ b/src/org.gluster.storage.management.gateway/src/rebel.xml
@@ -2,13 +2,13 @@
 <application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
 
 	<classpath>
-		<dir name="${rebel.workspace.path}/console/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/classes">
+		<dir name="${rebel.workspace.path}/console/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/classes">
 		</dir>
 	</classpath>
 
 	<web>
 		<link target="/">
-			<dir name="${rebel.workspace.path}/console/src/com.gluster.storage.management.gateway/WebContent">
+			<dir name="${rebel.workspace.path}/console/src/org.gluster.storage.management.gateway/WebContent">
 			</dir>
 		</link>
 	</web>
diff --git a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-base.xml b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
index 72eb0409..ea3754f5 100644
--- a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
+++ b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
@@ -7,7 +7,7 @@
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd 
    http://www.springframework.org/schema/tx  http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-	<context:component-scan base-package="com.gluster.storage.management.gateway" />
+	<context:component-scan base-package="org.gluster.storage.management.gateway" />
 	<task:scheduler id="taskScheduler" />
 	<task:executor id="taskExecutor" pool-size="1" />
 	<task:annotation-driven executor="taskExecutor" scheduler="taskScheduler" />
@@ -69,19 +69,19 @@
 	<bean
         class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
 
-	<bean id="clusterDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
+	<bean id="clusterDao" class="org.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.gateway.data.ClusterInfo</value>
+			<value>org.gluster.storage.management.gateway.data.ClusterInfo</value>
 		</constructor-arg>
 	</bean>
 
-	<bean id="serverDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
+	<bean id="serverDao" class="org.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.gateway.data.ServerInfo</value>
+			<value>org.gluster.storage.management.gateway.data.ServerInfo</value>
 		</constructor-arg>
 	</bean>
 	
-	<!-- bean id="dataSourceFactory" class="com.gluster.storage.management.gateway.data.GlusterDataSource" />
+	<!-- bean id="dataSourceFactory" class="org.gluster.storage.management.gateway.data.GlusterDataSource" />
 		<bean id="dataSource" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetObject">
 		<ref local="dataSourceFactory" />
@@ -91,10 +91,10 @@
 		</property>
 		</bean -->
 
-	<!-- bean id="dataSource" class="com.gluster.storage.management.gateway.data.GlusterDataSource"
+	<!-- bean id="dataSource" class="org.gluster.storage.management.gateway.data.GlusterDataSource"
 		lazy-init="false" autowire="byType" / -->
 
-	<bean class="com.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
+	<bean class="org.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 </beans>
 \ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-security.xml b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
index e160d31a..e160d31a 100644
--- a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
+++ b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
author	Shireesh Anjal <shireesh@gluster.com>	2011-11-25 20:13:35 +0530
committer	Shireesh Anjal <shireesh@gluster.com>	2011-11-25 20:13:35 +0530
commit	1142b0e41de39010de7845cf70d71dbb001fc1dc (patch)
tree	3513487f65c1a7df47996bd2852393aceaac1b8a
parent	92c52d8edf285945d31e446503fc742fde9dcc49 (diff)