Renamed project and package com.gluster.storage.management.server to com.gluster.storage.management.gateway

43 files changed, 170 insertions, 183 deletions

diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery b/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
index 346b39bf..346b39bf 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery
+++ b/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
diff --git a/src/com.gluster.storage.management.server.scripts/.project b/src/com.gluster.storage.management.server.scripts/.project
index beda33b7..110db62b 100644
--- a/src/com.gluster.storage.management.server.scripts/.project
+++ b/src/com.gluster.storage.management.server.scripts/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.server.scripts</name>
+	<name>com.gluster.storage.management.gateway.scripts</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.server.scripts/.pydevproject b/src/com.gluster.storage.management.server.scripts/.pydevproject
index 0a912df5..c327cd69 100644
--- a/src/com.gluster.storage.management.server.scripts/.pydevproject
+++ b/src/com.gluster.storage.management.server.scripts/.pydevproject
@@ -5,6 +5,6 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/com.gluster.storage.management.server.scripts/src</path>
+<path>/com.gluster.storage.management.gateway.scripts/src</path>
 </pydev_pathproperty>
 </pydev_project>
diff --git a/src/com.gluster.storage.management.server/.project b/src/com.gluster.storage.management.server/.project
index 259b3726..3e4dc06a 100644
--- a/src/com.gluster.storage.management.server/.project
+++ b/src/com.gluster.storage.management.server/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.server</name>
+	<name>com.gluster.storage.management.gateway</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.component b/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.component
index dbf56d1e..3d5a50bf 100644
--- a/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.component
+++ b/src/com.gluster.storage.management.server/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="com.gluster.storage.management.server">
+    <wb-module deploy-name="com.gluster.storage.management.gateway">
         <wb-resource deploy-path="/" source-path="/WebContent"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/junit"/>
-        <property name="java-output-path" value="/com.gluster.storage.management.server/build/classes"/>
+        <property name="java-output-path" value="/com.gluster.storage.management.gateway/build/classes"/>
         <property name="context-root" value="glustermg"/>
     </wb-module>
 </project-modules>
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
index e810c2ed..631788ff 100644
--- a/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/web.xml
@@ -1,86 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
-	<display-name>glustermg</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-
-	<!-- Spring context loaded -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+  <display-name>glustermg</display-name>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>default.html</welcome-file>
+    <welcome-file>default.htm</welcome-file>
+    <welcome-file>default.jsp</welcome-file>
+  </welcome-file-list>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
 			classpath:spring/gluster-server-security.xml
 			classpath:spring/gluster-server-base.xml
 		</param-value>
-	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	<listener>
-		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
-	</listener>
-
-	<!-- Jersey REST servlet -->
-	<servlet>
-		<servlet-name>gluster-resources-1.0</servlet-name>
-		<!-- servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class -->
-		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
-		<init-param>
-			<param-name>com.sun.jersey.config.property.packages</param-name>
-			<param-value>com.gluster.storage.management.server.resources.v1_0</param-value>
-		</init-param>
-		<init-param>
-			<param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
-			<param-value>com.gluster.storage.management.server.filters.GlusterResourceFilterFactory</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>gluster-resources-1.0</servlet-name>
-		<url-pattern>/1.0/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- JNLP download servlet -->
-	<servlet>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<url-pattern>*.jnlp</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>JnlpDownloadServlet</servlet-name>
-		<url-pattern>*.jar</url-pattern>
-	</servlet-mapping>
-
-	<!--  Spring Security -->
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>
+  </context-param>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <listener>
+    <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>gluster-resources-1.0</servlet-name>
+    <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
+    <init-param>
+      <param-name>com.sun.jersey.config.property.packages</param-name>
+      <param-value>com.gluster.storage.management.gateway.resources.v1_0</param-value>
+    </init-param>
+    <init-param>
+      <param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
+      <param-value>com.gluster.storage.management.gateway.filters.GlusterResourceFilterFactory</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>gluster-resources-1.0</servlet-name>
+    <url-pattern>/1.0/*</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <url-pattern>*.jnlp</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <url-pattern>*.jar</url-pattern>
+  </servlet-mapping>
+  <filter>
+    <filter-name>springSecurityFilterChain</filter-name>
+    <filter-class>
 			org.springframework.web.filter.DelegatingFilterProxy
 		</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>Gluster Management Gateway</web-resource-name>
-			<url-pattern>/*</url-pattern>
-		</web-resource-collection>
-		<user-data-constraint>
-			<transport-guarantee>CONFIDENTIAL</transport-guarantee>
-		</user-data-constraint>
-	</security-constraint>
-</web-app>
+  </filter>
+  <filter-mapping>
+    <filter-name>springSecurityFilterChain</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Gluster Management Gateway</web-resource-name>
+      <url-pattern>/*</url-pattern>
+    </web-resource-collection>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+</web-app>
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/build/glusterserver.ant b/src/com.gluster.storage.management.server/build/glusterserver.ant
index e9b5b650..68a5bc08 100644
--- a/src/com.gluster.storage.management.server/build/glusterserver.ant
+++ b/src/com.gluster.storage.management.server/build/glusterserver.ant
@@ -1,4 +1,4 @@
-<project name="com.gluster.storage.management.server" basedir="." default="archive">
+<project name="com.gluster.storage.management.gateway" basedir="." default="archive">
 	<echo message="basedir=${basedir}" />
 	<echo message="buckminster.output=${buckminster.output}" />
 	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/constants/VolumeOptionsDefaults.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
index 5c9a6505..1f577c89 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/constants/VolumeOptionsDefaults.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.constants;
+package com.gluster.storage.management.gateway.constants;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ClusterInfo.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/ClusterInfo.java
index 1c3cd347..3e5ea01a 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ClusterInfo.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/ClusterInfo.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/GlusterDataSource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
index e669a130..0802fe93 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/GlusterDataSource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import javax.servlet.ServletContext;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/PersistenceDao.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/PersistenceDao.java
index 85fefcdf..eb7d6514 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/PersistenceDao.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/PersistenceDao.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ServerInfo.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/ServerInfo.java
index 72818200..a3f8c920 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/data/ServerInfo.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/data/ServerInfo.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.data;
+package com.gluster.storage.management.gateway.data;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuditFilter.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
index daaf8f33..31810123 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuditFilter.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.server.filters;
+package com.gluster.storage.management.gateway.filters;
 
 import com.sun.jersey.spi.container.ContainerRequest;
 import com.sun.jersey.spi.container.ContainerRequestFilter;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuthenticationFailureFilter.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
index 5f828f65..73a1085e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/AuthenticationFailureFilter.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.filters;
+package com.gluster.storage.management.gateway.filters;
 
 import java.io.CharArrayWriter;
 import java.io.IOException;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/GlusterResourceFilterFactory.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
index 899ba16e..1c480f3f 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/filters/GlusterResourceFilterFactory.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.gluster.storage.management.server.filters;
+package com.gluster.storage.management.gateway.filters;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
index 21b95877..9fc4fceb 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/AbstractResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
index 45125513..d0da6696 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/ClustersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
@@ -42,8 +42,8 @@ import org.springframework.stereotype.Component;
 
 import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 import com.gluster.storage.management.core.response.ClusterNameListResponse;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.services.ClusterService;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.services.ClusterService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/DiscoveredServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
index f6038b71..2d07bd24 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/DiscoveredServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
 import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
@@ -38,8 +38,8 @@ import org.springframework.stereotype.Component;
 import com.gluster.storage.management.core.model.Server;
 import com.gluster.storage.management.core.response.ServerListResponse;
 import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GenericExceptionMapper.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
index f9650902..3a316c0c 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GenericExceptionMapper.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index fa96c884..e6e4f9d6 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FSTYPE;
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
@@ -63,18 +63,18 @@ import com.gluster.storage.management.core.model.ServerStats;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.response.GlusterServerListResponse;
 import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.ServerInfo;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.services.GlusterServerService;
-import com.gluster.storage.management.server.tasks.InitializeDiskTask;
-import com.gluster.storage.management.server.utils.CpuStatsFactory;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.MemoryStatsFactory;
-import com.gluster.storage.management.server.utils.NetworkStatsFactory;
-import com.gluster.storage.management.server.utils.ServerUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
-import com.gluster.storage.management.server.utils.StatsFactory;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.ServerInfo;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.services.GlusterServerService;
+import com.gluster.storage.management.gateway.tasks.InitializeDiskTask;
+import com.gluster.storage.management.gateway.utils.CpuStatsFactory;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.MemoryStatsFactory;
+import com.gluster.storage.management.gateway.utils.NetworkStatsFactory;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
+import com.gluster.storage.management.gateway.utils.StatsFactory;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
index 807291be..34dad497 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/KeysResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_KEYS;
 
@@ -44,7 +44,7 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.utils.FileUtil;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.multipart.FormDataParam;
 
 @Path(RESOURCE_PATH_KEYS)
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
index 0fa49dc3..e5874f4b 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/TasksResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
 import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
@@ -50,7 +50,7 @@ import com.gluster.storage.management.core.exceptions.GlusterValidationException
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.response.TaskInfoListResponse;
-import com.gluster.storage.management.server.tasks.Task;
+import com.gluster.storage.management.gateway.tasks.Task;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_TASKS)
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/UsersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
index 1b5e8fad..4b2701f2 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/UsersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_USER;
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_USERS;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 1d0963eb..fad19e7e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/VolumesResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.resources.v1_0;
+package com.gluster.storage.management.gateway.resources.v1_0;
 
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
 import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_AUTO_COMMIT;
@@ -97,13 +97,13 @@ import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse
 import com.gluster.storage.management.core.utils.DateUtil;
 import com.gluster.storage.management.core.utils.FileUtil;
 import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.server.constants.VolumeOptionsDefaults;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.tasks.MigrateBrickTask;
-import com.gluster.storage.management.server.tasks.RebalanceVolumeTask;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
+import com.gluster.storage.management.gateway.constants.VolumeOptionsDefaults;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.tasks.MigrateBrickTask;
+import com.gluster.storage.management.gateway.tasks.RebalanceVolumeTask;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/GlusterUserDetailsService.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
index 21c13a03..e806051c 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/GlusterUserDetailsService.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.security;
+package com.gluster.storage.management.gateway.security;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/UserAuthDao.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/security/UserAuthDao.java
index cfc6e572..bdc3b19e 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/security/UserAuthDao.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/security/UserAuthDao.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.security;
+package com.gluster.storage.management.gateway.security;
 
 import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
 
@@ -31,7 +31,7 @@ public class UserAuthDao extends JdbcDaoImpl implements GlusterUserDetailsServic
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.server.security.GlusterUserDetailsService#changePassword(java.lang.String,
+	 * @see com.gluster.storage.management.gateway.security.GlusterUserDetailsService#changePassword(java.lang.String,
 	 * java.lang.String)
 	 */
 	@Override
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/services/ClusterService.java
index 47960827..e01c5096 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/services/ClusterService.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.services;
+package com.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,12 +34,12 @@ 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.LRUCache;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.PersistenceDao;
-import com.gluster.storage.management.server.data.ServerInfo;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.PersistenceDao;
+import com.gluster.storage.management.gateway.data.ServerInfo;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 
 /**
  * Service class for functionality related to clusters
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/GlusterServerService.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
index e8bea530..d1437cec 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/GlusterServerService.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.services;
+package com.gluster.storage.management.gateway.services;
 
 import java.util.List;
 
@@ -29,9 +29,9 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.exceptions.GlusterValidationException;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.ServerUtil;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java
index 3fe794f5..6d525785 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitServerTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -39,8 +39,8 @@ import org.springframework.security.authentication.encoding.PasswordEncoder;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.PersistenceDao;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.PersistenceDao;
 
 /**
  * Initializes the Gluster Management Server.
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
index 4f168d66..f5cc5332 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
@@ -31,9 +31,9 @@ import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class InitializeDiskTask extends Task {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
index 8ca15fc9..694067aa 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
@@ -28,8 +28,8 @@ import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class MigrateBrickTask extends Task {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
index 24c2f1b5..3038f961 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/RebalanceVolumeTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
@@ -29,9 +29,9 @@ import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.utils.GlusterUtil;
-import com.gluster.storage.management.server.utils.SshUtil;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.utils.GlusterUtil;
+import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class RebalanceVolumeTask extends Task {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerSyncTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
index feb02354..94c743aa 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerSyncTask.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,13 +31,13 @@ import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.server.data.ClusterInfo;
-import com.gluster.storage.management.server.data.PersistenceDao;
-import com.gluster.storage.management.server.data.ServerInfo;
-import com.gluster.storage.management.server.resources.v1_0.DiscoveredServersResource;
-import com.gluster.storage.management.server.services.ClusterService;
-import com.gluster.storage.management.server.services.GlusterServerService;
-import com.gluster.storage.management.server.utils.ServerUtil;
+import com.gluster.storage.management.gateway.data.ClusterInfo;
+import com.gluster.storage.management.gateway.data.PersistenceDao;
+import com.gluster.storage.management.gateway.data.ServerInfo;
+import com.gluster.storage.management.gateway.resources.v1_0.DiscoveredServersResource;
+import com.gluster.storage.management.gateway.services.ClusterService;
+import com.gluster.storage.management.gateway.services.GlusterServerService;
+import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  * Task for syncing server details. This performs two things: <br>
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/Task.java
index 119f6297..1ba360bc 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/tasks/Task.java
@@ -18,13 +18,13 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.tasks;
+package com.gluster.storage.management.gateway.tasks;
 
 import com.gluster.storage.management.core.model.GlusterServer;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.server.services.ClusterService;
+import com.gluster.storage.management.gateway.services.ClusterService;
 
 public abstract class Task {
 	public String[] TASK_TYPE_STR = { "Format Disk", "Migrate Brick", "Volume Rebalance" };
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/AbstractStatsFactory.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
index 6f1226aa..0e73297f 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/AbstractStatsFactory.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/CpuStatsFactory.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
index 27e271e5..b6ef9ef2 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/CpuStatsFactory.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import org.springframework.stereotype.Component;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
index f5d09ac2..7622d283 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -49,7 +49,7 @@ import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.server.resources.v1_0.TasksResource;
+import com.gluster.storage.management.gateway.resources.v1_0.TasksResource;
 import com.sun.jersey.api.core.InjectParam;
 
 @Component
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/MemoryStatsFactory.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
index fcbf43d5..dc88bf52 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/MemoryStatsFactory.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/NetworkStatsFactory.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
index 2a50d598..d3d47c58 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/NetworkStatsFactory.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
index f0aab567..0fae0078 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
@@ -18,7 +18,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/SshUtil.java
index bf82bc6c..39dd42f9 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/SshUtil.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/SshUtil.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/StatsFactory.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
index 85487602..09851367 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/StatsFactory.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *******************************************************************************/
-package com.gluster.storage.management.server.utils;
+package com.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml b/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
index 3cf30ee4..c89eb2f0 100644
--- a/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
+++ b/src/com.gluster.storage.management.server/src/spring/gluster-server-base.xml
@@ -7,7 +7,7 @@
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd 
    http://www.springframework.org/schema/tx  http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-	<context:component-scan base-package="com.gluster.storage.management.server" />
+	<context:component-scan base-package="com.gluster.storage.management.gateway" />
 	<task:scheduler id="taskScheduler" />
 	<task:executor id="taskExecutor" pool-size="1" />
 	<task:annotation-driven executor="taskExecutor" scheduler="taskScheduler" />
@@ -69,19 +69,19 @@
 	<bean
         class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
 
-	<bean id="clusterDao" class="com.gluster.storage.management.server.data.PersistenceDao">
+	<bean id="clusterDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.server.data.ClusterInfo</value>
+			<value>com.gluster.storage.management.gateway.data.ClusterInfo</value>
 		</constructor-arg>
 	</bean>
 
-	<bean id="serverDao" class="com.gluster.storage.management.server.data.PersistenceDao">
+	<bean id="serverDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.server.data.ServerInfo</value>
+			<value>com.gluster.storage.management.gateway.data.ServerInfo</value>
 		</constructor-arg>
 	</bean>
 	
-	<!-- bean id="dataSourceFactory" class="com.gluster.storage.management.server.data.GlusterDataSource" />
+	<!-- bean id="dataSourceFactory" class="com.gluster.storage.management.gateway.data.GlusterDataSource" />
 		<bean id="dataSource" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetObject">
 		<ref local="dataSourceFactory" />
@@ -91,10 +91,10 @@
 		</property>
 		</bean -->
 
-	<!-- bean id="dataSource" class="com.gluster.storage.management.server.data.GlusterDataSource"
+	<!-- bean id="dataSource" class="com.gluster.storage.management.gateway.data.GlusterDataSource"
 		lazy-init="false" autowire="byType" / -->
 
-	<bean class="com.gluster.storage.management.server.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
+	<bean class="com.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 </beans>
\ No newline at end of file