Renamed project/package com.gluster.storage.management.gui to com.gluster.storage.management.console

278 files changed, 734 insertions, 734 deletions

diff --git a/src/com.gluster.storage.management.gui.feature.webstart/.project b/src/com.gluster.storage.management.console.feature.webstart/.project
index 03adbe4c..ebf9c846 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/.project
+++ b/src/com.gluster.storage.management.console.feature.webstart/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gui.feature.webstart</name>
+	<name>com.gluster.storage.management.console.feature.webstart</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/buckminster.cspex b/src/com.gluster.storage.management.console.feature.webstart/buckminster.cspex
index 252a5e15..252a5e15 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/buckminster.cspex
+++ b/src/com.gluster.storage.management.console.feature.webstart/buckminster.cspex
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/build.properties b/src/com.gluster.storage.management.console.feature.webstart/build.properties
index 322a3114..322a3114 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/build.properties
+++ b/src/com.gluster.storage.management.console.feature.webstart/build.properties
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/build/gluster.keystore b/src/com.gluster.storage.management.console.feature.webstart/build/gluster.keystore
index ee3bc3a9..ee3bc3a9 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/build/gluster.keystore
+++ b/src/com.gluster.storage.management.console.feature.webstart/build/gluster.keystore
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/build/glustermc.ant b/src/com.gluster.storage.management.console.feature.webstart/build/glustermc.ant
index 6b0152f6..6b0152f6 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/build/glustermc.ant
+++ b/src/com.gluster.storage.management.console.feature.webstart/build/glustermc.ant
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/feature.xml b/src/com.gluster.storage.management.console.feature.webstart/feature.xml
index 0c7142fe..94717400 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/feature.xml
+++ b/src/com.gluster.storage.management.console.feature.webstart/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.gluster.storage.management.gui.feature.webstart"
-      label="Gluster Management Console - GUI Feature for Webstart"
+      id="com.gluster.storage.management.console.feature.webstart"
+      label="Gluster Management Console - Webstart"
       version="1.0.0"
       provider-name="Gluster Inc."
       os="linux,macosx,win32"
@@ -21,7 +21,7 @@
    </license>
 
    <includes
-         id="com.gluster.storage.management.gui.feature"
+         id="com.gluster.storage.management.console.feature"
          version="0.0.0"/>
 
    <requires>
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp b/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
index afe3bd2e..4d0dc72c 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp
+++ b/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
@@ -20,7 +20,7 @@
 		<jar href="plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar" main="true"/>
 		<extension
 			name="Gluster Management Console"
-			href="com.gluster.storage.management.gui.feature_1.0.0.jnlp"/>
+			href="com.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.gui.product"/>
+			value="com.gluster.storage.management.console.product"/>
 		<property
 			name="gluster.server.url"
 			value="$$codebase"/>
@@ -41,4 +41,4 @@
         <property name="osgi.ws" value="gtk"/>
   	</resources>	
 	<application-desc main-class="org.eclipse.equinox.launcher.WebStartMain" />
-</jnlp>
\ No newline at end of file
+</jnlp>
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/splash.jpg b/src/com.gluster.storage.management.console.feature.webstart/rootfiles/splash.jpg
index de8b5219..de8b5219 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/splash.jpg
+++ b/src/com.gluster.storage.management.console.feature.webstart/rootfiles/splash.jpg
diff --git a/src/com.gluster.storage.management.gui.feature/.project b/src/com.gluster.storage.management.console.feature/.project
index c93780b5..a736d116 100644
--- a/src/com.gluster.storage.management.gui.feature/.project
+++ b/src/com.gluster.storage.management.console.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gui.feature</name>
+	<name>com.gluster.storage.management.console.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.gui.feature/build.properties b/src/com.gluster.storage.management.console.feature/build.properties
index 64f93a9f..64f93a9f 100644
--- a/src/com.gluster.storage.management.gui.feature/build.properties
+++ b/src/com.gluster.storage.management.console.feature/build.properties
diff --git a/src/com.gluster.storage.management.gui.feature/feature.xml b/src/com.gluster.storage.management.console.feature/feature.xml
index cbf97e35..e5899660 100644
--- a/src/com.gluster.storage.management.gui.feature/feature.xml
+++ b/src/com.gluster.storage.management.console.feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="com.gluster.storage.management.gui.feature"
-      label="Gluster Storage Platform - GUI Feature"
+      id="com.gluster.storage.management.console.feature"
+      label="Gluster Management Console"
       version="1.0.0"
-      provider-name="GLUSTER"
+      provider-name="Gluster, Inc."
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64,amd64">
@@ -225,7 +225,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.gui"
+         id="com.gluster.storage.management.console"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/src/com.gluster.storage.management.gui/.classpath b/src/com.gluster.storage.management.console/.classpath
index ad32c83a..ad32c83a 100644
--- a/src/com.gluster.storage.management.gui/.classpath
+++ b/src/com.gluster.storage.management.console/.classpath
diff --git a/src/com.gluster.storage.management.gui/.project b/src/com.gluster.storage.management.console/.project
index 84ab78e4..8a79d266 100644
--- a/src/com.gluster.storage.management.gui/.project
+++ b/src/com.gluster.storage.management.console/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gui</name>
+	<name>com.gluster.storage.management.console</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.gui/.settings/org.eclipse.jdt.core.prefs b/src/com.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
index abf7cf5a..abf7cf5a 100644
--- a/src/com.gluster.storage.management.gui/.settings/org.eclipse.jdt.core.prefs
+++ b/src/com.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
index 55029ee6..fcb162c1 100644
--- a/src/com.gluster.storage.management.gui/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: glustersp-gui
-Bundle-SymbolicName: com.gluster.storage.management.gui;singleton:=true
+Bundle-SymbolicName: com.gluster.storage.management.console;singleton:=true
 Bundle-Version: 1.0.0
-Bundle-Activator: com.gluster.storage.management.gui.Activator
+Bundle-Activator: com.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",
diff --git a/src/com.gluster.storage.management.gui/build.properties b/src/com.gluster.storage.management.console/build.properties
index 47ced62b..47ced62b 100644
--- a/src/com.gluster.storage.management.gui/build.properties
+++ b/src/com.gluster.storage.management.console/build.properties
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/arrow-down.png b/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
index 7f23e3f4..7f23e3f4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/arrow-down.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/arrow-up.png b/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
index b8ad3050..b8ad3050 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/arrow-up.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/bricks.png b/src/com.gluster.storage.management.console/icons/tango/16x16/bricks.png
index ed381bd5..ed381bd5 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/bricks.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/bricks.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/close_task.png b/src/com.gluster.storage.management.console/icons/tango/16x16/close_task.png
index 933272b4..933272b4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/close_task.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/close_task.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/cluster.png b/src/com.gluster.storage.management.console/icons/tango/16x16/cluster.png
index c9348a21..c9348a21 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/cluster.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/cluster.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-available.png b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-available.png
index c3c5f3b1..c3c5f3b1 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-available.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-available.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-error.png b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-error.png
index 314fa2f3..314fa2f3 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-error.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-error.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-initialisation.png b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
index 71d0107c..71d0107c 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-initialisation.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-inuse.png b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
index e4954c6a..e4954c6a 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-inuse.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-uninitialized.png b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
index ba3b48a4..ba3b48a4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk-uninitialized.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk.png b/src/com.gluster.storage.management.console/icons/tango/16x16/disk.png
index b74fb20e..b74fb20e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/disk.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/disk.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/gluster_icon.png b/src/com.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
index f92e472d..f92e472d 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/gluster_icon.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/help.png b/src/com.gluster.storage.management.console/icons/tango/16x16/help.png
index f25fc3fb..f25fc3fb 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/help.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/help.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/logs.png b/src/com.gluster.storage.management.console/icons/tango/16x16/logs.png
index 124f322f..124f322f 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/logs.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/logs.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/offline-brick.png b/src/com.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
index 48812db8..48812db8 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/offline-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/online-brick.png b/src/com.gluster.storage.management.console/icons/tango/16x16/online-brick.png
index da895838..da895838 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/online-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/online-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/pause.png b/src/com.gluster.storage.management.console/icons/tango/16x16/pause.png
index 04923149..04923149 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/pause.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/pause.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/question.png b/src/com.gluster.storage.management.console/icons/tango/16x16/question.png
index 30a47032..30a47032 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/question.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/question.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/running-task.png b/src/com.gluster.storage.management.console/icons/tango/16x16/running-task.png
index ad679b8b..ad679b8b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/running-task.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/running-task.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/server.png b/src/com.gluster.storage.management.console/icons/tango/16x16/server.png
index d0b397be..d0b397be 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/servers.png b/src/com.gluster.storage.management.console/icons/tango/16x16/servers.png
index 0efee57e..0efee57e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/servers.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/servers.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/settings.png b/src/com.gluster.storage.management.console/icons/tango/16x16/settings.png
index d90ab661..d90ab661 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/settings.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/settings.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/start.png b/src/com.gluster.storage.management.console/icons/tango/16x16/start.png
index d4413259..d4413259 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/start.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/start.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/status-offline.png b/src/com.gluster.storage.management.console/icons/tango/16x16/status-offline.png
index dbd0204e..dbd0204e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/status-offline.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/status-offline.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/status-online.png b/src/com.gluster.storage.management.console/icons/tango/16x16/status-online.png
index a31ba599..a31ba599 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/status-online.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/status-online.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/stop.png b/src/com.gluster.storage.management.console/icons/tango/16x16/stop.png
index 8f591c63..8f591c63 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/stop.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/stop.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/task-completed.png b/src/com.gluster.storage.management.console/icons/tango/16x16/task-completed.png
index 5de2361a..5de2361a 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/task-completed.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/task-completed.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/task-error.png b/src/com.gluster.storage.management.console/icons/tango/16x16/task-error.png
index 1fc66ad2..1fc66ad2 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/task-error.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/task-error.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/view-refresh.png b/src/com.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
index 3fd71d6e..3fd71d6e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/view-refresh.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/volume-create.png b/src/com.gluster.storage.management.console/icons/tango/16x16/volume-create.png
index 628f4d50..628f4d50 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/volume-create.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/volume-create.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/volume-options.png b/src/com.gluster.storage.management.console/icons/tango/16x16/volume-options.png
index d7665cb7..d7665cb7 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/volume-options.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/volume-options.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/volume.png b/src/com.gluster.storage.management.console/icons/tango/16x16/volume.png
index 41376404..41376404 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/16x16/volumes.png b/src/com.gluster.storage.management.console/icons/tango/16x16/volumes.png
index 18c2ad8b..18c2ad8b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/16x16/volumes.png
+++ b/src/com.gluster.storage.management.console/icons/tango/16x16/volumes.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png b/src/com.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
index 73ecf4c0..73ecf4c0 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/disk-initialisation.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png b/src/com.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
index b7c166ab..b7c166ab 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/high-memory-usage.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png b/src/com.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
index 983012ad..983012ad 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/low-diskspace.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png b/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
index 57694d4b..57694d4b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png b/src/com.gluster.storage.management.console/icons/tango/22x22/offline-server.png
index 5900c724..5900c724 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/offline-server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/offline-server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png b/src/com.gluster.storage.management.console/icons/tango/22x22/replace-brick.png
index 48a66c8c..48a66c8c 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/replace-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/replace-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png b/src/com.gluster.storage.management.console/icons/tango/22x22/server-warning.png
index 9e2da0bc..9e2da0bc 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/server-warning.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/server-warning.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/system-search.png b/src/com.gluster.storage.management.console/icons/tango/22x22/system-search.png
index 4e522b23..4e522b23 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/system-search.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/system-search.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png b/src/com.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
index 4539822c..4539822c 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/22x22/volume-rebalance.png
+++ b/src/com.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/add-brick.png b/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick.png
index 81304ab4..81304ab4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/add-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png b/src/com.gluster.storage.management.console/icons/tango/32x32/add-server.png
index 29a512f2..29a512f2 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/add-server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/add-server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/clear-task.png b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task.png
index db17be6b..db17be6b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/clear-task.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/commit-task.png b/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task.png
index ff0c9452..ff0c9452 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/commit-task.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/create-volume-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
index d7b69f97..d7b69f97 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/create-volume-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/create-volume.png b/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume.png
index b43289b6..b43289b6 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/create-volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/disk.png b/src/com.gluster.storage.management.console/icons/tango/32x32/disk.png
index b34d8b77..b34d8b77 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/disk.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/disk.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/download-log.png b/src/com.gluster.storage.management.console/icons/tango/32x32/download-log.png
index 62bf9d7e..62bf9d7e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/download-log.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/download-log.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/help.png b/src/com.gluster.storage.management.console/icons/tango/32x32/help.png
index d60425f7..d60425f7 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/help.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/help.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/logs.png b/src/com.gluster.storage.management.console/icons/tango/32x32/logs.png
index b62959e4..b62959e4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/logs.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/logs.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/pause.png b/src/com.gluster.storage.management.console/icons/tango/32x32/pause.png
index 597bc014..597bc014 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/pause.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/pause.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-brick-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
index 8dbbf3c1..8dbbf3c1 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-brick-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-brick.png b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
index 83a657a2..83a657a2 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-server.png b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server.png
index fba00869..fba00869 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
index b7392805..b7392805 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/remove-volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/replace-brick.png b/src/com.gluster.storage.management.console/icons/tango/32x32/replace-brick.png
index 999332a5..999332a5 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/replace-brick.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/replace-brick.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/reset-volume-option.png b/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
index 77203284..77203284 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/reset-volume-option.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/server.png b/src/com.gluster.storage.management.console/icons/tango/32x32/server.png
index e34eb4e4..e34eb4e4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/servers.png b/src/com.gluster.storage.management.console/icons/tango/32x32/servers.png
index dca03af4..dca03af4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/servers.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/servers.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/settings.png b/src/com.gluster.storage.management.console/icons/tango/32x32/settings.png
index 565f406d..565f406d 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/settings.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/settings.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/start-volume-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
index ad14408b..ad14408b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/start-volume-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/start-volume.png b/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume.png
index d357d291..d357d291 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/start-volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/start.png b/src/com.gluster.storage.management.console/icons/tango/32x32/start.png
index 578736ec..578736ec 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/start.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/start.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/stop-volume-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
index b70b2042..b70b2042 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/stop-volume-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/stop-volume.png b/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
index 5cc5e1fb..5cc5e1fb 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/stop-volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/stop.png b/src/com.gluster.storage.management.console/icons/tango/32x32/stop.png
index 615e465b..615e465b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/stop.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/stop.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/view-refresh.png b/src/com.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
index 606ea9eb..606ea9eb 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/view-refresh.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/volume-rebalance.png b/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
index eb63ec20..eb63ec20 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/volume-rebalance.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/32x32/volume.png b/src/com.gluster.storage.management.console/icons/tango/32x32/volume.png
index 3e0d9add..3e0d9add 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/32x32/volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/32x32/volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.png b/src/com.gluster.storage.management.console/icons/tango/48x48/add-server.png
index 3e615b62..3e615b62 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/48x48/add-server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/48x48/add-server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/create-volume.png b/src/com.gluster.storage.management.console/icons/tango/48x48/create-volume.png
index 88a494cc..88a494cc 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/48x48/create-volume.png
+++ b/src/com.gluster.storage.management.console/icons/tango/48x48/create-volume.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/remove-brick-disabled.png b/src/com.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
index 368b6696..368b6696 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/48x48/remove-brick-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/server.png b/src/com.gluster.storage.management.console/icons/tango/48x48/server.png
index a568c0b8..a568c0b8 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/48x48/server.png
+++ b/src/com.gluster.storage.management.console/icons/tango/48x48/server.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/start-volume-disabled.png b/src/com.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
index fcf25df4..fcf25df4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/48x48/start-volume-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/48x48/stop-volume-disabled.png b/src/com.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
index f418875a..f418875a 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/48x48/stop-volume-disabled.png
+++ b/src/com.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/8x8/offline.png b/src/com.gluster.storage.management.console/icons/tango/8x8/offline.png
index 6b33d298..6b33d298 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/8x8/offline.png
+++ b/src/com.gluster.storage.management.console/icons/tango/8x8/offline.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/8x8/online.png b/src/com.gluster.storage.management.console/icons/tango/8x8/online.png
index 58a61f1a..58a61f1a 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/8x8/online.png
+++ b/src/com.gluster.storage.management.console/icons/tango/8x8/online.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/8x8/star.png b/src/com.gluster.storage.management.console/icons/tango/8x8/star.png
index 5f8fc748..5f8fc748 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/8x8/star.png
+++ b/src/com.gluster.storage.management.console/icons/tango/8x8/star.png
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/add_brick.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
index b1fb427c..b1fb427c 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/add_brick.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/add_volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
index 66307f36..66307f36 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/add_volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/brick.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/brick.svg
index 365110f2..365110f2 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/brick.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/brick.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/brick_migration.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
index 280b4c4f..280b4c4f 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/brick_migration.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/bricks.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/bricks.svg
index 39af40f2..39af40f2 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/bricks.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/bricks.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/cloud.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/cloud.svg
index d51128ac..d51128ac 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/cloud.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/cloud.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/create-volume-disabled.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
index 2cc8da4e..2cc8da4e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/create-volume-disabled.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/create-volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
index 14a5823f..14a5823f 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/create-volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk (32-32).svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
index bfe35cce..bfe35cce 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk (32-32).svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk (48-48).svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
index 79f172df..79f172df 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk (48-48).svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk.svg
index 730e9b27..730e9b27 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_available.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
index 667535c1..667535c1 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_available.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_error.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
index 1dda3bbf..1dda3bbf 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_error.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_initialisation.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
index 5bffaa8f..5bffaa8f 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_initialisation.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_inuse.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
index 5d5388b2..5d5388b2 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_inuse.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_uninitialised.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
index f3cdd2ee..f3cdd2ee 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/disk_uninitialised.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/download_log.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/download_log.svg
index 2ac27d12..2ac27d12 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/download_log.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/download_log.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/high_CPU_usage.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
index 1ed67ab8..1ed67ab8 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/high_CPU_usage.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/high_memory_usage.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
index 0ee3b389..0ee3b389 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/high_memory_usage.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/log.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/log.svg
index 42559766..42559766 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/log.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/log.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/low_diskspace.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
index dc5faa1b..dc5faa1b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/low_diskspace.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline-8x8.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
index fb587339..fb587339 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline-8x8.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/offline.svg
index 9ee10367..9ee10367 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/offline.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline_brick_alert.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
index 5bc030db..5bc030db 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline_brick_alert.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline_server.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
index f1f50c40..f1f50c40 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline_server.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline_volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
index 8146a910..8146a910 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/offline_volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/online-8x8.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
index 8cef7653..8cef7653 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/online-8x8.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/online.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/online.svg
index c25a4232..c25a4232 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/online.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/online.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/remove-server.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
index 4280df60..4280df60 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/remove-server.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/remove_brick.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
index 450b24c8..450b24c8 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/remove_brick.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/remove_volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
index 83055628..83055628 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/remove_volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/reset_volume_option.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
index cd048c2b..cd048c2b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/reset_volume_option.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/running_task.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/running_task.svg
index d9cf0582..d9cf0582 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/running_task.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/running_task.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/star-8x8.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
index f3027569..f3027569 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/star-8x8.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/start-volume-disabled.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
index 3ef559c7..3ef559c7 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/start-volume-disabled.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/start_volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
index 5e738c33..5e738c33 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/start_volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/stop_volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
index 315bb09b..315bb09b 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/stop_volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_clear.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
index 02b0b919..02b0b919 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_clear.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_commit.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
index 29817471..29817471 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_commit.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_pause.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
index ff9b5f3e..ff9b5f3e 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_pause.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_paused.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
index 9d6930e1..9d6930e1 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_paused.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_resume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
index 2bd8732c..2bd8732c 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_resume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_running.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_running.svg
index fa15b7b8..fa15b7b8 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_running.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_running.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_status_completed.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
index ce0bf238..ce0bf238 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_status_completed.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_status_error.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
index 5fb8b116..5fb8b116 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_status_error.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_stop.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
index 07227fd4..07227fd4 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_stop.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_stopped.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
index d900f03f..d900f03f 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/task_stopped.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/view-refresh.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
index 565f6dad..565f6dad 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/view-refresh.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/volume.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/volume.svg
index b5e50a46..b5e50a46 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/volume.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/volume.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/volume_option.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
index 3fb4a928..3fb4a928 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/volume_option.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/volume_rebalance.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
index 78fdc384..78fdc384 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/volume_rebalance.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
diff --git a/src/com.gluster.storage.management.gui/icons/tango/scalable/volumes.svg b/src/com.gluster.storage.management.console/icons/tango/scalable/volumes.svg
index 3c99b006..3c99b006 100644
--- a/src/com.gluster.storage.management.gui/icons/tango/scalable/volumes.svg
+++ b/src/com.gluster.storage.management.console/icons/tango/scalable/volumes.svg
diff --git a/src/com.gluster.storage.management.gui/images/gauge.png b/src/com.gluster.storage.management.console/images/gauge.png
index 6f5764ea..6f5764ea 100644
--- a/src/com.gluster.storage.management.gui/images/gauge.png
+++ b/src/com.gluster.storage.management.console/images/gauge.png
diff --git a/src/com.gluster.storage.management.gui/images/gauge_small.png b/src/com.gluster.storage.management.console/images/gauge_small.png
index 71e424fe..71e424fe 100644
--- a/src/com.gluster.storage.management.gui/images/gauge_small.png
+++ b/src/com.gluster.storage.management.console/images/gauge_small.png
diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 2c763d26..362bb221 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -7,7 +7,7 @@
          point="org.eclipse.core.runtime.applications">
       <application>
          <run
-               class="com.gluster.storage.management.gui.Application">
+               class="com.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.gui.Perspective"
-            id="com.gluster.storage.management.gui.Perspective">
+            class="com.gluster.storage.management.console.Perspective"
+            id="com.gluster.storage.management.console.Perspective">
       </perspective>
    </extension>
    <extension
          point="org.eclipse.ui.views">
       <view
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.NavigationView"
-            id="com.gluster.storage.management.gui.views.NavigationView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.NavigationView"
+            id="com.gluster.storage.management.console.views.NavigationView"
             name="Cluster Navigation Tree"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.DiscoveredServersView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.DiscoveredServersView"
             icon="icons/tango/16x16/servers.png"
-            id="com.gluster.storage.management.gui.views.DiscoveredServersView"
+            id="com.gluster.storage.management.console.views.DiscoveredServersView"
             name="Discovered Servers"
             restorable="true">
       </view>
       <view
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.DiscoveredServerView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.DiscoveredServerView"
             icon="icons/tango/16x16/server.png"
-            id="com.gluster.storage.management.gui.views.DiscoveredServerView"
+            id="com.gluster.storage.management.console.views.DiscoveredServerView"
             name="Discovered Server"
             restorable="true">
       </view>
       <category
-            id="com.gluster.storage.management.gui.category"
+            id="com.gluster.storage.management.console.category"
             name="Gluster Managament Console">
       </category>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumesView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.VolumesView"
             icon="icons/tango/16x16/volumes.png"
-            id="com.gluster.storage.management.gui.views.VolumesView"
+            id="com.gluster.storage.management.console.views.VolumesView"
             name="Volumes"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumesSummaryView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.VolumesSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.gui.views.VolumesSummaryView"
+            id="com.gluster.storage.management.console.views.VolumesSummaryView"
             name="Summary (Volumes)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.ClusterSummaryView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.ClusterSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.gui.views.ClusterSummaryView"
+            id="com.gluster.storage.management.console.views.ClusterSummaryView"
             name="Summary (Cluster)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumeSummaryView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.VolumeSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.gui.views.VolumeSummaryView"
+            id="com.gluster.storage.management.console.views.VolumeSummaryView"
             name="Summary (Volume)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumeBricksView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.VolumeBricksView"
             icon="icons/tango/16x16/bricks.png"
-            id="com.gluster.storage.management.gui.views.VolumeBricksView"
+            id="com.gluster.storage.management.console.views.VolumeBricksView"
             name="Bricks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumeOptionsView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.VolumeOptionsView"
             icon="icons/tango/16x16/volume-options.png"
-            id="com.gluster.storage.management.gui.views.VolumeOptionsView"
+            id="com.gluster.storage.management.console.views.VolumeOptionsView"
             name="Volume Options"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.VolumeLogsView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.VolumeLogsView"
             icon="icons/tango/16x16/logs.png"
-            id="com.gluster.storage.management.gui.views.VolumeLogsView"
+            id="com.gluster.storage.management.console.views.VolumeLogsView"
             name="Volume Logs"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.GlusterServersSummaryView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.GlusterServersSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.gui.views.GlusterServersSummaryView"
+            id="com.gluster.storage.management.console.views.GlusterServersSummaryView"
             name="Summary (Servers)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.GlusterServersView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.GlusterServersView"
             icon="icons/tango/16x16/servers.png"
-            id="com.gluster.storage.management.gui.views.GlusterServersView"
+            id="com.gluster.storage.management.console.views.GlusterServersView"
             name="Servers"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.DisksView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.DisksView"
             icon="icons/tango/16x16/disk.png"
-            id="com.gluster.storage.management.gui.views.DisksView"
+            id="com.gluster.storage.management.console.views.DisksView"
             name="Disks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.GlusterServerSummaryView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.GlusterServerSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.gui.views.GlusterServerSummaryView"
+            id="com.gluster.storage.management.console.views.GlusterServerSummaryView"
             name="Summary (Server)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.GlusterServerDisksView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.GlusterServerDisksView"
             icon="icons/tango/16x16/disk.png"
-            id="com.gluster.storage.management.gui.views.GlusterServerDisksView"
+            id="com.gluster.storage.management.console.views.GlusterServerDisksView"
             name="Server Disks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.GlusterServerLogsView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.GlusterServerLogsView"
             icon="icons/tango/16x16/logs.png"
-            id="com.gluster.storage.management.gui.views.GlusterServerLogsView"
+            id="com.gluster.storage.management.console.views.GlusterServerLogsView"
             name="Server Logs"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.gui.category"
-            class="com.gluster.storage.management.gui.views.TasksView"
+            category="com.gluster.storage.management.console.category"
+            class="com.gluster.storage.management.console.views.TasksView"
             icon="icons/tango/16x16/running-task.png"
-            id="com.gluster.storage.management.gui.views.TasksView"
+            id="com.gluster.storage.management.console.views.TasksView"
             name="Tasks"
             restorable="true">
       </view>
@@ -180,188 +180,188 @@
          point="org.eclipse.ui.commands">
       <category
             name="Gluster Commands"
-            id="com.gluster.storage.management.gui.category">
+            id="com.gluster.storage.management.console.category">
       </category>
       <command
             name="Create Volume"
             description="Create a new Volume"
-            categoryId="com.gluster.storage.management.gui.category"
-            id="com.gluster.storage.management.gui.commands.CreateVolume">
+            categoryId="com.gluster.storage.management.console.category"
+            id="com.gluster.storage.management.console.commands.CreateVolume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Delete Volume"
-            id="com.gluster.storage.management.gui.commands.DeleteVolume"
+            id="com.gluster.storage.management.console.commands.DeleteVolume"
             name="Delete Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Start Volume"
-            id="com.gluster.storage.management.gui.commands.StartVolume"
+            id="com.gluster.storage.management.console.commands.StartVolume"
             name="Start Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Stop Volume"
-            id="com.gluster.storage.management.gui.commands.StopVolume"
+            id="com.gluster.storage.management.console.commands.StopVolume"
             name="Stop Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Edit Volume"
-            id="com.gluster.storage.management.gui.commands.EditVolume"
+            id="com.gluster.storage.management.console.commands.EditVolume"
             name="Edit Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Reset all options of a Volume"
-            id="com.gluster.storage.management.gui.commands.ResetVolumeOptions"
+            id="com.gluster.storage.management.console.commands.ResetVolumeOptions"
             name="Reset Options">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Rebalance Volume"
-            id="com.gluster.storage.management.gui.commands.RebalanceVolume"
+            id="com.gluster.storage.management.console.commands.RebalanceVolume"
             name="Rebalance Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Add Server(s) to Cluster"
-            id="com.gluster.storage.management.gui.commands.AddServer"
+            id="com.gluster.storage.management.console.commands.AddServer"
             name="Add Server(s)">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Remove Server(s) from Cluster"
-            id="com.gluster.storage.management.gui.commands.RemoveServer"
+            id="com.gluster.storage.management.console.commands.RemoveServer"
             name="Remove Server(s)">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Migrate Brick"
-            id="com.gluster.storage.management.gui.commands.MigrateDisk"
+            id="com.gluster.storage.management.console.commands.MigrateDisk"
             name="Migrate Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Remove Brick"
-            id="com.gluster.storage.management.gui.commands.RemoveDisk"
+            id="com.gluster.storage.management.console.commands.RemoveDisk"
             name="Remove Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Add Brick"
-            id="com.gluster.storage.management.gui.commands.AddDisk"
+            id="com.gluster.storage.management.console.commands.AddDisk"
             name="Add Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Pause Task"
-            id="com.gluster.storage.management.gui.commands.Pause"
+            id="com.gluster.storage.management.console.commands.Pause"
             name="Pause">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Resume Task"
-            id="com.gluster.storage.management.gui.commands.Resume"
+            id="com.gluster.storage.management.console.commands.Resume"
             name="Resume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Stop Task"
-            id="com.gluster.storage.management.gui.commands.Stop"
+            id="com.gluster.storage.management.console.commands.Stop"
             name="Stop">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Delete Task"
-            id="com.gluster.storage.management.gui.commands.Delete"
+            id="com.gluster.storage.management.console.commands.Delete"
             name="Delete">
       </command>
       <command
-            categoryId="com.gluster.storage.management.gui.category"
+            categoryId="com.gluster.storage.management.console.category"
             description="Change Password"
-            id="com.gluster.storage.management.gui.commands.ChangePassword"
+            id="com.gluster.storage.management.console.commands.ChangePassword"
             name="Change Password">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="com.gluster.storage.management.gui.commands.CreateVolume"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.CreateVolume"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+C">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.DeleteVolume"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.DeleteVolume"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+D">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.StartVolume"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.StartVolume"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+S">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.StopVolume"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.StopVolume"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+T">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.EditVolume"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.EditVolume"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+E">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.RebalanceVolume"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.RebalanceVolume"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+B">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.AddServer"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.AddServer"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+A">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.RemoveServer"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.RemoveServer"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+R">
       </key>
       <key
-            commandId="com.gluster.storage.management.gui.commands.MigrateDisk"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.MigrateDisk"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+M">
       </key>
       <key
             commandId="org.eclipse.ui.window.preferences"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+P">
       </key>
       <key
             commandId="org.eclipse.ui.window.showKeyAssist"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            schemeId="com.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.gui.KeyConfig"
+            schemeId="com.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.gui.KeyConfig"
+            schemeId="com.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.gui.KeyConfig"
+            id="com.gluster.storage.management.console.KeyConfig"
             name="Gluster">
       </scheme>
       <key
-            commandId="com.gluster.storage.management.gui.commands.ResetVolumeOptions"
-            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            commandId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
+            schemeId="com.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+O">
       </key>
    </extension>
@@ -370,7 +370,7 @@
          name="Gluster Management Console"
          point="org.eclipse.core.runtime.products">
       <product
-            application="com.gluster.storage.management.gui.application"
+            application="com.gluster.storage.management.console.application"
             name="Gluster Management Console">
          <property
                name="aboutText"
@@ -398,17 +398,17 @@
          point="org.eclipse.ui.actionSets">
       <actionSet
             description="Set of actions that can be performed on multiple Volumes"
-            id="com.gluster.storage.management.gui.actionsets.volumes"
+            id="com.gluster.storage.management.console.actionsets.volumes"
             label="Volumes Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.DeleteVolume"
+               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
                icon="icons/tango/32x32/remove-volume.png"
-               id="com.gluster.storage.management.gui.actions.DeleteVolumeAction"
+               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume(s)"
-               menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes"
+               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -418,13 +418,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.StopVolume"
+               class="com.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="com.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.gui.actions.StopVolumeAction"
+               id="com.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume(s)"
-               menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes"
+               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -434,13 +434,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.StartVolume"
+               class="com.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="com.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.gui.actions.StartVolumeAction"
+               id="com.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume(s)"
-               menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes"
+               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -450,12 +450,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes"
+               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
                pulldown="false"
                retarget="false"
                state="false"
@@ -465,11 +465,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.actionsets.volumes/volumes"
+               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -478,7 +478,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.actionsets.volumes"
+               id="com.gluster.storage.management.console.actionsets.volumes"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -488,17 +488,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on a single volume"
-            id="com.gluster.storage.management.gui.actionsets.volume"
+            id="com.gluster.storage.management.console.actionsets.volume"
             label="Volume Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.MigrateBrickAction"
-               definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
+               class="com.gluster.storage.management.console.actions.MigrateBrickAction"
+               definitionId="com.gluster.storage.management.console.commands.MigrateDisk"
                icon="icons/tango/32x32/replace-brick.png"
-               id="com.gluster.storage.management.gui.actions.MigrateDiskAction"
+               id="com.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Brick"
-               menubarPath="com.gluster.storage.management.gui.menu.glusterserver/glusterserver"
+               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -513,12 +513,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.DeleteVolume"
+               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
                icon="icons/tango/32x32/remove-volume.png"
-               id="com.gluster.storage.management.gui.actions.DeleteVolumeAction"
+               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -528,12 +528,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.DownloadVolumeLogsAction"
-               definitionId="com.gluster.storage.management.gui.commands.DownloadVolumeLogs"
+               class="com.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
+               definitionId="com.gluster.storage.management.console.commands.DownloadVolumeLogs"
                icon="icons/tango/32x32/download-log.png"
-               id="com.gluster.storage.management.gui.actions.DownloadVolumeLogsAction"
+               id="com.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
                label="Download &amp;Logs"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -543,12 +543,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ResetVolumeOptionsAction"
-               definitionId="com.gluster.storage.management.gui.commands.ResetVolumeOptions"
+               class="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
+               definitionId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
                icon="icons/tango/32x32/reset-volume-option.png"
-               id="com.gluster.storage.management.gui.actions.ResetVolumeOptionsAction"
+               id="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
                label="Reset &amp;Options"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -558,12 +558,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RebalanceVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.RebalanceVolume"
+               class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
                icon="icons/tango/32x32/volume-rebalance.png"
-               id="com.gluster.storage.management.gui.actions.RebalanceVolumeAction"
+               id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -573,13 +573,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.StopVolume"
+               class="com.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="com.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.gui.actions.StopVolumeAction"
+               id="com.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -589,13 +589,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.StartVolume"
+               class="com.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="com.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.gui.actions.StartVolumeAction"
+               id="com.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -605,13 +605,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RemoveBrickAction"
-               definitionId="com.gluster.storage.management.gui.commands.RemoveDisk"
+               class="com.gluster.storage.management.console.actions.RemoveBrickAction"
+               definitionId="com.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.gui.actions.RemoveDiskAction"
+               id="com.gluster.storage.management.console.actions.RemoveDiskAction"
                label="Remove Brick"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -621,12 +621,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.AddBrickAction"
-               definitionId="com.gluster.storage.management.gui.commands.AddDisk"
+               class="com.gluster.storage.management.console.actions.AddBrickAction"
+               definitionId="com.gluster.storage.management.console.commands.AddDisk"
                icon="icons/tango/32x32/add-brick.png"
-               id="com.gluster.storage.management.gui.actions.AddDiskAction"
+               id="com.gluster.storage.management.console.actions.AddDiskAction"
                label="&amp;Add Brick"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -636,13 +636,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.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.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                pulldown="false"
                retarget="false"
                state="false"
@@ -652,11 +652,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -665,7 +665,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.volume"
+               id="com.gluster.storage.management.console.menu.volume"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -675,17 +675,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on multiple Gluster Servers"
-            id="com.gluster.storage.management.gui.actionsets.glusterservers"
+            id="com.gluster.storage.management.console.actionsets.glusterservers"
             label="Gluster Servers Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.RemoveServer"
+               class="com.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
                icon="icons/tango/32x32/remove-server.png"
-               id="com.gluster.storage.management.gui.actions.RemoveServerAction"
+               id="com.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server(s)"
-               menubarPath="com.gluster.storage.management.gui.menu.servers/servers"
+               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -695,12 +695,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.servers/servers"
+               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -710,11 +710,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.menu.servers/servers"
+               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -723,7 +723,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.servers"
+               id="com.gluster.storage.management.console.menu.servers"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -733,17 +733,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed in the &quot;Gluster Server&quot; contextt; context"
-            id="com.gluster.storage.management.gui.actionsets.glusterserver"
+            id="com.gluster.storage.management.console.actionsets.glusterserver"
             label="Gluster Server Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.RemoveServer"
+               class="com.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
                icon="icons/tango/32x32/remove-server.png"
-               id="com.gluster.storage.management.gui.actions.RemoveServerAction"
+               id="com.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server(s)"
-               menubarPath="com.gluster.storage.management.gui.menu.glusterserver/glusterserver"
+               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -753,12 +753,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.glusterserver/glusterserver"
+               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -768,11 +768,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.menu.glusterserver/glusterserver"
+               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -781,7 +781,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.glusterserver"
+               id="com.gluster.storage.management.console.menu.glusterserver"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -791,17 +791,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on multiple Discovered Servers"
-            id="com.gluster.storage.management.gui.actionsets.serversdiscovered"
+            id="com.gluster.storage.management.console.actionsets.serversdiscovered"
             label="Discovered Servers Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.AddServer"
+               class="com.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="com.gluster.storage.management.console.commands.AddServer"
                icon="icons/tango/32x32/add-server.png"
-               id="com.gluster.storage.management.gui.actions.AddServerAction"
+               id="com.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
-               menubarPath="com.gluster.storage.management.gui.menu.discoveredservers/discoveredservers"
+               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -811,12 +811,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.discoveredservers/discoveredservers"
+               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                pulldown="false"
                retarget="false"
                state="false"
@@ -826,11 +826,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.menu.discoveredservers/discoveredservers"
+               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -839,7 +839,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.discoveredservers"
+               id="com.gluster.storage.management.console.menu.discoveredservers"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -849,17 +849,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on single Discovered Server"
-            id="com.gluster.storage.management.gui.actionsets.serverdiscovered"
+            id="com.gluster.storage.management.console.actionsets.serverdiscovered"
             label="Discovered Server Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.AddServer"
+               class="com.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="com.gluster.storage.management.console.commands.AddServer"
                icon="icons/tango/32x32/add-server.png"
-               id="com.gluster.storage.management.gui.actions.AddServerAction"
+               id="com.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
-               menubarPath="com.gluster.storage.management.gui.menu.discoveredserver/discoveredserver"
+               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -869,12 +869,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.discoveredserver/discoveredserver"
+               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                pulldown="false"
                retarget="false"
                state="false"
@@ -884,11 +884,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.menu.discoveredserver/discoveredserver"
+               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -897,7 +897,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.discoveredserver"
+               id="com.gluster.storage.management.console.menu.discoveredserver"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -907,17 +907,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed from &quot;Cluster&quot; context"
-            id="com.gluster.storage.management.gui.actionsets.task"
+            id="com.gluster.storage.management.console.actionsets.task"
             label="Task Action Set"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ClearTaskAction"
-               definitionId="com.gluster.storage.management.gui.commands.Clear"
+               class="com.gluster.storage.management.console.actions.ClearTaskAction"
+               definitionId="com.gluster.storage.management.console.commands.Clear"
                icon="icons/tango/32x32/clear-task.png"
-               id="com.gluster.storage.management.gui.actions.Clear"
+               id="com.gluster.storage.management.console.actions.Clear"
                label="&amp;Clear Task"
-               menubarPath="com.gluster.storage.management.gui.menu.task/task"
+               menubarPath="com.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -927,12 +927,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CommitTaskAction"
-               definitionId="com.gluster.storage.management.gui.commands.Commit"
+               class="com.gluster.storage.management.console.actions.CommitTaskAction"
+               definitionId="com.gluster.storage.management.console.commands.Commit"
                icon="icons/tango/32x32/commit-task.png"
-               id="com.gluster.storage.management.gui.actions.Commit"
+               id="com.gluster.storage.management.console.actions.Commit"
                label="&amp;Commit Task"
-               menubarPath="com.gluster.storage.management.gui.menu.task/task"
+               menubarPath="com.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -942,12 +942,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StopTaskAction"
-               definitionId="com.gluster.storage.management.gui.commands.Stop"
+               class="com.gluster.storage.management.console.actions.StopTaskAction"
+               definitionId="com.gluster.storage.management.console.commands.Stop"
                icon="icons/tango/32x32/stop.png"
-               id="com.gluster.storage.management.gui.actions.Stop"
+               id="com.gluster.storage.management.console.actions.Stop"
                label="&amp;Stop Task"
-               menubarPath="com.gluster.storage.management.gui.menu.task/task"
+               menubarPath="com.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -957,12 +957,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ResumeTaskAction"
-               definitionId="com.gluster.storage.management.gui.commands.Pause"
+               class="com.gluster.storage.management.console.actions.ResumeTaskAction"
+               definitionId="com.gluster.storage.management.console.commands.Pause"
                icon="icons/tango/32x32/start.png"
-               id="com.gluster.storage.management.gui.actions.Resume"
+               id="com.gluster.storage.management.console.actions.Resume"
                label="&amp;Resume Task"
-               menubarPath="com.gluster.storage.management.gui.menu.task/task"
+               menubarPath="com.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -972,12 +972,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.PauseTaskAction"
-               definitionId="com.gluster.storage.management.gui.commands.Pause"
+               class="com.gluster.storage.management.console.actions.PauseTaskAction"
+               definitionId="com.gluster.storage.management.console.commands.Pause"
                icon="icons/tango/32x32/pause.png"
-               id="com.gluster.storage.management.gui.actions.Pause"
+               id="com.gluster.storage.management.console.actions.Pause"
                label="&amp;Pause Task"
-               menubarPath="com.gluster.storage.management.gui.menu.task/task"
+               menubarPath="com.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -987,12 +987,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.task/task"
+               menubarPath="com.gluster.storage.management.console.menu.task/task"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1001,7 +1001,7 @@
                tooltip="Create a new Volume">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.task"
+               id="com.gluster.storage.management.console.menu.task"
                label="&amp;Gluster">
             <groupMarker
                   name="task">
@@ -1010,17 +1010,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed at Cluster context"
-            id="com.gluster.storage.management.gui.actionsets.gluster"
+            id="com.gluster.storage.management.console.actionsets.gluster"
             label="Gluster Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.gui.menu.gluster/gluster"
+               menubarPath="com.gluster.storage.management.console.menu.gluster/gluster"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1030,11 +1030,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.gui.commands.ServerAddition"
-               id="com.gluster.storage.management.gui.actions.ServerAdditionAction"
+               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
+               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.gui.menu.gluster/gluster"
+               menubarPath="com.gluster.storage.management.console.menu.gluster/gluster"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1043,7 +1043,7 @@
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.gluster"
+               id="com.gluster.storage.management.console.menu.gluster"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -1053,17 +1053,17 @@
       </actionSet>
       <actionSet
             description="Set of Actions in &quot;Edit&quot; menu"
-            id="com.gluster.storage.management.gui.actionsets.edit"
+            id="com.gluster.storage.management.console.actionsets.edit"
             label="Edit Action Set"
             visible="true">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RefreshDataAction"
+               class="com.gluster.storage.management.console.actions.RefreshDataAction"
                definitionId="org.eclipse.ui.window.preferences"
                icon="icons/tango/32x32/view-refresh.png"
-               id="com.gluster.storage.management.gui.actions.RefreshDataAction"
+               id="com.gluster.storage.management.console.actions.RefreshDataAction"
                label="&amp;Refresh"
-               menubarPath="com.gluster.storage.management.gui.menu.edit/edit"
+               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1073,12 +1073,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.PreferencesAction"
+               class="com.gluster.storage.management.console.actions.PreferencesAction"
                definitionId="org.eclipse.ui.window.preferences"
                icon="icons/tango/32x32/settings.png"
-               id="com.gluster.storage.management.gui.actions.PreferencesAction"
+               id="com.gluster.storage.management.console.actions.PreferencesAction"
                label="&amp;Settings"
-               menubarPath="com.gluster.storage.management.gui.menu.edit/edit"
+               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
                pulldown="false"
                retarget="false"
                state="false"
@@ -1088,11 +1088,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ChangePasswordAction"
-               definitionId="com.gluster.storage.management.gui.commands.ChangePassword"
-               id="com.gluster.storage.management.gui.actions.ChangePasswordAction"
+               class="com.gluster.storage.management.console.actions.ChangePasswordAction"
+               definitionId="com.gluster.storage.management.console.commands.ChangePassword"
+               id="com.gluster.storage.management.console.actions.ChangePasswordAction"
                label="&amp;Change Password"
-               menubarPath="com.gluster.storage.management.gui.menu.edit/edit"
+               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1102,11 +1102,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ExportSshKeysAction"
-               definitionId="com.gluster.storage.management.gui.commands.ExportSshKeys"
-               id="com.gluster.storage.management.gui.actions.ExportSshKeysAction"
+               class="com.gluster.storage.management.console.actions.ExportSshKeysAction"
+               definitionId="com.gluster.storage.management.console.commands.ExportSshKeys"
+               id="com.gluster.storage.management.console.actions.ExportSshKeysAction"
                label="&amp;Export Keys"
-               menubarPath="com.gluster.storage.management.gui.menu.edit/edit"
+               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1116,11 +1116,11 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.ImportSshKeysAction"
-               definitionId="com.gluster.storage.management.gui.commands.ImportSshKeys"
-               id="com.gluster.storage.management.gui.actions.ImportSshKeysAction"
+               class="com.gluster.storage.management.console.actions.ImportSshKeysAction"
+               definitionId="com.gluster.storage.management.console.commands.ImportSshKeys"
+               id="com.gluster.storage.management.console.actions.ImportSshKeysAction"
                label="&amp;Import Keys"
-               menubarPath="com.gluster.storage.management.gui.menu.edit/edit"
+               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
                pulldown="false"
                retarget="false"
@@ -1129,7 +1129,7 @@
                tooltip="Import SSH keys">
          </action>
          <menu
-               id="com.gluster.storage.management.gui.menu.edit"
+               id="com.gluster.storage.management.console.menu.edit"
                label="&amp;Edit"
                path="additions">
             <groupMarker
@@ -1144,7 +1144,7 @@
             targetID="*">
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.NavigationView"
+               id="com.gluster.storage.management.console.views.NavigationView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
@@ -1156,24 +1156,24 @@
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               id="com.gluster.storage.management.console.views.ClusterSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="right"
-               relative="com.gluster.storage.management.gui.views.navigator.NavigationView"
+               relative="com.gluster.storage.management.console.views.navigator.NavigationView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.details.DetailsView"
+               id="com.gluster.storage.management.console.views.details.DetailsView"
                minimized="false"
                moveable="false"
                ratio="0.70f"
                relationship="right"
-               relative="com.gluster.storage.management.gui.views.navigator.NavigationView"
+               relative="com.gluster.storage.management.console.views.navigator.NavigationView"
                showTitle="false"
                standalone="false"
                visible="false">
@@ -1185,187 +1185,187 @@
                moveable="false"
                ratio="0.80f"
                relationship="bottom"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="true"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.DiscoveredServersView"
+               id="com.gluster.storage.management.console.views.DiscoveredServersView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.DiscoveredServerView"
+               id="com.gluster.storage.management.console.views.DiscoveredServerView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="right"
-               relative="com.gluster.storage.management.gui.views.navigator.NavigationView"
+               relative="com.gluster.storage.management.console.views.navigator.NavigationView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.VolumesSummaryView"
+               id="com.gluster.storage.management.console.views.VolumesSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.VolumesView"
+               id="com.gluster.storage.management.console.views.VolumesView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.VolumesSummaryView"
+               relative="com.gluster.storage.management.console.views.VolumesSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.VolumeSummaryView"
+               id="com.gluster.storage.management.console.views.VolumeSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.VolumeBricksView"
+               id="com.gluster.storage.management.console.views.VolumeBricksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.VolumeOptionsView"
+               id="com.gluster.storage.management.console.views.VolumeOptionsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.VolumeLogsView"
+               id="com.gluster.storage.management.console.views.VolumeLogsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.GlusterServersSummaryView"
+               id="com.gluster.storage.management.console.views.GlusterServersSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.GlusterServersView"
+               id="com.gluster.storage.management.console.views.GlusterServersView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.DisksView"
+               id="com.gluster.storage.management.console.views.DisksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.GlusterServerSummaryView"
+               id="com.gluster.storage.management.console.views.GlusterServerSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.GlusterServerDisksView"
+               id="com.gluster.storage.management.console.views.GlusterServerDisksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.GlusterServerLogsView"
+               id="com.gluster.storage.management.console.views.GlusterServerLogsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.gui.views.TasksView"
+               id="com.gluster.storage.management.console.views.TasksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.gui.views.ClusterSummaryView"
+               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
@@ -1376,8 +1376,8 @@
          point="org.eclipse.ui.decorators">
       <decorator
             adaptable="false"
-            class="com.gluster.storage.management.gui.views.NavigationTreeLabelDecorator"
-            id="com.gluster.storage.management.gui.views.navigator.decorator"
+            class="com.gluster.storage.management.console.views.NavigationTreeLabelDecorator"
+            id="com.gluster.storage.management.console.views.navigator.decorator"
             label="Navigation Tree Decorator"
             lightweight="true"
             location="BOTTOM_LEFT"
@@ -1387,27 +1387,27 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="com.gluster.storage.management.gui.preferences.GlusterPreferencePage"
-            id="com.gluster.storage.management.gui.preferences.GlusterPreferencePage"
+            class="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            id="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
             name="Gluster">
       </page>
       <page
-            category="com.gluster.storage.management.gui.preferences.GlusterPreferencePage"
-            class="com.gluster.storage.management.gui.preferences.AlertsPreferencePage"
-            id="com.gluster.storage.management.gui.preferences.AlertsPreferencePage"
+            category="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="com.gluster.storage.management.console.preferences.AlertsPreferencePage"
+            id="com.gluster.storage.management.console.preferences.AlertsPreferencePage"
             name="Alerts">
       </page>
       <page
-            category="com.gluster.storage.management.gui.preferences.GlusterPreferencePage"
-            class="com.gluster.storage.management.gui.preferences.ChartsPreferencePage"
-            id="com.gluster.storage.management.gui.preferences.ChartsPreferencePage"
+            category="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="com.gluster.storage.management.console.preferences.ChartsPreferencePage"
+            id="com.gluster.storage.management.console.preferences.ChartsPreferencePage"
             name="Charts">
       </page>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="com.gluster.storage.management.gui.preferences.PreferenceInitializer">
+            class="com.gluster.storage.management.console.preferences.PreferenceInitializer">
       </initializer>
    </extension>
    <extension
@@ -1416,10 +1416,10 @@
             id="gluster.context.menu.glusterserver"
             objectClass="com.gluster.storage.management.core.model.GlusterServer">
          <action
-               class="com.gluster.storage.management.gui.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.RemoveServer"
+               class="com.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
                enablesFor="+"
-               id="com.gluster.storage.management.gui.actions.RemoveServerAction"
+               id="com.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server"
                menubarPath="additions">
          </action>
@@ -1429,10 +1429,10 @@
             objectClass="com.gluster.storage.management.core.model.Volume">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.MigrateBrickAction"
-               definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
+               class="com.gluster.storage.management.console.actions.MigrateBrickAction"
+               definitionId="com.gluster.storage.management.console.commands.MigrateDisk"
                enablesFor="1"
-               id="com.gluster.storage.management.gui.actions.MigrateDiskAction"
+               id="com.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Disk"
                menubarPath="additions"
                pulldown="false"
@@ -1444,10 +1444,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.DeleteVolume"
+               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
                enablesFor="1"
-               id="com.gluster.storage.management.gui.actions.DeleteVolumeAction"
+               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1459,10 +1459,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.RebalanceVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.RebalanceVolume"
+               class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
                enablesFor="1"
-               id="com.gluster.storage.management.gui.actions.RebalanceVolumeAction"
+               id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1474,10 +1474,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.StopVolume"
+               class="com.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.StopVolume"
                enablesFor="+"
-               id="com.gluster.storage.management.gui.actions.StopVolumeAction"
+               id="com.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1489,10 +1489,10 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.StartVolume"
+               class="com.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.StartVolume"
                enablesFor="+"
-               id="com.gluster.storage.management.gui.actions.StartVolumeAction"
+               id="com.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1508,10 +1508,10 @@
             objectClass="com.gluster.storage.management.core.model.Server">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.AddServer"
+               class="com.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="com.gluster.storage.management.console.commands.AddServer"
                enablesFor="+"
-               id="com.gluster.storage.management.gui.actions.AddServerAction"
+               id="com.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
                pulldown="false"
@@ -1534,9 +1534,9 @@
             objectClass="com.gluster.storage.management.core.model.EntityGroup">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.gui.commands.CreateVolume"
-               id="com.gluster.storage.management.gui.actions.CreateVolumeAction"
+               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
                label="&amp;Create Volume"
                menubarPath="additions"
                pulldown="false"
@@ -1548,9 +1548,9 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.gui.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.gui.commands.AddServer"
-               id="com.gluster.storage.management.gui.actions.AddServerAction"
+               class="com.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               id="com.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
                pulldown="false"
diff --git a/src/com.gluster.storage.management.gui/preferences.ini b/src/com.gluster.storage.management.console/preferences.ini
index 24389288..04afab80 100644
--- a/src/com.gluster.storage.management.gui/preferences.ini
+++ b/src/com.gluster.storage.management.console/preferences.ini
@@ -1,2 +1,2 @@
-org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.gui.KeyConfig
+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
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gui/splash.bmp b/src/com.gluster.storage.management.console/splash.bmp
index c70f24c6..c70f24c6 100644
--- a/src/com.gluster.storage.management.gui/splash.bmp
+++ b/src/com.gluster.storage.management.console/splash.bmp
diff --git a/src/com.gluster.storage.management.gui/splash/gluster_about.jpg b/src/com.gluster.storage.management.console/splash/gluster_about.jpg
index 242fa560..242fa560 100644
--- a/src/com.gluster.storage.management.gui/splash/gluster_about.jpg
+++ b/src/com.gluster.storage.management.console/splash/gluster_about.jpg
diff --git a/src/com.gluster.storage.management.gui/splash/splash-dialog.bmp b/src/com.gluster.storage.management.console/splash/splash-dialog.bmp
index 2de2897f..2de2897f 100644
--- a/src/com.gluster.storage.management.gui/splash/splash-dialog.bmp
+++ b/src/com.gluster.storage.management.console/splash/splash-dialog.bmp
diff --git a/src/com.gluster.storage.management.gui/splash/splash-dialog.png b/src/com.gluster.storage.management.console/splash/splash-dialog.png
index 789eafb0..789eafb0 100644
--- a/src/com.gluster.storage.management.gui/splash/splash-dialog.png
+++ b/src/com.gluster.storage.management.console/splash/splash-dialog.png
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Activator.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Activator.java
index 3fa5bcf0..8edae7f4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Activator.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.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.gui"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "com.gluster.storage.management.console"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/AlertsManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/AlertsManager.java
index 7680caaf..26419446 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/AlertsManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/AlertsManager.java
@@ -18,13 +18,14 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 
+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;
@@ -37,7 +38,6 @@ 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.StringUtil;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
 
 public class AlertsManager {
 	private List<Alert> alerts = new ArrayList<Alert>();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Application.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Application.java
index e8b23e88..e84dac47 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Application.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,15 +33,15 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 
+import com.gluster.storage.management.console.dialogs.LoginDialog;
 import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.gui.dialogs.LoginDialog;
 
 /**
  * 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.gui";
+	public static final String PLUGIN_ID = "com.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.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationActionBarAdvisor.java
index 56e5247c..e49e1275 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationActionBarAdvisor.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.ICoolBarManager;
@@ -31,7 +31,7 @@ import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
-import com.gluster.storage.management.gui.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.gui/src/com/gluster/storage/management/gui/ApplicationWorkbenchAdvisor.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
index c0ea2fd5..e76503d5 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationWorkbenchAdvisor.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
@@ -29,8 +29,8 @@ import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
-import com.gluster.storage.management.gui.jobs.DataSyncJob;
-import com.gluster.storage.management.gui.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.gui/src/com/gluster/storage/management/gui/ApplicationWorkbenchWindowAdvisor.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
index 3a9a4531..2411dcb5 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ApplicationWorkbenchWindowAdvisor.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.application.ActionBarAdvisor;
@@ -24,7 +24,7 @@ import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
-import com.gluster.storage.management.gui.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.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/BrickTableLabelProvider.java
index 11226e8a..4796578e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.BricksPage.BRICK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.gui.views.pages.DisksPage.DISK_TABLE_COLUMN_INDICES;
 
 public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/DeviceTableLabelProvider.java
index 2ec067f4..3d8fa432 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DeviceTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.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 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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class DeviceTableLabelProvider extends LabelProvider implements ITableLabelProvider {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/EntityGroupContentProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/EntityGroupContentProvider.java
index 26848eef..9035e4e2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/EntityGroupContentProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/EntityGroupContentProvider.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
index 9ec49a2f..f9474ab4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,6 +31,8 @@ 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;
@@ -59,8 +61,6 @@ 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;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
-import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 public class GlusterDataModelManager {
 	private static GlusterDataModelManager instance = new GlusterDataModelManager();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterServerTableLabelProvider.java
index 8179a141..71d252ef 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.GlusterServersPage.GLUSTER_SERVER_TABLE_COLUMN_INDICES;
 
 public class GlusterServerTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ICommandIds.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ICommandIds.java
index d9cb434c..36cfd9dc 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ICommandIds.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 /**
  * Interface defining the application's command IDs.
@@ -27,7 +27,7 @@ package com.gluster.storage.management.gui;
  */
 public interface ICommandIds {
 
-    public static final String CMD_OPEN = "com.gluster.storage.management.gui.open";
-    public static final String CMD_OPEN_MESSAGE = "com.gluster.storage.management.gui.openMessage";
+    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";
     
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IEntityListener.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IEntityListener.java
index 98dfbe9a..91d90afe 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IEntityListener.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IEntityListener.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
 import com.gluster.storage.management.core.model.Entity;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
index dd12fd29..67590b27 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/IImageKeys.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 public interface IImageKeys {
 	
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
index 4f303ff4..54ed5349 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.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 com.gluster.storage.management.gui.views.GlusterServerSummaryView.NETWORK_INTERFACE_TABLE_COLUMN_INDICES;
 
 public class NetworkInterfaceTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Perspective.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Perspective.java
index 6a4bb37b..9593bb88 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/Perspective.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
index 340ffd18..2f49d2b3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerDiskTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
@@ -16,19 +16,19 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
 
+import 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;
-import com.gluster.storage.management.gui.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
 
 public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerTableLabelProvider.java
index 2bc8ff11..eccf67ec 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/ServerTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerTableLabelProvider.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.ServersPage.SERVER_TABLE_COLUMN_INDICES;
 
 public class ServerTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TableLabelProviderAdapter.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TableLabelProviderAdapter.java
index 95d6fde4..5c527082 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TableLabelProviderAdapter.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TasksTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TasksTableLabelProvider.java
index a998bb52..66fbefd3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/TasksTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.TasksPage.TASK_TABLE_COLUMN_INDICES;
 
 
 public class TasksTableLabelProvider extends TableLabelProviderAdapter {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
index 39eea7ba..7b81ab87 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.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 com.gluster.storage.management.gui.views.pages.VolumeLogsPage.LOG_TABLE_COLUMN_INDICES;
 
 public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsContentProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsContentProvider.java
index 7d91c156..1289f0f4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsContentProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsContentProvider.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
index 53c8c472..5a1089de 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeOptionsTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
@@ -16,12 +16,12 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui;
+package com.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 com.gluster.storage.management.gui.views.pages.VolumeOptionsPage.OPTIONS_TABLE_COLUMN_INDICES;
 
 public class VolumeOptionsTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeTableLabelProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeTableLabelProvider.java
index 66ce5bd4..908c23d5 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeTableLabelProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui;
+package com.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.VolumesPage.VOLUME_TABLE_COLUMN_INDICES;
 
 public class VolumeTableLabelProvider implements ITableLabelProvider {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AbstractActionDelegate.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java
index 1dff0a2c..9a5a3437 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AbstractActionDelegate.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -28,8 +28,8 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.internal.UIPlugin;
 
+import com.gluster.storage.management.console.utils.GlusterLogger;
 import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 /**
  * 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.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddBrickAction.java
index a14d6869..479353ff 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddBrickAction.java
@@ -19,15 +19,15 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
 
+import com.gluster.storage.management.console.GlusterDataModelManager;
+import com.gluster.storage.management.console.dialogs.AddBrickWizard;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.dialogs.AddBrickWizard;
 
 public class AddBrickAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java
index 7778f9be..6b47c6c2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -26,11 +26,11 @@ import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.dialogs.ServerAdditionDialog;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class AddServerAction extends AbstractActionDelegate {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ChangePasswordAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java
index c7001dda..a06f13b4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ChangePasswordAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java
@@ -1,8 +1,8 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
-import com.gluster.storage.management.gui.dialogs.ChangePasswordDialog;
+import com.gluster.storage.management.console.dialogs.ChangePasswordDialog;
 
 public class ChangePasswordAction extends AbstractActionDelegate {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java
index 2c9baf59..7cb9a873 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ClearTaskAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 
 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.gui.GlusterDataModelManager;
 
 public class ClearTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
index 1eda54af..ff47ff41 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 
 import org.eclipse.jface.action.IAction;
@@ -8,11 +8,11 @@ import org.eclipse.swt.widgets.Display;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 public class CommitTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CreateVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
index d3427696..38be70bd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CreateVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -24,7 +24,7 @@ import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
-import com.gluster.storage.management.gui.dialogs.CreateVolumeWizard;
+import com.gluster.storage.management.console.dialogs.CreateVolumeWizard;
 
 public class CreateVolumeAction extends AbstractActionDelegate {
 	@Override
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
index a230198a..4e460603 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DeleteVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,13 +27,13 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 
 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;
 import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class DeleteVolumeAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
index 226e4d00..df24f15b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/DownloadVolumeLogsAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
@@ -25,8 +25,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/EditVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/EditVolumeAction.java
index 0f7f14b7..610cbdf6 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/EditVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ExportSshKeysAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java
index 86f44d8e..2f0d03dc 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ExportSshKeysAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/IActionConstants.java
index c5e8958f..862d4144 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/IActionConstants.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/IActionConstants.java
@@ -16,21 +16,21 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 public interface IActionConstants {
-	public static final String ACTION_SET_CLUSTER = "com.gluster.storage.management.gui.actionsets.gluster";
-	public static final String ACTION_SET_VOLUMES = "com.gluster.storage.management.gui.actionsets.volumes";
-	public static final String ACTION_SET_VOLUME = "com.gluster.storage.management.gui.actionsets.volume";
-	public static final String ACTION_SET_DISKS = "com.gluster.storage.management.gui.actionsets.disks";
-	public static final String ACTION_SET_DISK = "com.gluster.storage.management.gui.actionsets.disk";
-	public static final String ACTION_SET_GLUSTER_SERVERS = "com.gluster.storage.management.gui.actionsets.glusterservers";
-	public static final String ACTION_SET_GLUSTER_SERVER = "com.gluster.storage.management.gui.actionsets.glusterserver";
-	public static final String ACTION_SET_DISCOVERED_SERVERS = "com.gluster.storage.management.gui.actionsets.serversdiscovered";
-	public static final String ACTION_SET_DISCOVERED_SERVER = "com.gluster.storage.management.gui.actionsets.serverdiscovered";
-	public static final String ACTION_SET_TASK = "com.gluster.storage.management.gui.actionsets.task";
-	public static final String ACTION_SET_EDIT = "com.gluster.storage.management.gui.actionsets.edit";
+	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 COMMAND_CREATE_VOLUME = "com.gluster.storage.management.gui.commands.CreateVolume";
-	public static final String COMMAND_ADD_SERVER = "com.gluster.storage.management.gui.commands.AddServer";
+	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";
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ImportSshKeysAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java
index a166f509..4bdb3835 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ImportSshKeysAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateBrickAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
index 41770d98..4816871e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateBrickAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.Set;
 
@@ -24,10 +24,10 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
 
+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;
-import com.gluster.storage.management.gui.dialogs.MigrateBrickWizard;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class MigrateBrickAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateVolumeAction.java
index aea7ea66..66013222 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/MigrateVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PauseTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PauseTaskAction.java
index 3cb8c608..92a79c73 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PauseTaskAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 
 public class PauseTaskAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PreferencesAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PreferencesAction.java
index 9da1cbf1..b81a2a51 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/PreferencesAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.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.gui/src/com/gluster/storage/management/gui/actions/RebalanceVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
index 41b74082..d154439e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RebalanceVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.net.URI;
 
@@ -25,10 +25,10 @@ import org.eclipse.jface.viewers.ISelection;
 
 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.TaskInfo;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class RebalanceVolumeAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RefreshDataAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
index 6bcbc066..fe9bb80a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RefreshDataAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
-import com.gluster.storage.management.gui.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.gui.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see com.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.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
index 2ce25043..01d70b21 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveBrickAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,14 +12,14 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.VolumeBricksView;
 
 public class RemoveBrickAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java
index b0156b87..7f286191 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -31,10 +31,10 @@ import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
 
 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.constants.CoreConstants;
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class RemoveServerAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
index e68436b0..183b1668 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
@@ -1,13 +1,13 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Display;
 
 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.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	private Volume volume;
@@ -47,7 +47,7 @@ public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.gluster.storage.management.gui.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * com.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.gui/src/com/gluster/storage/management/gui/actions/ResumeTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java
index d5cfe2c5..d672a760 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResumeTaskAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java
@@ -1,13 +1,13 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 public class ResumeTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java
index add769dd..f47f6347 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java
@@ -1,9 +1,9 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
-import com.gluster.storage.management.gui.dialogs.ServerAdditionDialog;
-import com.gluster.storage.management.gui.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.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java
index df897507..588dfdd6 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StartVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,12 +26,12 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 
 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.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.utils.StringUtil;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class StartVolumeAction extends AbstractActionDelegate {
 	//private Volume volume;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java
index 19030712..25afa320 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopTaskAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 
 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.gui.GlusterDataModelManager;
 
 public class StopTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
index 765b856c..bcfadcc5 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/StopVolumeAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,13 +27,13 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 
 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;
 import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class StopVolumeAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
@@ -123,7 +123,7 @@ public class StopVolumeAction extends AbstractActionDelegate {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.gluster.storage.management.gui.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * com.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.gui/src/com/gluster/storage/management/gui/actions/TestPopupMenuAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TestPopupMenuAction.java
index d98f58f5..0cf32adf 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/TestPopupMenuAction.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.actions;
+package com.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.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java
index e570c068..aa0a0b9c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -29,11 +29,11 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
+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.gluster.storage.management.gui.GlusterDataModelManager;
 import com.richclientgui.toolbox.duallists.DualListComposite.ListContentChangedListener;
 import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickWizard.java
index ec632ee3..734dd5e4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/AddBrickWizard.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickWizard.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -27,10 +27,10 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java
index 04678da9..5ec12a74 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/BricksSelectionPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -37,15 +37,15 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 
+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.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.TableLabelProviderAdapter;
-import com.gluster.storage.management.gui.utils.EntityViewerFilter;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 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.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
index 9fc8fd3c..1576ffe3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ChangePasswordDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -47,10 +47,10 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.validators.StringRequiredValidator;
 
 public class ChangePasswordDialog extends Dialog {
 	public static final int RETURN_CODE_ERROR = 2;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
index 2a9266e8..ac510f5e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ClusterSelectionDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -42,9 +42,9 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import com.gluster.storage.management.gui.Activator;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
-import com.gluster.storage.management.gui.utils.GUIHelper;
+import com.gluster.storage.management.console.Activator;
+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.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
index 0654b3ae..fa240a11 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -50,6 +50,7 @@ import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 
+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;
@@ -59,7 +60,6 @@ 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 public class CreateVolumePage1 extends WizardPage {
 	public static final String PAGE_NAME = "create.volume.page.1";
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
index 287be661..2317db9c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeWizard.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
@@ -16,16 +16,16 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.console.GlusterDataModelManager;
 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.gui.GlusterDataModelManager;
 
 public class CreateVolumeWizard extends Wizard {
 	private static final String title = "Gluster Management Console - Create Volume";
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/InitializeDiskTypeSelection.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
index 5fce27e4..060e68ac 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/InitializeDiskTypeSelection.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
@@ -19,7 +19,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,8 +36,8 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 
+import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class InitializeDiskTypeSelection extends Dialog  {
 	
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
index 3b4fd7ca..b2b647e1 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -48,15 +48,15 @@ import org.eclipse.swt.widgets.Text;
 
 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.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;
-import com.gluster.storage.management.gui.Activator;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.validators.StringRequiredValidator;
 
 /**
  * Login dialog, which prompts for the user's account info, and has Login and Cancel buttons.
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
index 69836284..49d30d10 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickPage1.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-package com.gluster.storage.management.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -43,13 +43,13 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 
+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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.TableLabelProviderAdapter;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class MigrateBrickPage1 extends WizardPage {
 	private static final String PAGE_NAME = "migrate.disk.page.1";
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
index 055cb769..b52125c7 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateBrickWizard.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.net.URI;
 
@@ -25,12 +25,12 @@ import org.eclipse.jface.wizard.Wizard;
 
 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.Brick;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 public class MigrateBrickWizard extends Wizard {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java
index d84f5f94..5a5f6046 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ServerAdditionDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
index 5dc12e0a..e02d42a4 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ServerAdditionDialog.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.dialogs;
+package com.gluster.storage.management.console.dialogs;
 
 import java.net.URI;
 import java.util.List;
@@ -42,9 +42,9 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class ServerAdditionDialog extends Dialog {
 	public static final int RETURN_CODE_ERROR = 2;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/jobs/DataSyncJob.java
index 1f95fb20..907d7b84 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/jobs/DataSyncJob.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.jobs;
+package com.gluster.storage.management.console.jobs;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -24,9 +24,9 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 
+import com.gluster.storage.management.console.GlusterDataModelManager;
+import com.gluster.storage.management.console.utils.GlusterLogger;
 import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/AlertsPreferencePage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/AlertsPreferencePage.java
index 9a3e68b5..be8513fc 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/AlertsPreferencePage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/AlertsPreferencePage.java
@@ -1,11 +1,11 @@
-package com.gluster.storage.management.gui.preferences;
+package com.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 com.gluster.storage.management.gui.Activator;
+import com.gluster.storage.management.console.Activator;
 
 public class AlertsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/ChartsPreferencePage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/ChartsPreferencePage.java
index 80cff1aa..8eeb84ab 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/ChartsPreferencePage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.preferences;
+package com.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 com.gluster.storage.management.gui.Activator;
+import com.gluster.storage.management.console.Activator;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/GlusterPreferencePage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
index d8eee3e4..e382b10a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/GlusterPreferencePage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.preferences;
+package com.gluster.storage.management.console.preferences;
 
 import java.util.List;
 
@@ -28,7 +28,7 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
 import com.gluster.storage.management.client.ClustersClient;
-import com.gluster.storage.management.gui.Activator;
+import com.gluster.storage.management.console.Activator;
 
 /**
  * This class represents a preference page that
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceConstants.java
index bf2e7c25..650ae1a9 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.preferences;
+package com.gluster.storage.management.console.preferences;
 
 /**
  * Constant definitions for plug-in preferences
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceInitializer.java
index 36289e8a..3c192f62 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceInitializer.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.preferences;
+package com.gluster.storage.management.console.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
 
-import com.gluster.storage.management.gui.Activator;
+import com.gluster.storage.management.console.Activator;
 
 /**
  * Class used to initialize default preference values.
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/GlusterToolbarManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
index 88c18a7f..f8bcc446 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/GlusterToolbarManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.toolbar;
+package com.gluster.storage.management.console.toolbar;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 
+import com.gluster.storage.management.console.actions.IActionConstants;
 import com.gluster.storage.management.core.model.Cluster;
 import com.gluster.storage.management.core.model.Entity;
 import com.gluster.storage.management.core.model.EntityGroup;
@@ -31,7 +32,6 @@ 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;
-import com.gluster.storage.management.gui.actions.IActionConstants;
 
 public class GlusterToolbarManager implements ToolbarManager {
 	private enum ENTITY_TYPE {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/ToolbarManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/ToolbarManager.java
index f68346d6..8dc14ffd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/toolbar/ToolbarManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/ToolbarManager.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.toolbar;
+package com.gluster.storage.management.console.toolbar;
 
 import com.gluster.storage.management.core.model.Entity;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartUtil.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartUtil.java
index 1297d2f4..57121f5b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartUtil.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,14 +35,14 @@ import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
+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.gluster.storage.management.gui.Activator;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
 import com.ibm.icu.util.Calendar;
 
 /**
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartViewerComposite.java
index f8616a52..8da32a60 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/EntityViewerFilter.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/EntityViewerFilter.java
index 9cbf6664..60161324 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/EntityViewerFilter.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/EntityViewerFilter.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import java.util.Map.Entry;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GUIHelper.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java
index af8eba65..9f53c047 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GUIHelper.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -79,13 +79,13 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.progress.IProgressConstants;
 
+import com.gluster.storage.management.console.Application;
+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;
-import com.gluster.storage.management.gui.Application;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.views.NavigationView;
-import com.gluster.storage.management.gui.views.TasksView;
 
 public class GUIHelper {
 	private static final GUIHelper instance = new GUIHelper();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterChartPalette.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterChartPalette.java
index e68b8870..3c5b0b62 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterChartPalette.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterChartPalette.java
@@ -9,7 +9,7 @@
  * Actuate Corporation - initial API and implementation
  ***********************************************************************/
 
-package com.gluster.storage.management.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterLogger.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterLogger.java
index 29ce8922..b633678a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterLogger.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Status;
 
-import com.gluster.storage.management.gui.Activator;
+import com.gluster.storage.management.console.Activator;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ImageUtil.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ImageUtil.java
index d5e568b3..d278704b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ImageUtil.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.utils;
+package com.gluster.storage.management.console.utils;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
+import com.gluster.storage.management.console.Application;
 import com.gluster.storage.management.core.utils.LRUCache;
-import com.gluster.storage.management.gui.Application;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/validators/StringRequiredValidator.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/validators/StringRequiredValidator.java
index 07ffb9f5..cac65829 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/validators/StringRequiredValidator.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.validators;
+package com.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.gui/src/com/gluster/storage/management/gui/views/ClusterAdapterFactory.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterAdapterFactory.java
index 8d57680b..d904c8f3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterAdapterFactory.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterAdapterFactory.java
@@ -16,13 +16,15 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.views;
+package com.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 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;
@@ -30,8 +32,6 @@ 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;
-import com.gluster.storage.management.gui.Application;
-import com.gluster.storage.management.gui.IImageKeys;
 
 public class ClusterAdapterFactory implements IAdapterFactory {
 	private IWorkbenchAdapter entityAdapter = new IWorkbenchAdapter() {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java
index 5d44881d..436b7134 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -41,6 +41,15 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.ViewPart;
 
+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.IActionConstants;
+import com.gluster.storage.management.console.preferences.PreferenceConstants;
+import com.gluster.storage.management.console.utils.ChartUtil;
+import com.gluster.storage.management.console.utils.ChartViewerComposite;
+import com.gluster.storage.management.console.utils.GUIHelper;
+import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.model.Alert;
@@ -55,15 +64,6 @@ 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.TaskInfo;
 import com.gluster.storage.management.core.utils.NumberUtil;
-import com.gluster.storage.management.gui.Activator;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.actions.IActionConstants;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
-import com.gluster.storage.management.gui.utils.ChartUtil;
-import com.gluster.storage.management.gui.utils.ChartUtil.ChartPeriodLinkListener;
-import com.gluster.storage.management.gui.utils.ChartViewerComposite;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServerView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java
index 8516d1db..96a2ca2a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServerView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -27,9 +27,9 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
+import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.utils.NumberUtil;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServersView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServersView.java
index fe0b1f36..ab3cd556 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DiscoveredServersView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServersView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -26,11 +26,11 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.ServersPage;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DisksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
index 7a19afc0..b0cf33b2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/DisksView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,11 +7,11 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.DisksPage;
 
 public class DisksView extends ViewPart {
 	public static final String ID = DisksView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerDisksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java
index 7b989179..951b5a91 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerDisksView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.ServerDisksPage;
 
 public class GlusterServerDisksView extends ViewPart {
 	public static final String ID = GlusterServerDisksView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerLogsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java
index 84568ca6..660da5a3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerLogsView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.ServerLogsPage;
 
 public class GlusterServerLogsView extends ViewPart {
 	public static final String ID = GlusterServerLogsView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java
index 2339d814..662ca16f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,6 +49,17 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
 import com.gluster.storage.management.client.GlusterServersClient;
+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.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.ChartViewerComposite;
+import com.gluster.storage.management.console.utils.GUIHelper;
+import com.gluster.storage.management.console.utils.GlusterLogger;
+import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
 import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.Event;
@@ -58,17 +69,6 @@ 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.gluster.storage.management.gui.Activator;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.NetworkInterfaceTableLabelProvider;
-import com.gluster.storage.management.gui.preferences.PreferenceConstants;
-import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.gui.utils.ChartUtil;
-import com.gluster.storage.management.gui.utils.ChartUtil.ChartPeriodLinkListener;
-import com.gluster.storage.management.gui.utils.ChartViewerComposite;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.utils.GlusterLogger;
 import com.ibm.icu.util.Calendar;
 import com.richclientgui.toolbox.gauges.CoolGauge;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
index 25c966c1..3d33a1eb 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -32,6 +32,10 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
+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;
@@ -43,10 +47,6 @@ 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.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.utils.ChartViewerComposite;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java
index 05bf6778..566befc3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -27,11 +27,11 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.GlusterServersPage;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterViewsManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
index c30dfbc4..f55e72b9 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterViewsManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
@@ -42,7 +42,7 @@ public class GlusterViewsManager implements ViewsManager {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.ViewsManager#updateViews(com.gluster.storage.management.core.model.Entity)
+	 * @see com.gluster.storage.management.console.views.ViewsManager#updateViews(com.gluster.storage.management.core.model.Entity)
 	 */
 	@Override
 	public void updateViews(Entity entity) {
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationTreeLabelDecorator.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
index 8a85edb7..d7448e76 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationTreeLabelDecorator.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.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 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;
-import com.gluster.storage.management.gui.Application;
-import com.gluster.storage.management.gui.IImageKeys;
 
 public class NavigationTreeLabelDecorator implements ILightweightLabelDecorator {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java
index 708726c0..9fd080e8 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/NavigationView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -34,14 +34,14 @@ import org.eclipse.ui.model.BaseWorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
 
 public class NavigationView extends ViewPart implements ISelectionListener {
 	public static final String ID = NavigationView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/TasksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java
index 06342bf8..e408e64e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/TasksView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -6,9 +6,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+import com.gluster.storage.management.console.GlusterDataModelManager;
+import com.gluster.storage.management.console.views.pages.TasksPage;
 import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.views.pages.TasksPage;
 
 public class TasksView extends ViewPart {
 	
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ViewsManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java
index 2b33308e..5b19ea98 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ViewsManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import com.gluster.storage.management.core.model.Entity;
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeBricksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
index 01930baa..0c494945 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeBricksView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.BricksPage;
 
 public class VolumeBricksView extends ViewPart {
 	public static final String ID = VolumeBricksView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeLogsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
index 89c343d7..e6a5370f 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeLogsView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+import com.gluster.storage.management.console.utils.GUIHelper;
+import com.gluster.storage.management.console.views.pages.VolumeLogsPage;
 import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.VolumeLogsPage;
 
 public class VolumeLogsView extends ViewPart {
 	VolumeLogsPage logsPage;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeOptionsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
index 0780cf6a..7be16f48 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeOptionsView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
@@ -1,12 +1,12 @@
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.VolumeOptionsPage;
 
 public class VolumeOptionsView extends ViewPart {
 	public static final String ID = VolumeOptionsView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
index 62939211..92b4b22e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -1,4 +1,4 @@
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -35,6 +35,10 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
 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.GlusterConstants;
 import com.gluster.storage.management.core.model.Alert;
 import com.gluster.storage.management.core.model.Brick;
@@ -50,10 +54,6 @@ 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class VolumeSummaryView extends ViewPart {
 	public static final String ID = VolumeSummaryView.class.getName();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java
index 1983f6e4..0c9ef92b 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -27,9 +27,9 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
+import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.utils.NumberUtil;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
index 07782143..51ca834c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views;
+package com.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -31,6 +31,10 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
 
+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;
@@ -42,10 +46,6 @@ 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IImageKeys;
-import com.gluster.storage.management.gui.utils.ChartViewerComposite;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesView.java
index 0a48d870..4deeace2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesView.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.gui.views;
+package com.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -26,11 +26,11 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 
+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;
-import com.gluster.storage.management.gui.utils.GUIHelper;
-import com.gluster.storage.management.gui.views.pages.VolumesPage;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java
index 571a75f5..62bbd871 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.net.URI;
 import java.util.List;
@@ -41,6 +41,10 @@ import org.eclipse.ui.forms.widgets.ImageHyperlink;
 
 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.InitializeDiskTypeSelection;
 import com.gluster.storage.management.core.model.ClusterListener;
 import com.gluster.storage.management.core.model.DefaultClusterListener;
 import com.gluster.storage.management.core.model.Device;
@@ -52,10 +56,6 @@ 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;
-import com.gluster.storage.management.gui.Application;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.IEntityListener;
-import com.gluster.storage.management.gui.dialogs.InitializeDiskTypeSelection;
 
 public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk> implements IEntityListener {
 	protected List<Disk> disks;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableTreeViewerPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
index b2f59b2c..7414bbc3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableTreeViewerPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -43,10 +43,10 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
+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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public abstract class AbstractTableTreeViewerPage<T> extends Composite implements ISelectionListener {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableViewerPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
index 7ac32ec2..91780403 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractTableViewerPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -47,9 +47,9 @@ import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
+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.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public abstract class AbstractTableViewerPage<T> extends Composite implements ISelectionListener {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/BricksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
index 4aec5436..39e79beb 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/BricksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.Collection;
 import java.util.List;
@@ -30,12 +30,12 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchSite;
 
+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;
-import com.gluster.storage.management.gui.BrickTableLabelProvider;
 
 public class BricksPage extends AbstractTableViewerPage<Brick> {
 	private List<Brick> bricks;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/DiskTreeContentProvider.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
index c5158087..4081d614 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/DiskTreeContentProvider.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/DisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DisksPage.java
index c8cf8028..8501bef3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/DisksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DisksPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -24,9 +24,9 @@ import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
 
+import com.gluster.storage.management.console.DeviceTableLabelProvider;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.gui.DeviceTableLabelProvider;
 
 public class DisksPage extends AbstractDisksPage {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java
index 962ab80b..8be17b24 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/GlusterServersPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,14 +30,14 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
 
+import com.gluster.storage.management.console.EntityGroupContentProvider;
+import com.gluster.storage.management.console.GlusterServerTableLabelProvider;
 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;
-import com.gluster.storage.management.gui.EntityGroupContentProvider;
-import com.gluster.storage.management.gui.GlusterServerTableLabelProvider;
 
 public class GlusterServersPage extends AbstractTableViewerPage<GlusterServer> {
 	private List<GlusterServer> glusterServers;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/OptionKeyEditingSupport.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
index 6d76b2d2..393b4f28 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/OptionKeyEditingSupport.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,11 +13,11 @@ import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
+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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
 
 /**
  * Editing support for the "value" column in volume options table viewer.
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/OptionValueEditingSupport.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
index 9a3f32ad..6bce3997 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/OptionValueEditingSupport.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -15,11 +15,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
 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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 /**
  * Editing support for the "value" column in volume options table viewer.
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/ServerDisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerDisksPage.java
index 2428a1a0..a2982590 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/ServerDisksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerDisksPage.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -24,9 +24,9 @@ import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
 
+import com.gluster.storage.management.console.ServerDiskTableLabelProvider;
 import com.gluster.storage.management.core.model.Disk;
 import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.gui.ServerDiskTableLabelProvider;
 
 public class ServerDisksPage  extends AbstractDisksPage {
 	
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/ServerLogsPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerLogsPage.java
index b64df430..7b3f3946 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/ServerLogsPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ListViewer;
@@ -37,8 +37,8 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
+import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class ServerLogsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/ServersPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java
index 5c659268..99945b31 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/ServersPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,13 +30,13 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
 
+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;
-import com.gluster.storage.management.gui.EntityGroupContentProvider;
-import com.gluster.storage.management.gui.ServerTableLabelProvider;
 
 public class ServersPage extends AbstractTableViewerPage<Server> {
 	private List<Server> servers;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/TasksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java
index 2c87d1ea..4c399a4c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/TasksPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -33,12 +33,12 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
 
+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;
-import com.gluster.storage.management.gui.TasksTableLabelProvider;
-import com.gluster.storage.management.gui.toolbar.GlusterToolbarManager;
 
 public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	private List<TaskInfo> taskInfoList;
@@ -57,7 +57,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#createClusterListener()
+	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#createClusterListener()
 	 */
 	@Override
 	protected ClusterListener createClusterListener() {
@@ -88,7 +88,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#getColumnNames()
+	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getColumnNames()
 	 */
 	@Override
 	protected String[] getColumnNames() {
@@ -96,7 +96,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#setColumnProperties(org.eclipse.swt.widgets.Table)
+	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#setColumnProperties(org.eclipse.swt.widgets.Table)
 	 */
 	@Override
 	protected void setColumnProperties(Table table) {
@@ -105,7 +105,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#getLabelProvider()
+	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getLabelProvider()
 	 */
 	@Override
 	protected IBaseLabelProvider getLabelProvider() {
@@ -113,7 +113,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#getContentProvider()
+	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getContentProvider()
 	 */
 	@Override
 	protected IContentProvider getContentProvider() {
@@ -121,7 +121,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#getAllEntities()
+	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getAllEntities()
 	 */
 	@Override
 	protected List<TaskInfo> getAllEntities() {
@@ -129,7 +129,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gui.views.pages.AbstractTableViewerPage#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
+	 * @see com.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.gui/src/com/gluster/storage/management/gui/views/pages/VolumeLogsPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java
index 82836621..87c319ef 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeLogsPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -49,13 +49,13 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 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;
-import com.gluster.storage.management.gui.VolumeLogTableLabelProvider;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class VolumeLogsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
index 84a7ba6a..57ecb615 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -50,16 +50,16 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
+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;
-import com.gluster.storage.management.gui.GlusterDataModelManager;
-import com.gluster.storage.management.gui.VolumeOptionsContentProvider;
-import com.gluster.storage.management.gui.VolumeOptionsTableLabelProvider;
-import com.gluster.storage.management.gui.utils.GUIHelper;
 
 public class VolumeOptionsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java
index 1676ce77..985c05dd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumesPage.java
+++ b/src/com.gluster.storage.management.console/src/com/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.gui.views.pages;
+package com.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,14 +30,14 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
 
+import com.gluster.storage.management.console.EntityGroupContentProvider;
+import com.gluster.storage.management.console.VolumeTableLabelProvider;
 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;
-import com.gluster.storage.management.gui.EntityGroupContentProvider;
-import com.gluster.storage.management.gui.VolumeTableLabelProvider;
 
 public class VolumesPage extends AbstractTableViewerPage<Volume> {
 	private List<Volume> volumes;
diff --git a/src/com.gluster.storage.management.gui/src/test.xml b/src/com.gluster.storage.management.console/src/test.xml
index 12bbf745..12bbf745 100644
--- a/src/com.gluster.storage.management.gui/src/test.xml
+++ b/src/com.gluster.storage.management.console/src/test.xml
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.gui.feature.webstart.cquery b/src/com.gluster.storage.management.releng/com.gluster.storage.management.gui.feature.webstart.cquery
index 4d5dc425..ffd8dec8 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.gui.feature.webstart.cquery
+++ b/src/com.gluster.storage.management.releng/com.gluster.storage.management.gui.feature.webstart.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
-    <cq:rootRequest name="com.gluster.storage.management.gui.feature.webstart" componentType="eclipse.feature"/>
+    <cq:rootRequest name="com.gluster.storage.management.console.feature.webstart" componentType="eclipse.feature"/>
 </cq:componentQuery>
diff --git a/src/com.gluster.storage.management.releng/gluster-management-console.target b/src/com.gluster.storage.management.releng/gluster-management-console.target
index 03c45b7c..07c580d5 100644
--- a/src/com.gluster.storage.management.releng/gluster-management-console.target
+++ b/src/com.gluster.storage.management.releng/gluster-management-console.target
@@ -3,11 +3,11 @@
 
 <target includeMode="feature" name="Gluster Storage Platform Target">
 <locations>
-<location path="target/com.gluster.storage.management.gui.target/rcp.sdk.helios.SR1" type="Directory"/>
-<location path="target/com.gluster.storage.management.gui.target/richclientgui.rcptoolbox" type="Directory"/>
-<location path="target/com.gluster.storage.management.gui.target/birt.charts.helios" type="Directory"/>
-<location path="target/com.gluster.storage.management.gui.target/delta.pack.helios" type="Directory"/>
-<location path="target/com.gluster.storage.management.gui.target/org.eclipse.help" type="Directory"/>
+<location path="target/com.gluster.storage.management.console.target/rcp.sdk.helios.SR1" type="Directory"/>
+<location path="target/com.gluster.storage.management.console.target/richclientgui.rcptoolbox" type="Directory"/>
+<location path="target/com.gluster.storage.management.console.target/birt.charts.helios" type="Directory"/>
+<location path="target/com.gluster.storage.management.console.target/delta.pack.helios" type="Directory"/>
+<location path="target/com.gluster.storage.management.console.target/org.eclipse.help" type="Directory"/>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 </target>