From 1d0f27b98e681efbe2455a5bd919f589d64d6c30 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Thu, 11 May 2023 09:40:03 +0530
Subject: [PATCH] refactored ui request handler component

---
 .../pom.xml                                    | 14 ++++++++++++--
 .../interceptor/DefaultTokenHandler.java       | 10 +++++-----
 .../ui/request/interceptor/GrafanaHandler.java | 12 ++++++------
 .../ui/request/interceptor/HubspotHandler.java |  8 ++++----
 .../ui/request/interceptor/InvokerHandler.java | 10 +++++-----
 .../ui/request/interceptor/LoginHandler.java   | 18 +++++++++---------
 .../ui/request/interceptor/LogoutHandler.java  |  6 +++---
 .../request/interceptor/OTPInvokerHandler.java |  8 ++++----
 .../interceptor/PermissionScopeHandler.java    | 10 +++++-----
 .../interceptor/SsoLoginCallbackHandler.java   | 10 +++++-----
 .../request/interceptor/SsoLoginHandler.java   | 14 +++++++-------
 .../request/interceptor/SsoLogoutHandler.java  |  8 ++++----
 .../ui/request/interceptor/UserHandler.java    | 10 +++++-----
 .../ui/request/interceptor/beans/AuthData.java |  2 +-
 .../interceptor/beans/ProxyResponse.java       |  2 +-
 .../request/interceptor/cache/LoginCache.java  |  2 +-
 .../ui/request/interceptor/cache/OAuthApp.java |  2 +-
 .../interceptor/cache/OAuthAppCacheKey.java    |  2 +-
 .../interceptor/exceptions/LoginException.java |  2 +-
 .../interceptor/util/GrafanaHandlerUtil.java   |  2 +-
 .../interceptor/util/HandlerConstants.java     |  2 +-
 .../request/interceptor/util/HandlerUtil.java  |  8 ++++----
 .../websocket/GrafanaLiveSecurityFilter.java   |  6 +++---
 .../websocket/GrafanaWebSocketClient.java      |  2 +-
 .../websocket/GrafanaWebSocketHandler.java     |  2 +-
 .../webapp/META-INF/webapp-classloading.xml    |  0
 .../src/main/webapp/WEB-INF/web.xml            |  2 +-
 components/ui-request-interceptor/pom.xml      |  3 +--
 .../pom.xml                                    |  6 +++---
 features/ui-request-interceptor/pom.xml        |  1 -
 pom.xml                                        |  4 ++--
 31 files changed, 98 insertions(+), 90 deletions(-)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor => io.entgra.device.mgt.core.ui.request.interceptor}/pom.xml (95%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/DefaultTokenHandler.java (95%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/GrafanaHandler.java (96%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/HubspotHandler.java (95%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/InvokerHandler.java (97%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/LoginHandler.java (94%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/LogoutHandler.java (87%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/OTPInvokerHandler.java (96%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/PermissionScopeHandler.java (86%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/SsoLoginCallbackHandler.java (92%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/SsoLoginHandler.java (97%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/SsoLogoutHandler.java (89%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/UserHandler.java (94%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/beans/AuthData.java (97%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/beans/ProxyResponse.java (96%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/cache/LoginCache.java (97%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/cache/OAuthApp.java (97%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/cache/OAuthAppCacheKey.java (96%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/exceptions/LoginException.java (94%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/util/GrafanaHandlerUtil.java (90%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/util/HandlerConstants.java (99%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/util/HandlerUtil.java (99%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java (90%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/websocket/GrafanaWebSocketClient.java (98%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor/src/main/java/io/entgra => io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core}/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java (98%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor => io.entgra.device.mgt.core.ui.request.interceptor}/src/main/webapp/META-INF/webapp-classloading.xml (100%)
 rename components/ui-request-interceptor/{io.entgra.ui.request.interceptor => io.entgra.device.mgt.core.ui.request.interceptor}/src/main/webapp/WEB-INF/web.xml (96%)

diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml
similarity index 95%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml
index fbb16808127..e37de80356d 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml
@@ -20,12 +20,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ui-request-interceptor</artifactId>
-        <groupId>io.entgra.devicemgt</groupId>
+        <groupId>io.entgra.device.mgt.core</groupId>
         <version>5.0.26-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>io.entgra.ui.request.interceptor</artifactId>
+    <artifactId>io.entgra.device.mgt.core.ui.request.interceptor</artifactId>
     <packaging>war</packaging>
     <name>Entgra - Request Handling Proxy Servlet</name>
     <description>Proxy Service for Request Handling in Entgra EMM/IOT Server.</description>
@@ -118,6 +118,16 @@
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.device.mgt.extensions.logger</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.notification.logger</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/DefaultTokenHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/DefaultTokenHandler.java
similarity index 95%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/DefaultTokenHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/DefaultTokenHandler.java
index b244a5ed676..f763118dde1 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/DefaultTokenHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/DefaultTokenHandler.java
@@ -15,15 +15,15 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32,7 +32,7 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.ContentType;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/GrafanaHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/GrafanaHandler.java
similarity index 96%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/GrafanaHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/GrafanaHandler.java
index 91a0a3bf124..36a7f1fab9e 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/GrafanaHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/GrafanaHandler.java
@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
-import io.entgra.ui.request.interceptor.util.GrafanaHandlerUtil;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.GrafanaHandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/HubspotHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/HubspotHandler.java
similarity index 95%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/HubspotHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/HubspotHandler.java
index e489f1883c2..91296cd752a 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/HubspotHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/HubspotHandler.java
@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import com.google.gson.JsonObject;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHeaders;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/InvokerHandler.java
similarity index 97%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/InvokerHandler.java
index 045aac0b5ad..660b2e55bc5 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/InvokerHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/InvokerHandler.java
@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -32,7 +32,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpHead;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LoginHandler.java
similarity index 94%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LoginHandler.java
index 4120069a56a..7368d2935de 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LoginHandler.java
@@ -16,20 +16,20 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.cache.LoginCache;
-import io.entgra.ui.request.interceptor.cache.OAuthApp;
-import io.entgra.ui.request.interceptor.cache.OAuthAppCacheKey;
-import io.entgra.ui.request.interceptor.exceptions.LoginException;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.LoginCache;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.OAuthApp;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.OAuthAppCacheKey;
+import io.entgra.device.mgt.core.ui.request.interceptor.exceptions.LoginException;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHeaders;
@@ -38,7 +38,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.protocol.HTTP;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LogoutHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LogoutHandler.java
similarity index 87%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LogoutHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LogoutHandler.java
index bbf82164a25..dce8b5feab9 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LogoutHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/LogoutHandler.java
@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/OTPInvokerHandler.java
similarity index 96%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/OTPInvokerHandler.java
index 440a02f98e5..8b03ab6049a 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/OTPInvokerHandler.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -30,7 +30,7 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpHead;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/PermissionScopeHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java
similarity index 86%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/PermissionScopeHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java
index b5309492c7c..6d363cb4b3d 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/PermissionScopeHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java
@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.json.JSONObject;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLoginCallbackHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginCallbackHandler.java
similarity index 92%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLoginCallbackHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginCallbackHandler.java
index 30efb713d59..988c3aa3309 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLoginCallbackHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginCallbackHandler.java
@@ -16,21 +16,21 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHeaders;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLoginHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginHandler.java
similarity index 97%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLoginHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginHandler.java
index 01116717245..522258d9bca 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLoginHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLoginHandler.java
@@ -16,18 +16,18 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
-import io.entgra.ui.request.interceptor.cache.LoginCache;
-import io.entgra.ui.request.interceptor.cache.OAuthApp;
-import io.entgra.ui.request.interceptor.cache.OAuthAppCacheKey;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.LoginCache;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.OAuthApp;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.OAuthAppCacheKey;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.lang.text.StrSubstitutor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +43,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLogoutHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLogoutHandler.java
similarity index 89%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLogoutHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLogoutHandler.java
index 0e46e759f66..0567220ce5b 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/SsoLogoutHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/SsoLogoutHandler.java
@@ -16,14 +16,14 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/UserHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java
similarity index 94%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/UserHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java
index 53be11141e4..b967ce5324c 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/UserHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java
@@ -16,24 +16,24 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor;
+package io.entgra.device.mgt.core.ui.request.interceptor;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil;
 import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger;
 import io.entgra.notification.logger.UserLogContext;
 import io.entgra.notification.logger.impl.EntgraUserLoggerImpl;
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
-import io.entgra.ui.request.interceptor.util.HandlerUtil;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/beans/AuthData.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/AuthData.java
similarity index 97%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/beans/AuthData.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/AuthData.java
index be6a8b570bc..561c5ffc331 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/beans/AuthData.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/AuthData.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.beans;
+package io.entgra.device.mgt.core.ui.request.interceptor.beans;
 
 
 public class AuthData implements java.io.Serializable {
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/beans/ProxyResponse.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/ProxyResponse.java
similarity index 96%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/beans/ProxyResponse.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/ProxyResponse.java
index 32c7ecb117d..5f299af0e40 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/beans/ProxyResponse.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/beans/ProxyResponse.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.ui.request.interceptor.beans;
+package io.entgra.device.mgt.core.ui.request.interceptor.beans;
 
 import org.apache.http.Header;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/LoginCache.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/LoginCache.java
similarity index 97%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/LoginCache.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/LoginCache.java
index 06ca1cef6b9..69b2bf66dad 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/LoginCache.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/LoginCache.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.cache;
+package io.entgra.device.mgt.core.ui.request.interceptor.cache;
 
 import java.util.LinkedHashMap;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/OAuthApp.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/OAuthApp.java
similarity index 97%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/OAuthApp.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/OAuthApp.java
index db721ea992f..ffe1b4f99d0 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/OAuthApp.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/OAuthApp.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.cache;
+package io.entgra.device.mgt.core.ui.request.interceptor.cache;
 
 /**
  * The data object used for Login Cache
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/OAuthAppCacheKey.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/OAuthAppCacheKey.java
similarity index 96%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/OAuthAppCacheKey.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/OAuthAppCacheKey.java
index aa03eade5ae..d40a0d0ee56 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/cache/OAuthAppCacheKey.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/cache/OAuthAppCacheKey.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.cache;
+package io.entgra.device.mgt.core.ui.request.interceptor.cache;
 
 import java.util.Objects;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/exceptions/LoginException.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/exceptions/LoginException.java
similarity index 94%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/exceptions/LoginException.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/exceptions/LoginException.java
index b33b74da733..91354fdb753 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/exceptions/LoginException.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/exceptions/LoginException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.exceptions;
+package io.entgra.device.mgt.core.ui.request.interceptor.exceptions;
 
 public class LoginException extends Exception {
     public LoginException(String message) {
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/GrafanaHandlerUtil.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/GrafanaHandlerUtil.java
similarity index 90%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/GrafanaHandlerUtil.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/GrafanaHandlerUtil.java
index 3ba09f8d0dd..8acfcee9dd7 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/GrafanaHandlerUtil.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/GrafanaHandlerUtil.java
@@ -1,4 +1,4 @@
-package io.entgra.ui.request.interceptor.util;
+package io.entgra.device.mgt.core.ui.request.interceptor.util;
 
 import org.apache.commons.lang.StringUtils;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerConstants.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerConstants.java
similarity index 99%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerConstants.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerConstants.java
index 27d6afaadc4..b8d8d95a0a5 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerConstants.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerConstants.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.util;
+package io.entgra.device.mgt.core.ui.request.interceptor.util;
 
 public class HandlerConstants {
     public static final String PUBLISHER_APPLICATION_NAME = "application-mgt-publisher";
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerUtil.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
similarity index 99%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerUtil.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
index b7376abddcd..374fcc19313 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerUtil.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/util/HandlerUtil.java
@@ -16,15 +16,15 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.util;
+package io.entgra.device.mgt.core.ui.request.interceptor.util;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.cache.LoginCache;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.cache.LoginCache;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -54,7 +54,7 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.w3c.dom.Document;
-import io.entgra.ui.request.interceptor.beans.ProxyResponse;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse;
 import org.xml.sax.SAXException;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java
similarity index 90%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java
index 091a1e005bf..97e57394c5b 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaLiveSecurityFilter.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.websocket;
+package io.entgra.device.mgt.core.ui.request.interceptor.websocket;
 
-import io.entgra.ui.request.interceptor.beans.AuthData;
-import io.entgra.ui.request.interceptor.util.HandlerConstants;
+import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData;
+import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketClient.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
similarity index 98%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
index 740876f3c3e..efa63fd2d18 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.websocket;
+package io.entgra.device.mgt.core.ui.request.interceptor.websocket;
 
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
similarity index 98%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
index cccb9a91a0b..66a7df6aa45 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.ui.request.interceptor.websocket;
+package io.entgra.device.mgt.core.ui.request.interceptor.websocket;
 
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
 import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/webapp/META-INF/webapp-classloading.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/webapp/META-INF/webapp-classloading.xml
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/webapp/WEB-INF/web.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/webapp/WEB-INF/web.xml
similarity index 96%
rename from components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/webapp/WEB-INF/web.xml
rename to components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/webapp/WEB-INF/web.xml
index 32e9b34f98c..db7d7bb0c56 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/webapp/WEB-INF/web.xml
+++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/webapp/WEB-INF/web.xml
@@ -90,7 +90,7 @@
     </filter>
     <filter>
         <filter-name>GrafanaLiveSecurityFilter</filter-name>
-        <filter-class>io.entgra.ui.request.interceptor.websocket.GrafanaLiveSecurityFilter</filter-class>
+        <filter-class>io.entgra.device.mgt.core.ui.request.interceptor.websocket.GrafanaLiveSecurityFilter</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/components/ui-request-interceptor/pom.xml b/components/ui-request-interceptor/pom.xml
index d99b9e5fbaf..aca59559af3 100644
--- a/components/ui-request-interceptor/pom.xml
+++ b/components/ui-request-interceptor/pom.xml
@@ -26,7 +26,6 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.devicemgt</groupId>
     <artifactId>ui-request-interceptor</artifactId>
     <name>Entgra - UI Request Interceptor Servlet</name>
     <description>
@@ -35,7 +34,7 @@
     </description>
     <packaging>pom</packaging>
     <modules>
-        <module>io.entgra.ui.request.interceptor</module>
+        <module>io.entgra.device.mgt.core.ui.request.interceptor</module>
     </modules>
 
 
diff --git a/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml
index 68f8c8399f6..0c4f77a678d 100644
--- a/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml
+++ b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>ui-request-interceptor-feature</artifactId>
-        <groupId>io.entgra.devicemgt</groupId>
+        <groupId>io.entgra.device.mgt.core</groupId>
         <version>5.0.26-SNAPSHOT</version>
     </parent>
 
@@ -47,8 +47,8 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>io.entgra.devicemgt</groupId>
-                                    <artifactId>io.entgra.ui.request.interceptor</artifactId>
+                                    <groupId>io.entgra.device.mgt.core</groupId>
+                                    <artifactId>io.entgra.device.mgt.core.ui.request.interceptor</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
diff --git a/features/ui-request-interceptor/pom.xml b/features/ui-request-interceptor/pom.xml
index 9f96ff460ca..18a0a855ec4 100644
--- a/features/ui-request-interceptor/pom.xml
+++ b/features/ui-request-interceptor/pom.xml
@@ -26,7 +26,6 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.devicemgt</groupId>
     <artifactId>ui-request-interceptor-feature</artifactId>
     <name>Entgra - UI Request Interceptor Feature</name>
     <description>
diff --git a/pom.xml b/pom.xml
index ed3bb2dd860..a734f4e03f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 <!--        <module>components/application-mgt</module>-->
 <!--        <module>components/policy-mgt</module>-->
 <!--        <module>components/certificate-mgt</module>-->
-<!--        <module>components/ui-request-interceptor</module>-->
+        <module>components/ui-request-interceptor</module>
         <module>components/transport-mgt</module>
         <module>components/analytics-mgt</module>
         <module>components/webapp-authenticator-framework</module>
@@ -57,7 +57,7 @@
 <!--        <module>features/policy-mgt</module>-->
 <!--        <module>features/certificate-mgt</module>-->
 <!--        <module>features/heartbeat-management</module>-->
-<!--        <module>features/ui-request-interceptor</module>-->
+        <module>features/ui-request-interceptor</module>
 <!--        <module>features/jwt-client</module>-->
 <!--        <module>features/device-mgt-extensions</module>-->
         <module>features/transport-mgt</module>