diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml b/components/application-mgt/io.entgra.application.store.api/pom.xml
similarity index 97%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
rename to components/application-mgt/io.entgra.application.store.api/pom.xml
index 480264b88a1..ac60b1e26d0 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
+++ b/components/application-mgt/io.entgra.application.store.api/pom.xml
@@ -27,10 +27,10 @@
4.0.0
- org.wso2.carbon.device.application.mgt.store.api
+ io.entgra.application.mgt.store.api
war
- WSO2 Carbon - Application Management Store API
- WSO2 Carbon - Application Management Store API
+ Entgra - Application Management Store API
+ Entgra - Application Management Store API
https://entgra.io
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ApplicationManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ApplicationManagementAPI.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java
index eaf5380ddfe..0136d7ca5c5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ApplicationManagementAPI.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ApplicationManagementAPI.java
@@ -14,7 +14,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services;
+package io.entgra.application.mgt.store.api.services;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java
similarity index 99%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java
index a6200454265..2e1613641f8 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPI.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPI.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services;
+package io.entgra.application.mgt.store.api.services;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.Api;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java
similarity index 99%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java
index 9c2bfcdf796..26742db9f3b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/SubscriptionManagementAPI.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services;
+package io.entgra.application.mgt.store.api.services;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java
index cfaf91a5ccd..3cbd7ece809 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/ReviewManagementStoreAdminAPI.java
@@ -14,7 +14,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.admin;
+package io.entgra.application.mgt.store.api.services.admin;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
index d46594d6cc8..e7bd335817b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/admin/SubscriptionManagementAdminAPI.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.admin;
+package io.entgra.application.mgt.store.api.services.admin;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java
similarity index 96%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java
index ac0b3b283b0..808c67b2870 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ApplicationManagementAPIImpl.java
@@ -14,7 +14,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.impl;
+package io.entgra.application.mgt.store.api.services.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -27,7 +27,7 @@ import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException
import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException;
import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
-import org.wso2.carbon.device.application.mgt.store.api.services.ApplicationManagementAPI;
+import io.entgra.application.mgt.store.api.services.ApplicationManagementAPI;
import javax.validation.Valid;
import javax.ws.rs.Consumes;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
index c617671de77..7f5a8b9195d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/ReviewManagementAPIImpl.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.impl;
+package io.entgra.application.mgt.store.api.services.impl;
import io.swagger.annotations.ApiParam;
import org.apache.commons.logging.Log;
@@ -28,7 +28,7 @@ import org.wso2.carbon.device.application.mgt.common.wrapper.ReviewWrapper;
import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException;
import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
-import org.wso2.carbon.device.application.mgt.store.api.services.ReviewManagementAPI;
+import io.entgra.application.mgt.store.api.services.ReviewManagementAPI;
import org.wso2.carbon.device.application.mgt.common.PaginationRequest;
import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementException;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java
index 4a51353997a..b045b8bda38 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.impl;
+package io.entgra.application.mgt.store.api.services.impl;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -33,13 +33,13 @@ import org.wso2.carbon.device.application.mgt.common.BasicUserInfo;
import org.wso2.carbon.device.application.mgt.common.BasicUserInfoList;
import org.wso2.carbon.device.application.mgt.common.RoleList;
import org.wso2.carbon.device.application.mgt.common.DeviceGroupList;
-import org.wso2.carbon.device.application.mgt.store.api.services.impl.util.RequestValidationUtil;
+import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil;
import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException;
import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
import org.wso2.carbon.device.application.mgt.core.task.ScheduledAppSubscriptionTaskManager;
import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
-import org.wso2.carbon.device.application.mgt.store.api.services.SubscriptionManagementAPI;
+import io.entgra.application.mgt.store.api.services.SubscriptionManagementAPI;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.MDMAppConstants;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java
similarity index 94%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java
index 5cca42852f9..9dc8aec9fcd 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/ReviewManagementStoreAdminAPIImpl.java
@@ -14,7 +14,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.impl.admin;
+package io.entgra.application.mgt.store.api.services.impl.admin;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -23,7 +23,7 @@ import org.wso2.carbon.device.application.mgt.common.exception.ReviewManagementE
import org.wso2.carbon.device.application.mgt.common.services.ReviewManager;
import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
-import org.wso2.carbon.device.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI;
+import io.entgra.application.mgt.store.api.services.admin.ReviewManagementStoreAdminAPI;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java
similarity index 94%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java
index 681b3b5f389..17cf3511f9f 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/admin/SubscriptionManagementAdminAPIImpl.java
@@ -16,7 +16,7 @@
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.impl.admin;
+package io.entgra.application.mgt.store.api.services.impl.admin;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -26,8 +26,8 @@ import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManage
import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
-import org.wso2.carbon.device.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI;
-import org.wso2.carbon.device.application.mgt.store.api.services.impl.util.RequestValidationUtil;
+import io.entgra.application.mgt.store.api.services.admin.SubscriptionManagementAdminAPI;
+import io.entgra.application.mgt.store.api.services.impl.util.RequestValidationUtil;
import org.wso2.carbon.device.mgt.common.PaginationRequest;
import org.wso2.carbon.device.mgt.common.PaginationResult;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/util/RequestValidationUtil.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java
similarity index 96%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/util/RequestValidationUtil.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java
index 2a59d220a4c..4061bcd965f 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/util/RequestValidationUtil.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/services/impl/util/RequestValidationUtil.java
@@ -16,12 +16,12 @@
* under the License.
*
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.impl.util;
+package io.entgra.application.mgt.store.api.services.impl.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
-import org.wso2.carbon.device.application.mgt.store.api.util.Constants;
+import io.entgra.application.mgt.store.api.util.Constants;
import java.util.List;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/util/Constants.java b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/util/Constants.java
rename to components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java
index a78c16077fe..3c06f365d25 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/util/Constants.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/java/io/entgra/application/mgt/store/api/util/Constants.java
@@ -33,7 +33,7 @@
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.util;
+package io.entgra.application.mgt.store.api.util;
/**
* Holds the constants used by DeviceImpl Management Admin web application.
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/permissions.xml
rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/permissions.xml
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/META-INF/webapp-classloading.xml
rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 79%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 3488f6e8bcf..b9f9d115764 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -39,7 +39,7 @@
-
+
@@ -55,11 +55,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/webapp/WEB-INF/web.xml
rename to components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java
similarity index 95%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
rename to components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java
index beae02de6d0..b14d9035b4d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/CommentMgtTestHelper.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services.util;
+package io.entgra.application.mgt.store.api.services;
import org.wso2.carbon.device.application.mgt.common.response.Review;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPITest.java b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java
similarity index 99%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPITest.java
rename to components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java
index 86b4730c73a..643f3c0ecec 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/ReviewManagementAPITest.java
+++ b/components/application-mgt/io.entgra.application.store.api/src/test/java/io/entgra/application/mgt/store/api/services/ReviewManagementAPITest.java
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.wso2.carbon.device.application.mgt.store.api.services;
+package io.entgra.application.mgt.store.api.services;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties b/components/application-mgt/io.entgra.application.store.api/src/test/resources/log4j.properties
similarity index 100%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties
rename to components/application-mgt/io.entgra.application.store.api/src/test/resources/log4j.properties
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml b/components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml
similarity index 89%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml
rename to components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml
index 3513acff4eb..68732a014cb 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml
+++ b/components/application-mgt/io.entgra.application.store.api/src/test/resources/testng.xml
@@ -23,7 +23,7 @@
-
+