refactored application mgt component

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

@@ -50,7 +50,7 @@ public class GrafanaAPIProxyServiceImpl implements GrafanaAPIProxyService {
         } catch (RefererNotValid e) {
             return GrafanaRequestHandlerUtil.constructInvalidReferer();
         } catch (SQLException | IOException | DBConnectionException |
-                io.entgra.application.mgt.common.exception.DBConnectionException e) {
+                 io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException e) {
             log.error(e);
             return GrafanaRequestHandlerUtil.constructInternalServerError(e, e.getMessage());
         }

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml

@@ -85,7 +85,7 @@
                             org.wso2.carbon,
                             org.wso2.carbon.device.mgt.common.*,
                             org.wso2.carbon.device.mgt.core.*
-                            io.entgra.application.mgt.core.*
+                            io.entgra.device.mgt.core.application.mgt.core.*
                         </Import-Package>
                         <Export-Package>
                             !io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal,
@@ -142,7 +142,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.application.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.application.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.wso2</groupId>

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

@@ -29,6 +29,6 @@ public interface GrafanaQueryService {
 
     void buildSafeQuery(JsonObject queryRequestBody, String dashboardUID, String panelId,
                                URI requestUri) throws IOException, SQLException, GrafanaManagementException,
-            DBConnectionException, io.entgra.application.mgt.common.exception.DBConnectionException;
+            DBConnectionException, io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException;
 
 }

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

@@ -51,7 +51,7 @@ public class GrafanaQueryServiceImpl implements GrafanaQueryService {
     }
 
     public void buildSafeQuery(JsonObject queryRequestBody, String dashboardUID, String panelId, URI requestUri)
-            throws IOException, SQLException, GrafanaManagementException, DBConnectionException, io.entgra.application.mgt.common.exception.DBConnectionException {
+            throws IOException, SQLException, GrafanaManagementException, DBConnectionException, io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException {
         JsonArray queries = queryRequestBody.getAsJsonArray(GrafanaConstants.QUERY_BODY_QUERIES_KEY);
         for (int i = 0; i < queries.size(); i++) {
             JsonObject queryObj = queries.get(i).getAsJsonObject();
@@ -118,7 +118,7 @@ public class GrafanaQueryServiceImpl implements GrafanaQueryService {
 
     private void encodeQuery(JsonObject queryObj, Datasource datasource, String queryTemplate, String rawSql)
             throws SQLException, GrafanaManagementException, DBConnectionException,
-            io.entgra.application.mgt.common.exception.DBConnectionException {
+            io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException {
         PreparedQuery pq = GrafanaPreparedQueryBuilder.build(queryTemplate, rawSql);
         String encodedQuery = QueryEncoderFactory.createEncoder(datasource.getType(), datasource.getName()).encode(pq);
         CacheManager.getInstance().getEncodedQueryCache().put(rawSql, encodedQuery);

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,8 +1,8 @@
 package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.sql.connection;
 
-import io.entgra.application.mgt.core.config.Configuration;
+import io.entgra.device.mgt.core.application.mgt.core.config.Configuration;
-import io.entgra.application.mgt.core.config.ConfigurationManager;
+import io.entgra.device.mgt.core.application.mgt.core.config.ConfigurationManager;
-import io.entgra.application.mgt.core.util.ConnectionManagerUtil;
+import io.entgra.device.mgt.core.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.mgt.common.exceptions.DBConnectionException;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
@@ -24,7 +24,7 @@ public class GrafanaDatasourceConnectionFactory {
     private static final Configuration applicationMgtConfig = ConfigurationManager.getInstance().getConfiguration();
 
     public static Connection getConnection(String databaseName) throws SQLException, DBConnectionException,
-            io.entgra.application.mgt.common.exception.DBConnectionException {
+            io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException {
         if(databaseName.equals(getReportManagementDatasourceName())) {
             ReportMgtConnectionManager.openDBConnection();
             return ReportMgtConnectionManager.getDBConnection();

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

@@ -41,7 +41,7 @@ public class MySQLQueryEncoder implements QueryEncoder {
 
     @Override
     public String encode(PreparedQuery preparedQuery) throws SQLException, DBConnectionException,
-            io.entgra.application.mgt.common.exception.DBConnectionException {
+            io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException {
         try {
             Connection con = GrafanaDatasourceConnectionFactory.getConnection(databaseName);
             PreparedStatement stmt = con.prepareStatement(preparedQuery.getPreparedSQL());

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

@@ -24,6 +24,6 @@ import java.sql.SQLException;
 
 public interface QueryEncoder {
 
-    String encode(PreparedQuery preparedQuery) throws SQLException, DBConnectionException, io.entgra.application.mgt.common.exception.DBConnectionException;
+    String encode(PreparedQuery preparedQuery) throws SQLException, DBConnectionException, io.entgra.device.mgt.core.application.mgt.common.exception.DBConnectionException;
 
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml

@@ -25,7 +25,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.application.mgt.addons</artifactId>
+    <artifactId>io.entgra.device.mgt.core.application.mgt.addons</artifactId>
     <name>Entgra - Application Management Add-Ons</name>
     <description>Entgra - Application Management Add-Ons</description>
     <url>https://entgra.io</url>
@@ -52,7 +52,7 @@
                             io.swagger.annotations.*;resolution:=optional
                         </Import-Package>
                         <Export-Package>
-                            io.entgra.application.mgt.addons.*
+                            io.entgra.device.mgt.core.application.mgt.addons.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -111,7 +111,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.application.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons;
+package io.entgra.device.mgt.core.application.mgt.addons;
 
 
 import javax.servlet.Filter;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons;
+package io.entgra.device.mgt.core.application.mgt.addons;
 
 
 import javax.ws.rs.WebApplicationException;
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
- * io.entgra.application.mgt.addons.FileStreamingOutput to allow the user to send the files as Stream.
+ * io.entgra.device.mgt.core.application.mgt.addons.FileStreamingOutput to allow the user to send the files as Stream.
  */
 public class FileStreamingOutput implements StreamingOutput {
     private InputStream inputStream;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java

@@ -14,11 +14,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons;
+package io.entgra.device.mgt.core.application.mgt.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
+import io.entgra.device.mgt.core.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/MultipartCustomProvider.java

@@ -14,14 +14,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons;
+package io.entgra.device.mgt.core.application.mgt.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
+import io.entgra.device.mgt.core.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.WebApplicationException;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ValidationInterceptor.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons;
+package io.entgra.device.mgt.core.application.mgt.addons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons.jaxrs;
+package io.entgra.device.mgt.core.application.mgt.addons.jaxrs;
 
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/jaxrs/Exclude.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.addons.jaxrs;
+package io.entgra.device.mgt.core.application.mgt.addons.jaxrs;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.application.mgt.api</artifactId>
+    <artifactId>io.entgra.device.mgt.core.application.mgt.api</artifactId>
     <packaging>war</packaging>
     <name>Entgra - Application Management API</name>
     <description>Entgra - Application Management API</description>
@@ -154,12 +154,12 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.application.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.application.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.application.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -218,7 +218,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.application.mgt.addons</artifactId>
+            <artifactId>io.entgra.device.mgt.core.application.mgt.addons</artifactId>
         </dependency>
     </dependencies>
 </project>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/ArtifactDownloadAPI.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.api.services;
+package io.entgra.device.mgt.core.application.mgt.api;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,8 +26,8 @@ import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
-import io.entgra.application.mgt.common.ApplicationList;
+import io.entgra.device.mgt.core.application.mgt.common.ApplicationList;
-import io.entgra.application.mgt.common.ErrorResponse;
+import io.entgra.device.mgt.core.application.mgt.common.ErrorResponse;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/java/io/entgra/device/mgt/core/application/mgt/api/impl/ArtifactDownloadAPIImpl.java

@@ -15,19 +15,19 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.api.services.impl;
+package io.entgra.device.mgt.core.application.mgt.api.impl;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import io.entgra.application.mgt.api.services.ArtifactDownloadAPI;
+import io.entgra.device.mgt.core.application.mgt.api.ArtifactDownloadAPI;
-import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException;
-import io.entgra.application.mgt.common.services.ApplicationManager;
+import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager;
-import io.entgra.application.mgt.common.services.AppmDataHandler;
+import io.entgra.device.mgt.core.application.mgt.common.services.AppmDataHandler;
-import io.entgra.application.mgt.core.exception.BadRequestException;
+import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException;
-import io.entgra.application.mgt.core.exception.NotFoundException;
+import io.entgra.device.mgt.core.application.mgt.core.exception.NotFoundException;
-import io.entgra.application.mgt.core.util.APIUtil;
+import io.entgra.device.mgt.core.application.mgt.core.util.APIUtil;
-import io.entgra.application.mgt.core.util.Constants;
+import io.entgra.device.mgt.core.application.mgt.core.util.Constants;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -36,7 +36,7 @@
     </jaxrs:server>
 
     <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
-        <property name="resourcePackage" value="io.entgra.application.mgt.api"/>
+        <property name="resourcePackage" value="io.entgra.device.mgt.core.application.mgt.api"/>
         <property name="version" value="1.0"/>
         <property name="host" value="localhost:9443"/>
         <property name="schemes" value="https" />
@@ -48,17 +48,17 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="io.entgra.application.mgt.addons.ValidationInterceptor" class="io.entgra.application.mgt.addons.ValidationInterceptor"/>
+    <bean id="io.entgra.device.mgt.core.application.mgt.addons.ValidationInterceptor" class="io.entgra.device.mgt.core.application.mgt.addons.ValidationInterceptor"/>
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
 
-    <bean id="applicationMgtArtifactService" class="io.entgra.application.mgt.api.services.impl.ArtifactDownloadAPIImpl"/>
+    <bean id="applicationMgtArtifactService" class="io.entgra.device.mgt.core.application.mgt.api.impl.ArtifactDownloadAPIImpl"/>
-    <bean id="jsonProvider" class="io.entgra.application.mgt.addons.JSONMessageHandler"/>
+    <bean id="jsonProvider" class="io.entgra.device.mgt.core.application.mgt.addons.JSONMessageHandler"/>
-    <bean id="multipartProvider" class="io.entgra.application.mgt.addons.MultipartCustomProvider"/>
+    <bean id="multipartProvider" class="io.entgra.device.mgt.core.application.mgt.addons.MultipartCustomProvider"/>
 
     <cxf:bus>
         <cxf:inInterceptors>
-            <ref bean="io.entgra.application.mgt.addons.ValidationInterceptor"/>
+            <ref bean="io.entgra.device.mgt.core.application.mgt.addons.ValidationInterceptor"/>
         </cxf:inInterceptors>
     </cxf:bus>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/src/main/webapp/WEB-INF/web.xml

@@ -74,7 +74,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>io.entgra.application.mgt.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.device.mgt.core.application.mgt.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.application.mgt.common</artifactId>
+    <artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra - Application Management Common</name>
     <description>Entgra - Application Management Common</description>
@@ -58,7 +58,7 @@
                             javax.xml.bind.annotation; version="${javax.xml.bind.imp.pkg.version}",
                         </Import-Package>
                         <Export-Package>
-                            io.entgra.application.mgt.common.*
+                            io.entgra.device.mgt.core.application.mgt.common.*
                         </Export-Package>
                     </instructions>
                 </configuration>

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppLifecycleState.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 
 /**

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/AppOperation.java

@@ -14,9 +14,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
-import io.entgra.application.mgt.common.dto.ApplicationDTO;
+import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO;
 
 public class AppOperation {
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationArtifact.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.io.InputStream;
 import java.util.Map;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstallResponse.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationInstaller.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public class ApplicationInstaller {
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationList.java

@@ -14,10 +14,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
-import io.entgra.application.mgt.common.dto.ApplicationDTO;
+import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationDTO;
-import io.entgra.application.mgt.common.response.Application;
+import io.entgra.device.mgt.core.application.mgt.common.response.Application;
 
 import java.util.List;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionInfo.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationSubscriptionType.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 /**
  * Possible Subscription Type of the application.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ApplicationType.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 
 /**

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasePaginatedResult.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfo.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/BasicUserInfoList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceGroupList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceSubscriptionData.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.Device;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/DeviceTypes.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public enum DeviceTypes {
     ANDROID, IOS, WINDOWS

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/EnterpriseInstallationDetails.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorListItem.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ErrorResponse.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ExecutionStatus.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public enum ExecutionStatus {
     PENDING, EXECUTED, FAILED

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/FileDataHolder.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.io.InputStream;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.util.List;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/IdentityServerResponse.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.util.HashMap;
 import java.util.List;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ImageArtifact.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 /**
  * This represents a image artifact of a application. Icon, Screen-shot or Banner.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/InstallationDetails.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleChanger.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public class LifecycleChanger {
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/LifecycleState.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.sql.Timestamp;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/OperationStatusBean.java

@@ -1,4 +1,4 @@
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public class OperationStatusBean {
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Pagination.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 /**
  * This class represents the pagination details that will be used when fetching application details from database.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationRequest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 /**
  * This class holds required parameters for a querying a paginated device response.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/PaginationResult.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Rating.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.util.TreeMap;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/ReviewNode.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.util.ArrayList;
 import java.util.List;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/RoleList.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplication.java

@@ -15,10 +15,10 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 
-import io.entgra.application.mgt.common.response.Application;
+import io.entgra.device.mgt.core.application.mgt.common.response.Application;
 
 import java.util.List;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SPApplicationListResponse.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import java.util.List;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SortingOrder.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 
 /**

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubAction.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public enum SubAction {
     INSTALL, UNINSTALL

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscribingDeviceIdHolder.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/SubscriptionType.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 public enum SubscriptionType {
     USER, ROLE, GROUP, DEVICE

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/User.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common;
+package io.entgra.device.mgt.core.application.mgt.common;
 
 /**
  * Represents an user.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/ErrorCallback.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.config;
+package io.entgra.device.mgt.core.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/LifecycleState.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.config;
+package io.entgra.device.mgt.core.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/MDMConfig.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.config;
+package io.entgra.device.mgt.core.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/config/RatingConfiguration.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.config;
+package io.entgra.device.mgt.core.application.mgt.common.config;
 
 import javax.xml.bind.annotation.XmlElement;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApiRegistrationProfile.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 public class ApiRegistrationProfile {
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 
 import io.swagger.annotations.ApiModel;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationPolicyDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ApplicationReleaseDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/CategoryDTO.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 public class CategoryDTO {
     int id;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/DeviceSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/GroupSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServerDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import com.google.gson.Gson;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/IdentityServiceProviderDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import java.util.List;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ReviewDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/RoleSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/ScheduledSubscriptionDTO.java

@@ -16,11 +16,13 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import com.google.gson.Gson;
-import io.entgra.application.mgt.common.ExecutionStatus;
+import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus;
-import io.entgra.application.mgt.common.SubscriptionType;
+import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType;
+import io.entgra.device.mgt.core.application.mgt.common.SubAction;
+import io.entgra.device.mgt.core.application.mgt.common.response.ApplicationRelease;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -40,7 +42,7 @@ public class ScheduledSubscriptionDTO {
      * Task name is a generated field and in the following pattern:
      * {@code <SUBSCRIPTION-TYPE>_<ACTION>_<HASH-VALUE>}
      * {@code SUBSCRIPTION-TYPE} - {@see {@linkplain SubscriptionType}}
-     * {@code ACTION} - {@see {@linkplain io.entgra.application.mgt.common.SubAction}
+     * {@code ACTION} - {@see {@linkplain SubAction }
      * {@code HASH-VALUE} - this is a hash value of the combination of application uuid and the subscriber list.
      *
      * Example: {@code DEVICE_INSTALL_e593e00e8ef55efc764295b6aa9ad56b}
@@ -49,7 +51,7 @@ public class ScheduledSubscriptionDTO {
 
     /**
      * UUID of the application release which is subscribed to.
-     * {@see {@link io.entgra.application.mgt.common.response.ApplicationRelease}}
+     * {@see {@link ApplicationRelease }}
      */
     private String applicationUUID;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/TagDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 public class TagDTO {
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/dto/UserSubscriptionDTO.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.dto;
+package io.entgra.device.mgt.core.application.mgt.common.dto;
 
 import java.sql.Timestamp;
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationCategoryManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception that will be thrown during Application Category Management.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during application management.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ApplicationStorageManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during storing and retrieving the artifacts.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DBConnectionException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception thrown due to Database Connection issues.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/DeviceConnectorException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during device connections.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IdentityServerManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception that will be thrown if any error occurs while calling identity server services .

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/IllegalTransactionStateException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception thrown due to an issue in database transactions.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/InvalidConfigurationException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception thrown due to invalid configurations provided for Application Management.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/LifecycleManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception caused during the lifecycle management.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/RequestValidatingException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Represents the exception thrown during validating the request.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ResourceManagementException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Represents the exception that will be thrown when there is an issue while managing the resources.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewDoesNotExistException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 public class ReviewDoesNotExistException extends Exception {
     private String message;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/ReviewManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 public class ReviewManagementException extends Exception {
     private String message;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/SubscriptionManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 public class SubscriptionManagementException extends Exception {
     private String message;

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/TransactionManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * Exception thrown due to an issue in TransactionManagement of Database.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/UnsupportedDatabaseEngineException.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * This runtime exception will be thrown if the server has configured with unsupported DB engine.

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/exception/VisibilityManagementException.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.exception;
+package io.entgra.device.mgt.core.application.mgt.common.exception;
 
 /**
  * This specialized exception is thrown by the Visibility Manager during unexpected behaviour

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/response/Application.java

@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.application.mgt.common.response;
+package io.entgra.device.mgt.core.application.mgt.common.response;
 
 import io.swagger.annotations.ApiModelProperty;