From 8e26f3b4dd240dd8a78da77369a1756be0e02a6e Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Thu, 11 May 2023 09:23:38 +0530
Subject: [PATCH] refactored analytics mgt component

---
 .../pom.xml                                   |  6 ++--
 .../proxy/api}/GrafanaAPIProxyService.java    |  2 +-
 .../proxy/api}/addons/ApiOriginFilter.java    |  2 +-
 .../api}/addons/GsonMessageBodyHandler.java   |  2 +-
 .../api}/addons/ValidationInterceptor.java    |  2 +-
 .../proxy/api}/bean/ErrorListItem.java        |  2 +-
 .../proxy/api}/bean/ErrorResponse.java        |  2 +-
 .../proxy/api}/exception/RefererNotValid.java |  2 +-
 .../api}/impl/GrafanaAPIProxyServiceImpl.java | 19 ++++++-------
 .../impl/util/GrafanaRequestHandlerUtil.java  | 16 +++++------
 .../src/main/webapp/META-INF/permissions.xml  |  0
 .../webapp/META-INF/webapp-classloading.xml   |  0
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   | 10 +++----
 .../src/main/webapp/WEB-INF/web.xml           |  2 +-
 .../pom.xml                                   |  4 +--
 .../exception/GrafanaManagementException.java |  2 +-
 .../pom.xml                                   | 12 ++++----
 .../core/bean/GrafanaPanelIdentifier.java     |  2 +-
 .../core/config/GrafanaConfiguration.java     |  6 ++--
 .../config/GrafanaConfigurationManager.java   |  6 ++--
 .../config/xml/bean/CacheConfiguration.java   |  2 +-
 .../proxy/core/config/xml/bean/User.java      |  2 +-
 .../core/exception/DashboardNotFound.java     |  2 +-
 .../core/exception/DatasourceNotFound.java    |  2 +-
 .../core/exception/GrafanaAPIException.java   |  4 +--
 .../GrafanaEnvVariablesNotDefined.java        |  4 +--
 .../core/exception/MaliciousQueryAttempt.java |  4 +--
 .../proxy/core/exception/PanelNotFound.java   |  2 +-
 .../proxy/core/exception/QueryMisMatch.java   |  2 +-
 .../proxy/core/exception/QueryNotFound.java   |  2 +-
 .../core/exception/TemplateNotFound.java      |  2 +-
 .../GrafanaManagementServiceComponent.java    | 10 +++----
 .../core/internal/GrafanaMgtDataHolder.java   |  6 ++--
 .../proxy/core/service/GrafanaAPIService.java |  6 ++--
 .../core/service/GrafanaQueryService.java     |  4 +--
 .../proxy/core/service/bean/Datasource.java   |  2 +-
 .../core/service/cache/CacheManager.java      | 14 +++++-----
 .../service/cache/QueryTemplateCacheKey.java  |  2 +-
 .../service/impl/GrafanaAPIServiceImpl.java   | 28 +++++++++----------
 .../service/impl/GrafanaQueryServiceImpl.java | 28 +++++++++----------
 .../GrafanaDatasourceConnectionFactory.java   |  2 +-
 .../query/GrafanaPreparedQueryBuilder.java    |  8 +++---
 .../proxy/core/sql/query/PreparedQuery.java   |  2 +-
 .../query/encoder/GenericQueryEncoder.java    |  4 +--
 .../sql/query/encoder/MySQLQueryEncoder.java  |  6 ++--
 .../core/sql/query/encoder/QueryEncoder.java  |  4 +--
 .../query/encoder/QueryEncoderFactory.java    |  4 +--
 .../proxy/core/util/GrafanaConstants.java     |  2 +-
 .../grafana/proxy/core/util/GrafanaUtil.java  | 16 ++++-------
 components/analytics-mgt/grafana-mgt/pom.xml  |  6 ++--
 .../io.entgra.ui.request.interceptor/pom.xml  |  2 +-
 .../request/interceptor/GrafanaHandler.java   |  6 ++--
 .../websocket/GrafanaWebSocketClient.java     |  4 +--
 .../websocket/GrafanaWebSocketHandler.java    |  6 ++--
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  8 +++---
 pom.xml                                       | 10 +++----
 57 files changed, 157 insertions(+), 162 deletions(-)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api}/pom.xml (97%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/GrafanaAPIProxyService.java (98%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/addons/ApiOriginFilter.java (95%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/addons/GsonMessageBodyHandler.java (97%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/addons/ValidationInterceptor.java (98%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/bean/ErrorListItem.java (96%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/bean/ErrorResponse.java (98%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/exception/RefererNotValid.java (60%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/impl/GrafanaAPIProxyServiceImpl.java (84%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api}/impl/util/GrafanaRequestHandlerUtil.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api}/src/main/webapp/META-INF/permissions.xml (100%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (77%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.api => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api}/src/main/webapp/WEB-INF/web.xml (97%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.common => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common}/pom.xml (95%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java (92%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core}/pom.xml (95%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java (95%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java (86%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java (94%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java (93%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java (93%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java (82%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java (83%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java (84%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java (91%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java (84%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java (85%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java (89%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java (86%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java (95%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java (82%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java (95%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java (88%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java (82%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java (97%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java (97%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java (94%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java (92%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java (90%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java (84%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java (85%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java (97%)
 rename components/analytics-mgt/grafana-mgt/{io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra => io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core}/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java (85%)

diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml
similarity index 97%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/pom.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml
index 044990580a..71e5b7a473 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.analytics.mgt.grafana.proxy.api</artifactId>
+    <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api</artifactId>
     <packaging>war</packaging>
     <name>Entgra - Grafana Proxy API</name>
     <description>Entgra - Grafana Proxy API</description>
@@ -320,7 +320,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.analytics.mgt.grafana.proxy.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -330,7 +330,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.analytics.mgt.grafana.proxy.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/GrafanaAPIProxyService.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java
similarity index 98%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/GrafanaAPIProxyService.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java
index c154f9149c..58d119cbfa 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/GrafanaAPIProxyService.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/GrafanaAPIProxyService.java
@@ -15,7 +15,7 @@
  *   specific language governing permissions and limitations
  *   under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.api.service;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api;
 
 import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/ApiOriginFilter.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/ApiOriginFilter.java
similarity index 95%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/ApiOriginFilter.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/ApiOriginFilter.java
index 5562c40ad0..206adf4700 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/ApiOriginFilter.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/ApiOriginFilter.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.api.service.addons;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/GsonMessageBodyHandler.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/GsonMessageBodyHandler.java
similarity index 97%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/GsonMessageBodyHandler.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/GsonMessageBodyHandler.java
index f786cf645e..8cf776511e 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/GsonMessageBodyHandler.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/GsonMessageBodyHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.api.service.addons;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/ValidationInterceptor.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/ValidationInterceptor.java
similarity index 98%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/ValidationInterceptor.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/ValidationInterceptor.java
index 3ff1928ef6..4726adf0b3 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/addons/ValidationInterceptor.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/addons/ValidationInterceptor.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.api.service.addons;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/bean/ErrorListItem.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/bean/ErrorListItem.java
similarity index 96%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/bean/ErrorListItem.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/bean/ErrorListItem.java
index aca4e22b56..8956b802b7 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/bean/ErrorListItem.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/bean/ErrorListItem.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package io.entgra.analytics.mgt.grafana.proxy.api.service.bean;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.bean;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/bean/ErrorResponse.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/bean/ErrorResponse.java
similarity index 98%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/bean/ErrorResponse.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/bean/ErrorResponse.java
index 1287ce5f76..528d160e8d 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/bean/ErrorResponse.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/bean/ErrorResponse.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package io.entgra.analytics.mgt.grafana.proxy.api.service.bean;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.bean;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/exception/RefererNotValid.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/exception/RefererNotValid.java
similarity index 60%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/exception/RefererNotValid.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/exception/RefererNotValid.java
index 2e39f3d62e..2448a5a8a0 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/exception/RefererNotValid.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/exception/RefererNotValid.java
@@ -1,4 +1,4 @@
-package io.entgra.analytics.mgt.grafana.proxy.api.service.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.exception;
 
 public class RefererNotValid extends Exception {
     public RefererNotValid(String msg) {
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/GrafanaAPIProxyServiceImpl.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java
similarity index 84%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/GrafanaAPIProxyServiceImpl.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java
index ee227b3f18..17199e73cb 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/GrafanaAPIProxyServiceImpl.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/GrafanaAPIProxyServiceImpl.java
@@ -1,15 +1,14 @@
-package io.entgra.analytics.mgt.grafana.proxy.api.service.impl;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl;
 
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.api.service.GrafanaAPIProxyService;
-import io.entgra.analytics.mgt.grafana.proxy.api.service.bean.ErrorResponse;
-import io.entgra.analytics.mgt.grafana.proxy.api.service.exception.RefererNotValid;
-import io.entgra.analytics.mgt.grafana.proxy.api.service.impl.util.GrafanaRequestHandlerUtil;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.MaliciousQueryAttempt;
-import io.entgra.analytics.mgt.grafana.proxy.core.internal.GrafanaMgtDataHolder;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.GrafanaAPIProxyService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.bean.ErrorResponse;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.exception.RefererNotValid;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl.util.GrafanaRequestHandlerUtil;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.MaliciousQueryAttempt;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal.GrafanaMgtDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/util/GrafanaRequestHandlerUtil.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/util/GrafanaRequestHandlerUtil.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/util/GrafanaRequestHandlerUtil.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/util/GrafanaRequestHandlerUtil.java
index e4d17265a8..b1aaea38c1 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/analytics/mgt/grafana/proxy/api/service/impl/util/GrafanaRequestHandlerUtil.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/api/impl/util/GrafanaRequestHandlerUtil.java
@@ -16,16 +16,16 @@
  *   under the License.
  *
  */
-package io.entgra.analytics.mgt.grafana.proxy.api.service.impl.util;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl.util;
 
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.api.service.bean.ErrorResponse;
-import io.entgra.analytics.mgt.grafana.proxy.api.service.exception.RefererNotValid;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.bean.ErrorResponse;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.exception.RefererNotValid;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
+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;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpResponse;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/permissions.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/permissions.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/permissions.xml
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/webapp-classloading.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 77%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 0f6ec36cf0..efd582ba93 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -35,7 +35,7 @@
     </jaxrs:server>
 
     <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
-        <property name="resourcePackage" value="io.entgra.analytics.mgt.grafana.proxy.api.service"/>
+        <property name="resourcePackage" value="io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.service"/>
         <property name="version" value="1.0"/>
         <property name="host" value="localhost:9443"/>
         <property name="schemes" value="https" />
@@ -47,15 +47,15 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="grafanaAPIProxyService" class="io.entgra.analytics.mgt.grafana.proxy.api.service.impl.GrafanaAPIProxyServiceImpl"/>
+    <bean id="grafanaAPIProxyService" class="io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.impl.GrafanaAPIProxyServiceImpl"/>
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
-    <bean id="jsonProvider" class="io.entgra.analytics.mgt.grafana.proxy.api.service.addons.GsonMessageBodyHandler"/>
-    <bean id="io.entgra.analytics.mgt.grafana.proxy.api.service.addons.ValidationInterceptor" class="io.entgra.analytics.mgt.grafana.proxy.api.service.addons.ValidationInterceptor"/>
+    <bean id="jsonProvider" class="io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons.GsonMessageBodyHandler"/>
+    <bean id="io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons.ValidationInterceptor" class="io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons.ValidationInterceptor"/>
 
     <cxf:bus>
         <cxf:inInterceptors>
-            <ref bean="io.entgra.analytics.mgt.grafana.proxy.api.service.addons.ValidationInterceptor"/>
+            <ref bean="io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons.ValidationInterceptor"/>
         </cxf:inInterceptors>
     </cxf:bus>
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/web.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/web.xml
similarity index 97%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/web.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/web.xml
index 6ef280f763..dffcf6f861 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/src/main/webapp/WEB-INF/web.xml
@@ -66,7 +66,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>io.entgra.analytics.mgt.grafana.proxy.api.service.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter-mapping>
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml
similarity index 95%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/pom.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml
index 4d3be73578..563f941e7a 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.analytics.mgt.grafana.proxy.common</artifactId>
+    <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra - Grafana API Handler Common</name>
     <description>Entgra - Grafana API Handler Common</description>
@@ -46,7 +46,7 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Grafana Management Common Bundle</Bundle-Description>
                         <Export-Package>
-                            io.entgra.analytics.mgt.grafana.proxy.common.*
+                            io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.*
                         </Export-Package>
                         <Import-Package>
                             javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}",
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java
similarity index 92%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java
index 64ec9b2731..e660b105a4 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package io.entgra.analytics.mgt.grafana.proxy.common.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception;
 
 public class GrafanaManagementException extends Exception{
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
similarity index 95%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/pom.xml
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
index 4c0b0ec3ae..3eebdb7cfc 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.analytics.mgt.grafana.proxy.core</artifactId>
+    <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra - Grafana API Handler Core</name>
     <description>Entgra - Grafana API Handler Core</description>
@@ -75,9 +75,9 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Grafana API Management Core Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.analytics.mgt.grafana.proxy.core.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal</Private-Package>
                         <Import-Package>
-                            io.entgra.analytics.mgt.grafana.proxy.common.*,
+                            io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.*,
                             javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                             javax.xml.bind.annotation,
                             javax.xml.bind,
@@ -88,8 +88,8 @@
                             io.entgra.application.mgt.core.*
                         </Import-Package>
                         <Export-Package>
-                            !org.wso2.carbon.email.sender.core.internal,
-                            io.entgra.analytics.mgt.grafana.proxy.core.*
+                            !io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal,
+                            io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.*
                         </Export-Package>
                         <Embed-Dependency>
                             scribe;scope=compile|runtime;inline=false,
@@ -134,7 +134,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.analytics.mgt.grafana.proxy.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java
similarity index 95%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java
index 4ff90e25b0..21d7cfdf43 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/bean/GrafanaPanelIdentifier.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.bean;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean;
 
 public class GrafanaPanelIdentifier {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java
similarity index 86%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java
index 72ab1545fe..a4f3f49cf6 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/GrafanaConfiguration.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.config;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.config.xml.bean.CacheConfiguration;
-import io.entgra.analytics.mgt.grafana.proxy.core.config.xml.bean.User;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean.CacheConfiguration;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean.User;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java
similarity index 94%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java
index a8ce50fb5f..78594cee01 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/GrafanaConfigurationManager.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.config;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config;
 
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
+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.GrafanaConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java
similarity index 93%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java
index def5fb3476..29609ab7c2 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/xml/bean/CacheConfiguration.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.config.xml.bean;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java
similarity index 93%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java
index 3e8b662175..a552c9a615 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/config/xml/bean/User.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.config.xml.bean;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java
index c052d107d1..fbc971c294 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/DashboardNotFound.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 public class DashboardNotFound extends GrafanaAPIException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java
index 3d750bff35..7609fd780d 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/DatasourceNotFound.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 public class DatasourceNotFound extends GrafanaAPIException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java
similarity index 82%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java
index df926061f0..4137d679a3 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/GrafanaAPIException.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
 
 public class GrafanaAPIException extends GrafanaManagementException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java
similarity index 83%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java
index acb836680c..5074e0d756 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/GrafanaEnvVariablesNotDefined.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
 
 public class GrafanaEnvVariablesNotDefined extends GrafanaManagementException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java
similarity index 84%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java
index ff91dd6a6e..049f8888c8 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/MaliciousQueryAttempt.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
 
 public class MaliciousQueryAttempt extends GrafanaManagementException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java
index f8cead9df8..962c5151ba 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/PanelNotFound.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 public class PanelNotFound extends GrafanaAPIException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java
index 0d011ddd14..a3fed1ad67 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/QueryMisMatch.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 public class QueryMisMatch extends MaliciousQueryAttempt {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java
index 1bff687b14..8f6a28ccc6 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/QueryNotFound.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 public class QueryNotFound extends GrafanaAPIException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java
similarity index 91%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java
index e5347eee10..f2d8075963 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/exception/TemplateNotFound.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.exception;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception;
 
 public class TemplateNotFound extends GrafanaAPIException {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java
similarity index 84%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java
index f976e2ef51..2b4899bbac 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/internal/GrafanaManagementServiceComponent.java
@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.internal;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.impl.GrafanaAPIServiceImpl;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.impl.GrafanaQueryServiceImpl;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.impl.GrafanaAPIServiceImpl;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.impl.GrafanaQueryServiceImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java
similarity index 85%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java
index 10d43d7a23..eb49d93d94 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/internal/GrafanaMgtDataHolder.java
@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.internal;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
 
 public class GrafanaMgtDataHolder {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java
similarity index 89%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java
index 91776c50b9..e5ebfcd05d 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaAPIService.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.service;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service;
 
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
 
 import java.io.IOException;
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java
similarity index 86%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java
index a1c43baf52..38845b21d4 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/GrafanaQueryService.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.service;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service;
 
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
 import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException;
 
 import java.io.IOException;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java
similarity index 95%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java
index 43a11fdda4..c7b7cf2bbb 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/bean/Datasource.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.service.bean;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.bean;
 
 public class Datasource {
     private int id;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java
similarity index 82%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java
index b56a1041bd..cc360ae976 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/cache/CacheManager.java
@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.service.cache;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.cache;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.config.GrafanaConfiguration;
-import io.entgra.analytics.mgt.grafana.proxy.core.config.GrafanaConfigurationManager;
-import io.entgra.analytics.mgt.grafana.proxy.core.config.xml.bean.CacheConfiguration;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.GrafanaConfiguration;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.GrafanaConfigurationManager;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean.CacheConfiguration;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java
similarity index 95%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java
index 175fe3ae28..24e2d6748a 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/cache/QueryTemplateCacheKey.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.service.cache;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.cache;
 
 import java.util.Objects;
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java
similarity index 88%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java
index ae3e91a0c7..82909880fa 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaAPIServiceImpl.java
@@ -15,24 +15,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.service.impl;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.impl;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.DashboardNotFound;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.DatasourceNotFound;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.PanelNotFound;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.QueryNotFound;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.TemplateNotFound;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.cache.CacheManager;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.cache.QueryTemplateCacheKey;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+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.DashboardNotFound;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.DatasourceNotFound;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.PanelNotFound;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.QueryNotFound;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.TemplateNotFound;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.cache.CacheManager;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.cache.QueryTemplateCacheKey;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpResponse;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java
similarity index 82%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java
index 7af9acf559..44ea539ec4 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/service/impl/GrafanaQueryServiceImpl.java
@@ -15,24 +15,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.service.impl;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.impl;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.MaliciousQueryAttempt;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.QueryMisMatch;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.QueryNotFound;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.cache.CacheManager;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.cache.QueryTemplateCacheKey;
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.query.GrafanaPreparedQueryBuilder;
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.query.encoder.QueryEncoderFactory;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
+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.MaliciousQueryAttempt;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.QueryMisMatch;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.QueryNotFound;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.bean.Datasource;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.cache.CacheManager;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.service.cache.QueryTemplateCacheKey;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.GrafanaPreparedQueryBuilder;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.encoder.QueryEncoderFactory;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java
similarity index 97%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java
index 808b859038..234af41d0d 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/connection/GrafanaDatasourceConnectionFactory.java
@@ -1,4 +1,4 @@
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.connection;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.connection;
 
 import io.entgra.application.mgt.core.config.Configuration;
 import io.entgra.application.mgt.core.config.ConfigurationManager;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java
similarity index 97%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java
index da14278caf..e85c1807d3 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/GrafanaPreparedQueryBuilder.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.query;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.QueryMisMatch;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.QueryMisMatch;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java
similarity index 94%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java
index 9540841061..2a3f61e5ce 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/PreparedQuery.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.query;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query;
 
 import java.util.List;
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java
similarity index 92%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java
index 7b6693689f..df9e3b09fc 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/GenericQueryEncoder.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.query.encoder;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.encoder;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
 import org.apache.commons.lang.StringEscapeUtils;
 
 import java.sql.SQLException;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java
similarity index 90%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java
index faa6977b78..a805755a94 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/MySQLQueryEncoder.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.query.encoder;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.encoder;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.connection.GrafanaDatasourceConnectionFactory;
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.connection.GrafanaDatasourceConnectionFactory;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java
similarity index 84%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java
index 81d7735a81..0b2fbe02ae 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoder.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.query.encoder;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.encoder;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.PreparedQuery;
 import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException;
 
 import java.sql.SQLException;
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java
similarity index 85%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java
index fe426f1f20..8710afed46 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/sql/query/encoder/QueryEncoderFactory.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.sql.query.encoder;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.query.encoder;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
 
 public class QueryEncoderFactory {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java
similarity index 97%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java
index 0abed858b7..7d7077b447 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/util/GrafanaConstants.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.analytics.mgt.grafana.proxy.core.util;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util;
 
 public class GrafanaConstants {
 
diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java
similarity index 85%
rename from components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java
rename to components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java
index c533e3461b..82a01ef7ef 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/core/util/GrafanaUtil.java
@@ -15,19 +15,15 @@
  * under the License.
  */
 
-package io.entgra.analytics.mgt.grafana.proxy.core.util;
+package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
-import io.entgra.analytics.mgt.grafana.proxy.core.config.GrafanaConfiguration;
-import io.entgra.analytics.mgt.grafana.proxy.core.config.GrafanaConfigurationManager;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaAPIService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.GrafanaQueryService;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.impl.GrafanaAPIServiceImpl;
-import io.entgra.analytics.mgt.grafana.proxy.core.service.impl.GrafanaQueryServiceImpl;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean.GrafanaPanelIdentifier;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.GrafanaConfiguration;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.GrafanaConfigurationManager;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
diff --git a/components/analytics-mgt/grafana-mgt/pom.xml b/components/analytics-mgt/grafana-mgt/pom.xml
index 6d2b18769e..b8826f9dcd 100644
--- a/components/analytics-mgt/grafana-mgt/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/pom.xml
@@ -34,9 +34,9 @@
 
 
     <modules>
-        <module>io.entgra.analytics.mgt.grafana.proxy.core</module>
-        <module>io.entgra.analytics.mgt.grafana.proxy.common</module>
-        <module>io.entgra.analytics.mgt.grafana.proxy.api</module>
+        <module>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</module>
+        <module>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</module>
+        <module>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api</module>
     </modules>
 
 </project>
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
index cde2a1f0e9..fbb1680812 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
@@ -104,7 +104,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.analytics.mgt.grafana.proxy.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
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.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/GrafanaHandler.java
index 6cd8872eae..91a0a3bf12 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.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/GrafanaHandler.java
@@ -18,9 +18,9 @@
 
 package io.entgra.ui.request.interceptor;
 
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+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;
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.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
index f6b157e4f7..740876f3c3 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.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketClient.java
@@ -18,8 +18,8 @@
 
 package io.entgra.ui.request.interceptor.websocket;
 
-import io.entgra.analytics.mgt.grafana.proxy.common.exception.GrafanaManagementException;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+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;
 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/GrafanaWebSocketHandler.java b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
index 04dff01844..cccb9a91a0 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.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/websocket/GrafanaWebSocketHandler.java
@@ -18,9 +18,9 @@
 
 package io.entgra.ui.request.interceptor.websocket;
 
-import io.entgra.analytics.mgt.grafana.proxy.core.exception.GrafanaEnvVariablesNotDefined;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaConstants;
-import io.entgra.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
+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;
+import io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.util.GrafanaUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml
index c71390e03f..1d808600dc 100644
--- a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml
+++ b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml
@@ -49,7 +49,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>io.entgra.device.mgt.core</groupId>
-                                    <artifactId>io.entgra.analytics.mgt.grafana.proxy.api</artifactId>
+                                    <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml
index e02b33dfe4..74e222e4f9 100644
--- a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml
+++ b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml
@@ -38,11 +38,11 @@
     <dependencies>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.analytics.mgt.grafana.proxy.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.analytics.mgt.grafana.proxy.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.googlecode.plist</groupId>
@@ -114,10 +114,10 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.analytics.mgt.grafana.proxy.common:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.analytics.mgt.grafana.proxy.core:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
                                     com.googlecode.plist:dd-plist:${googlecode.plist.version}
diff --git a/pom.xml b/pom.xml
index 30c9c58331..82bbb5fa38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 <!--        <module>components/certificate-mgt</module>-->
 <!--        <module>components/ui-request-interceptor</module>-->
 <!--        <module>components/transport-mgt</module>-->
-<!--        <module>components/analytics-mgt</module>-->
+        <module>components/analytics-mgt</module>
         <module>components/webapp-authenticator-framework</module>
 <!--        <module>components/logger</module>-->
         <module>components/task-mgt</module>
@@ -61,7 +61,7 @@
 <!--        <module>features/jwt-client</module>-->
 <!--        <module>features/device-mgt-extensions</module>-->
 <!--        <module>features/transport-mgt</module>-->
-<!--        <module>features/analytics-mgt</module>-->
+        <module>features/analytics-mgt</module>
         <module>features/webapp-authenticator-framework</module>
 <!--        <module>features/logger</module>-->
         <module>features/task-mgt</module>
@@ -322,17 +322,17 @@
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.analytics.mgt.grafana.proxy.api</artifactId>
+                <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.analytics.mgt.grafana.proxy.core</artifactId>
+                <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.analytics.mgt.grafana.proxy.common</artifactId>
+                <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>