From 5d5980c720efa2d2915cc01735366115c6693d23 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Thu, 11 May 2023 09:51:57 +0530
Subject: [PATCH] refactored cert mgt component

---
 .../pom.xml                                   |   2 +-
 .../org.wso2.carbon.apimgt.handlers/pom.xml   |   4 +-
 .../handlers/AuthenticationHandler.java       |   6 +--
 .../carbon/apimgt/handlers/utils/Utils.java   |   2 +-
 .../pom.xml                                   |   4 +-
 .../mgt}/api/CertificateMgtService.java       |   4 +-
 .../mgt/api}/beans/ErrorListItem.java         |   2 +-
 .../mgt/api}/beans/ErrorResponse.java         |   2 +-
 .../mgt}/api/common/ErrorHandler.java         |   2 +-
 .../mgt}/api/common/ErrorMessage.java         |   2 +-
 .../api/common/GsonMessageBodyHandler.java    |   2 +-
 .../mgt}/api/common/MDMAPIException.java      |   2 +-
 .../api}/exception/BadRequestException.java   |   2 +-
 .../mgt/api}/exception/Message.java           |   2 +-
 .../UnexpectedServerErrorException.java       |   4 +-
 .../api/impl/CertificateMgtServiceImpl.java   |  14 +++---
 .../mgt}/api/util/ResponsePayload.java        |   2 +-
 .../src/main/webapp/META-INF/permissions.xml  |   0
 .../webapp/META-INF/webapp-classloading.xml   |   0
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |   6 +--
 .../src/main/webapp/WEB-INF/web.xml           |   0
 .../pom.xml                                   |   4 +-
 .../CertificateManagementAdminService.java    |  10 ++--
 .../admin}/api/InputValidationException.java  |   4 +-
 .../api}/UnexpectedServerErrorException.java  |   4 +-
 .../admin}/api/beans/BasePaginatedResult.java |   2 +-
 .../admin}/api/beans/CertificateList.java     |   4 +-
 .../api/beans/EnrollmentCertificate.java      |   2 +-
 .../cert/admin}/api/beans/ErrorListItem.java  |   2 +-
 .../cert/admin}/api/beans/ErrorResponse.java  |   2 +-
 .../admin}/api/beans/ValidationResponse.java  |   2 +-
 .../cert/admin}/api/common/ErrorHandler.java  |   2 +-
 .../cert/admin}/api/common/ErrorMessage.java  |   2 +-
 .../api/common/GsonMessageBodyHandler.java    |   2 +-
 .../admin}/api/common/MDMAPIException.java    |   2 +-
 .../api/exception/BadRequestException.java    |   2 +-
 .../cert/admin}/api/exception/Message.java    |   2 +-
 .../SecurityDefinitionConfigurator.java       |   2 +-
 ...CertificateManagementAdminServiceImpl.java |  38 +++++++--------
 .../cert/admin}/api/util/ApiOriginFilter.java |   2 +-
 .../api/util/CertificateMgtAPIUtils.java      |   6 +--
 .../api/util/RequestValidationUtil.java       |   6 +--
 .../cert/admin}/api/util/ResponsePayload.java |   2 +-
 .../src/main/webapp/META-INF/permissions.xml  |   0
 .../webapp/META-INF/webapp-classloading.xml   |   0
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |   6 +--
 .../src/main/webapp/WEB-INF/web.xml           |   2 +-
 .../pom.xml                                   |  12 ++---
 .../mgt/core/bean/Certificate.java            |   2 +-
 .../core/cache/CertificateCacheManager.java   |   4 +-
 .../impl/CertificateCacheManagerImpl.java     |   6 +--
 .../CertificateConfigurationManager.java      |  10 ++--
 .../config/CertificateKeystoreConfig.java     |   4 +-
 .../config/CertificateManagementConfig.java   |   2 +-
 .../CertificateManagementRepository.java      |   4 +-
 .../config/datasource/DataSourceConfig.java   |   2 +-
 .../datasource/JNDILookupDefinition.java      |   2 +-
 .../mgt/core/dao/CertificateDAO.java          |   8 ++--
 .../CertificateManagementDAOException.java    |   2 +-
 .../dao/CertificateManagementDAOFactory.java  |  24 +++++-----
 .../dao/CertificateManagementDAOUtil.java     |   2 +-
 .../dao/impl/AbstractCertificateDAOImpl.java  |  18 +++----
 .../dao/impl/GenericCertificateDAOImpl.java   |  14 +++---
 .../dao/impl/OracleCertificateDAOImpl.java    |  14 +++---
 .../impl/PostgreSQLCertificateDAOImpl.java    |  14 +++---
 .../dao/impl/SQLServerCertificateDAOImpl.java |  14 +++---
 .../certificate/mgt/core/dto/CAStatus.java    |   2 +-
 .../mgt/core/dto/CertificateResponse.java     |   2 +-
 .../mgt/core/dto/SCEPResponse.java            |   2 +-
 .../CertificateManagementException.java       |   2 +-
 .../IllegalTransactionStateException.java     |   2 +-
 .../mgt/core/exception/KeystoreException.java |   2 +-
 .../TransactionManagementException.java       |   2 +-
 .../UnsupportedDatabaseEngineException.java   |   2 +-
 .../mgt/core/impl/CertificateGenerator.java   |  44 +++++++++---------
 .../mgt/core/impl/KeyStoreReader.java         |  24 +++++-----
 .../CertificateManagementDataHolder.java      |   2 +-
 ...CertificateManagementServiceComponent.java |  24 +++++-----
 .../mgt/core/scep/SCEPException.java          |   2 +-
 .../mgt/core/scep/SCEPManager.java            |   2 +-
 .../mgt/core/scep/SCEPManagerImpl.java        |   4 +-
 .../mgt/core/scep/TenantedDeviceWrapper.java  |   2 +-
 .../service/CertificateManagementService.java |  12 ++---
 .../CertificateManagementServiceImpl.java     |  30 ++++++------
 .../mgt/core/service/PaginationResult.java    |   2 +-
 .../util/CertificateManagementConstants.java  |   2 +-
 .../mgt/core/util/CertificateManagerUtil.java |  14 +++---
 .../util/CertificateMgtSchemaInitializer.java |   4 +-
 .../certificate/mgt/core/util/CommonUtil.java |   2 +-
 .../certificate/mgt/core/util/Serializer.java |   2 +-
 .../BaseDeviceManagementCertificateTest.java  |   4 +-
 .../mgt/core/common/DataSourceConfig.java     |   2 +-
 .../CertificateCacheManagerImplTests.java     |  10 ++--
 .../CertificateGeneratorNegativeTests.java    |  10 ++--
 .../impl/CertificateGeneratorTestSuite.java   |   6 +--
 .../core/impl/CertificateGeneratorTests.java  |   4 +-
 ...ateManagementServiceImplNegativeTests.java |  10 ++--
 ...CertificateManagementServiceImplTests.java |  32 ++++++-------
 .../mgt/core/impl/CertificateTests.java       |   6 +--
 .../mgt/core/impl/KeyGeneratorTests.java      |   2 +-
 .../mgt/core/util/CSRGenerator.java           |   2 +-
 .../mgt/core/util/CommonUtilTestSuite.java    |   2 +-
 .../mgt/core/util/DummyCertificate.java       |   2 +-
 .../certificate/mgt/core/util/TestUtils.java  |   2 +-
 .../src/test/resources/ca_cert.der            | Bin
 .../src/test/resources/ca_cert.pem            |   0
 .../src/test/resources/ca_private.key         |   0
 .../carbon-home/repository/conf/carbon.xml    |   0
 .../repository/conf/cdm-config.xml            |   0
 .../repository/conf/certificate-config.xml    |   0
 .../conf/datasources/master-datasources.xml   |   0
 .../repository/conf/log4j.properties          |   0
 .../repository/conf/security/wso2certs.jks    | Bin
 .../src/test/resources/certificate-config.xml |   0
 .../src/test/resources/data-source-config.xml |   0
 .../src/test/resources/ra_cert.pem            |   0
 .../src/test/resources/sql/h2.sql             |   0
 .../src/test/resources/testng.xml             |  37 +++++++++++++++
 .../src/test/resources/wso2certs.jks          | Bin
 .../src/test/resources/testng.xml             |  37 ---------------
 components/certificate-mgt/pom.xml            |   7 ++-
 .../pom.xml                                   |   2 +-
 .../org.wso2.carbon.device.mgt.api/pom.xml    |   2 +-
 components/test-coverage/pom.xml              |  12 ++---
 .../pom.xml                                   |   4 +-
 .../CertificateAuthenticator.java             |  10 ++--
 .../AuthenticatorFrameworkDataHolder.java     |   4 +-
 ...uthenticatorFrameworkServiceComponent.java |  10 ++--
 .../CertificateAuthenticatorTest.java         |  20 ++++----
 .../util/TestCertificateGenerator.java        |  14 +++---
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   4 +-
 pom.xml                                       |   6 +--
 134 files changed, 394 insertions(+), 395 deletions(-)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api => io.entgra.device.mgt.core.certificate.mgt.api}/pom.xml (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/CertificateMgtService.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api}/beans/ErrorListItem.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api}/beans/ErrorResponse.java (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/common/ErrorHandler.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/common/ErrorMessage.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/common/GsonMessageBodyHandler.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/common/MDMAPIException.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api}/exception/BadRequestException.java (93%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api}/exception/Message.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception}/UnexpectedServerErrorException.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/impl/CertificateMgtServiceImpl.java (80%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs => io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt}/api/util/ResponsePayload.java (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api => io.entgra.device.mgt.core.certificate.mgt.api}/src/main/webapp/META-INF/permissions.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api => io.entgra.device.mgt.core.certificate.mgt.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api => io.entgra.device.mgt.core.certificate.mgt.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api => io.entgra.device.mgt.core.certificate.mgt.api}/src/main/webapp/WEB-INF/web.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api}/pom.xml (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/CertificateManagementAdminService.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/InputValidationException.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api}/UnexpectedServerErrorException.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/beans/BasePaginatedResult.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/beans/CertificateList.java (92%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/beans/EnrollmentCertificate.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/beans/ErrorListItem.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/beans/ErrorResponse.java (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/beans/ValidationResponse.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/common/ErrorHandler.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/common/ErrorMessage.java (93%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/common/GsonMessageBodyHandler.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/common/MDMAPIException.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/exception/BadRequestException.java (93%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/exception/Message.java (93%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/swagger => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api}/extension/SecurityDefinitionConfigurator.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/impl/CertificateManagementAdminServiceImpl.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/util/ApiOriginFilter.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/util/CertificateMgtAPIUtils.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/util/RequestValidationUtil.java (87%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin}/api/util/ResponsePayload.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api}/src/main/webapp/META-INF/permissions.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api}/src/main/webapp/META-INF/webapp-classloading.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api}/src/main/webapp/WEB-INF/cxf-servlet.xml (86%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.cert.admin.api => io.entgra.device.mgt.core.certificate.mgt.cert.admin.api}/src/main/webapp/WEB-INF/web.xml (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/pom.xml (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/bean/Certificate.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/cache/CertificateCacheManager.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/config/CertificateConfigurationManager.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/config/CertificateKeystoreConfig.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/config/CertificateManagementConfig.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/config/CertificateManagementRepository.java (89%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/config/datasource/DataSourceConfig.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/config/datasource/JNDILookupDefinition.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/CertificateDAO.java (90%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/CertificateManagementDAOException.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/CertificateManagementDAOFactory.java (90%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/CertificateManagementDAOUtil.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java (93%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java (86%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java (86%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java (86%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java (86%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dto/CAStatus.java (89%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dto/CertificateResponse.java (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/dto/SCEPResponse.java (91%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/exception/CertificateManagementException.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/exception/IllegalTransactionStateException.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/exception/KeystoreException.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/exception/TransactionManagementException.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateGenerator.java (93%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/KeyStoreReader.java (91%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/internal/CertificateManagementDataHolder.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/internal/CertificateManagementServiceComponent.java (82%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/scep/SCEPException.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/scep/SCEPManager.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/scep/SCEPManagerImpl.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/scep/TenantedDeviceWrapper.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/service/CertificateManagementService.java (85%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/service/CertificateManagementServiceImpl.java (89%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/service/PaginationResult.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/CertificateManagementConstants.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/CertificateManagerUtil.java (87%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java (91%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/CommonUtil.java (92%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/Serializer.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/common/DataSourceConfig.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java (71%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java (97%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateGeneratorTests.java (90%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java (95%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java (92%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/CertificateTests.java (88%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/impl/KeyGeneratorTests.java (92%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/CSRGenerator.java (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/CommonUtilTestSuite.java (94%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/DummyCertificate.java (98%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon => io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core}/certificate/mgt/core/util/TestUtils.java (96%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/ca_cert.der (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/ca_cert.pem (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/ca_private.key (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/carbon-home/repository/conf/carbon.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/carbon-home/repository/conf/cdm-config.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/carbon-home/repository/conf/certificate-config.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/carbon-home/repository/conf/log4j.properties (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/certificate-config.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/data-source-config.xml (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/ra_cert.pem (100%)
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/sql/h2.sql (100%)
 create mode 100644 components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/testng.xml
 rename components/certificate-mgt/{org.wso2.carbon.certificate.mgt.core => io.entgra.device.mgt.core.certificate.mgt.core}/src/test/resources/wso2certs.jks (100%)
 delete mode 100644 components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml

diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.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
index 71e5b7a473..74f214dd1c 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.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
@@ -159,7 +159,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
index c674620fe8..d0d65a9b62 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.json.wso2</groupId>
@@ -96,7 +96,7 @@
                             org.apache.synapse,
                             org.apache.synapse.core.axis2,
                             org.apache.synapse.rest,
-                            org.wso2.carbon.certificate.mgt.core.*
+                            io.entgra.device.mgt.core.certificate.mgt.core.*
                         </Import-Package>
                     </instructions>
                 </configuration>
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java
index 464dfc248d..885d7f5cc5 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java
@@ -30,9 +30,9 @@ import org.wso2.carbon.apimgt.handlers.invoker.RESTInvoker;
 import org.wso2.carbon.apimgt.handlers.invoker.RESTResponse;
 import org.wso2.carbon.apimgt.handlers.utils.AuthConstants;
 import org.wso2.carbon.apimgt.handlers.utils.Utils;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.security.cert.CertificateEncodingException;
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/utils/Utils.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/utils/Utils.java
index 30f07f9e68..2e5d2e164a 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/utils/Utils.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/utils/Utils.java
@@ -30,7 +30,7 @@ import org.wso2.carbon.apimgt.handlers.beans.DCR;
 import org.wso2.carbon.apimgt.handlers.config.IOTServerConfiguration;
 import org.wso2.carbon.apimgt.handlers.invoker.RESTInvoker;
 import org.wso2.carbon.apimgt.handlers.invoker.RESTResponse;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.utils.CarbonUtils;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml
index ab3d6ab85d..dfbc47c3e2 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.api</artifactId>
+    <artifactId>io.entgra.device.mgt.core.certificate.mgt.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - Certificate Management API</name>
     <description>WSO2 Carbon - Certificate Management API</description>
@@ -166,7 +166,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java
index b6ec9993fe..5c4c86ca55 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/CertificateMgtService.java
@@ -1,10 +1,10 @@
-package org.wso2.carbon.certificate.mgt.jaxrs.api;
+package io.entgra.device.mgt.core.certificate.mgt.api;
 
 import io.swagger.annotations.*;
 
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.certificate.mgt.jaxrs.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.api.beans.ErrorResponse;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.HeaderParam;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/beans/ErrorListItem.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/beans/ErrorListItem.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/beans/ErrorListItem.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/beans/ErrorListItem.java
index b9b6e6c67c..1d5486248d 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/beans/ErrorListItem.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/beans/ErrorListItem.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.jaxrs.beans;
+package io.entgra.device.mgt.core.certificate.mgt.api.beans;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/beans/ErrorResponse.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/beans/ErrorResponse.java
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/beans/ErrorResponse.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/beans/ErrorResponse.java
index 81b49c5da5..ba686e2ed2 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/beans/ErrorResponse.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/beans/ErrorResponse.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.jaxrs.beans;
+package io.entgra.device.mgt.core.certificate.mgt.api.beans;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorHandler.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/ErrorHandler.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorHandler.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/ErrorHandler.java
index 8c3296292d..bae961f463 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorHandler.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/ErrorHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.api.common;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorMessage.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/ErrorMessage.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorMessage.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/ErrorMessage.java
index 66777c0f65..36b35fcf38 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorMessage.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/ErrorMessage.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.api.common;
 
 
 public class ErrorMessage {
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/GsonMessageBodyHandler.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/GsonMessageBodyHandler.java
index 91b3283e68..ed0a4b3d66 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/GsonMessageBodyHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.api.common;
 
 
 import com.google.gson.Gson;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/MDMAPIException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/MDMAPIException.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/MDMAPIException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/MDMAPIException.java
index c06dc48f3e..d4dbf1e299 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/MDMAPIException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/common/MDMAPIException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.api.common;
 
 /**
  * Custom exception class for handling CDM API related exceptions.
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/BadRequestException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/BadRequestException.java
similarity index 93%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/BadRequestException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/BadRequestException.java
index 1637031d48..91f00a295c 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/BadRequestException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/BadRequestException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.exception;
+package io.entgra.device.mgt.core.certificate.mgt.api.exception;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/Message.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/Message.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/Message.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/Message.java
index 42a23d599a..49f82fa26c 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/Message.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/Message.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.exception;
+package io.entgra.device.mgt.core.certificate.mgt.api.exception;
 
 public class Message {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/UnexpectedServerErrorException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/UnexpectedServerErrorException.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/UnexpectedServerErrorException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/UnexpectedServerErrorException.java
index 28eaed09bc..5507e90818 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/UnexpectedServerErrorException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/exception/UnexpectedServerErrorException.java
@@ -16,9 +16,9 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api;
+package io.entgra.device.mgt.core.certificate.mgt.api.exception;
 
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.api.beans.ErrorResponse;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/impl/CertificateMgtServiceImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/impl/CertificateMgtServiceImpl.java
similarity index 80%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/impl/CertificateMgtServiceImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/impl/CertificateMgtServiceImpl.java
index 71c03b6e1c..de82425d71 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/impl/CertificateMgtServiceImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/impl/CertificateMgtServiceImpl.java
@@ -1,14 +1,14 @@
-package org.wso2.carbon.certificate.mgt.jaxrs.api.impl;
+package io.entgra.device.mgt.core.certificate.mgt.api.impl;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.jaxrs.beans.ErrorResponse;
-import org.wso2.carbon.certificate.mgt.jaxrs.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.certificate.mgt.jaxrs.api.CertificateMgtService;
-import org.wso2.carbon.certificate.mgt.jaxrs.exception.Message;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
+import io.entgra.device.mgt.core.certificate.mgt.api.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.api.exception.UnexpectedServerErrorException;
+import io.entgra.device.mgt.core.certificate.mgt.api.CertificateMgtService;
+import io.entgra.device.mgt.core.certificate.mgt.api.exception.Message;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/util/ResponsePayload.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/util/ResponsePayload.java
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/util/ResponsePayload.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/util/ResponsePayload.java
index 2e0f21cc4d..7a9df89846 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/util/ResponsePayload.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/api/util/ResponsePayload.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.jaxrs.api.util;
+package io.entgra.device.mgt.core.certificate.mgt.api.util;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/META-INF/permissions.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index a41ea82b98..cbdb48363e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -59,8 +59,8 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="certificateServiceBean" class="org.wso2.carbon.certificate.mgt.jaxrs.api.impl.CertificateMgtServiceImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.certificate.mgt.jaxrs.api.common.GsonMessageBodyHandler"/>
-    <bean id="errorHandler" class="org.wso2.carbon.certificate.mgt.jaxrs.api.common.ErrorHandler"/>
+    <bean id="certificateServiceBean" class="io.entgra.device.mgt.core.certificate.mgt.api.impl.CertificateMgtServiceImpl"/>
+    <bean id="jsonProvider" class="io.entgra.device.mgt.core.certificate.mgt.api.common.GsonMessageBodyHandler"/>
+    <bean id="errorHandler" class="io.entgra.device.mgt.core.certificate.mgt.api.common.ErrorHandler"/>
 
 </beans>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/web.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/src/main/webapp/WEB-INF/web.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml
index 52fd70e80f..414e2538f6 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.cert.admin.api</artifactId>
+    <artifactId>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - Admin Certificate Management API</name>
     <description>WSO2 Carbon - Admin Certificate Management API</description>
@@ -170,7 +170,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java
index 80dd79617d..a8b7484004 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/CertificateManagementAdminService.java
@@ -1,4 +1,4 @@
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api;
 
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Info;
@@ -13,10 +13,10 @@ import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.CertificateList;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.EnrollmentCertificate;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.CertificateList;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.EnrollmentCertificate;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/InputValidationException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/InputValidationException.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/InputValidationException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/InputValidationException.java
index 0804806967..1ff7a7f170 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/InputValidationException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/InputValidationException.java
@@ -16,9 +16,9 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api;
 
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.ErrorResponse;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/UnexpectedServerErrorException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/UnexpectedServerErrorException.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/UnexpectedServerErrorException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/UnexpectedServerErrorException.java
index 9b6e2d4ef2..ba7604f611 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/exception/UnexpectedServerErrorException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/UnexpectedServerErrorException.java
@@ -16,9 +16,9 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.jaxrs.exception;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api;
 
-import org.wso2.carbon.certificate.mgt.jaxrs.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.ErrorResponse;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/BasePaginatedResult.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/BasePaginatedResult.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/BasePaginatedResult.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/BasePaginatedResult.java
index b1fe40a9ec..1459a6a942 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/BasePaginatedResult.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/BasePaginatedResult.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/CertificateList.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/CertificateList.java
similarity index 92%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/CertificateList.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/CertificateList.java
index 2c61a4b23a..e05d11315e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/CertificateList.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/CertificateList.java
@@ -16,11 +16,11 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/EnrollmentCertificate.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/EnrollmentCertificate.java
index e119746c91..c6b71a0094 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/EnrollmentCertificate.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/EnrollmentCertificate.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans;
 
 public class EnrollmentCertificate {
     String serial;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ErrorListItem.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ErrorListItem.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ErrorListItem.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ErrorListItem.java
index dc3a94efb1..dba6cd8f92 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ErrorListItem.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ErrorListItem.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ErrorResponse.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ErrorResponse.java
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ErrorResponse.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ErrorResponse.java
index f8101d796f..1c95e631b2 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ErrorResponse.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ErrorResponse.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ValidationResponse.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ValidationResponse.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ValidationResponse.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ValidationResponse.java
index 8774fc438d..6a305a93af 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/beans/ValidationResponse.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/beans/ValidationResponse.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans;
 
 public class ValidationResponse {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/ErrorHandler.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/ErrorHandler.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/ErrorHandler.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/ErrorHandler.java
index 25d9e4ad79..1bd575ccfc 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/ErrorHandler.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/ErrorHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/ErrorMessage.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/ErrorMessage.java
similarity index 93%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/ErrorMessage.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/ErrorMessage.java
index 3bbb36969d..b8d4967968 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/ErrorMessage.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/ErrorMessage.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common;
 
 
 public class ErrorMessage {
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/GsonMessageBodyHandler.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/GsonMessageBodyHandler.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java
index 7ca13eb59f..fa4ecd0044 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/GsonMessageBodyHandler.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common;
 
 
 import com.google.gson.Gson;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/MDMAPIException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/MDMAPIException.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/MDMAPIException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/MDMAPIException.java
index 6a27e76fcb..4e7c3d7822 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/MDMAPIException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/MDMAPIException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.common;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common;
 
 /**
  * Custom exception class for handling CDM API related exceptions.
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/exception/BadRequestException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/exception/BadRequestException.java
similarity index 93%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/exception/BadRequestException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/exception/BadRequestException.java
index 6c358cba36..dfb8e4cce3 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/exception/BadRequestException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/exception/BadRequestException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.exception;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.exception;
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/exception/Message.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/exception/Message.java
similarity index 93%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/exception/Message.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/exception/Message.java
index 081a99377b..f32d2dcb93 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/exception/Message.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/exception/Message.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.exception;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.exception;
 
 public class Message {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/swagger/extension/SecurityDefinitionConfigurator.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/extension/SecurityDefinitionConfigurator.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/swagger/extension/SecurityDefinitionConfigurator.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/extension/SecurityDefinitionConfigurator.java
index b880c3d3a8..f1463dcf7d 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/swagger/extension/SecurityDefinitionConfigurator.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/extension/SecurityDefinitionConfigurator.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.swagger.extension;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.extension;
 
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.jaxrs.Reader;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java
index be0539c946..981af01589 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/impl/CertificateManagementAdminServiceImpl.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.impl;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.impl;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -29,21 +29,21 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.CertificateManagementAdminService;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.CertificateList;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.EnrollmentCertificate;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ValidationResponse;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util.CertificateMgtAPIUtils;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util.RequestValidationUtil;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPException;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.scep.TenantedDeviceWrapper;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.CertificateManagementAdminService;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.CertificateList;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.EnrollmentCertificate;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.ValidationResponse;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util.CertificateMgtAPIUtils;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util.RequestValidationUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPException;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.TenantedDeviceWrapper;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
@@ -75,12 +75,12 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
     @POST
     public Response addCertificate(EnrollmentCertificate[] enrollmentCertificates) {
         CertificateManagementService certificateService;
-        List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
-        org.wso2.carbon.certificate.mgt.core.bean.Certificate certificate;
+        List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
+        io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate certificate;
         certificateService = CertificateMgtAPIUtils.getCertificateManagementService();
         try {
             for (EnrollmentCertificate enrollmentCertificate : enrollmentCertificates) {
-                certificate = new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
+                certificate = new io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate();
                 certificate.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
                 certificate.setSerial(enrollmentCertificate.getSerial());
                 certificate.setCertificate(certificateService.pemToX509Certificate(enrollmentCertificate.getPem()));
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/ApiOriginFilter.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/ApiOriginFilter.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/ApiOriginFilter.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/ApiOriginFilter.java
index 3a192bdf36..5730df152e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/ApiOriginFilter.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/ApiOriginFilter.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletResponse;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/CertificateMgtAPIUtils.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/CertificateMgtAPIUtils.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java
index fc5264c4db..f11e98710e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/CertificateMgtAPIUtils.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/CertificateMgtAPIUtils.java
@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/RequestValidationUtil.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/RequestValidationUtil.java
similarity index 87%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/RequestValidationUtil.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/RequestValidationUtil.java
index 233112c342..ac41a7720f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/RequestValidationUtil.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/RequestValidationUtil.java
@@ -16,10 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util;
 
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.InputValidationException;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.beans.ErrorResponse;
+import io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.InputValidationException;
 
 public class RequestValidationUtil {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/ResponsePayload.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/ResponsePayload.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/ResponsePayload.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/ResponsePayload.java
index c0f44afd41..f27de95fbd 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/util/ResponsePayload.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/util/ResponsePayload.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util;
+package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/permissions.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/webapp-classloading.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/webapp-classloading.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 86%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 11511e467d..6df48b6bac 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -53,8 +53,8 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="certificateServiceBean" class="org.wso2.carbon.certificate.mgt.cert.jaxrs.api.impl.CertificateManagementAdminServiceImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.certificate.mgt.cert.jaxrs.api.common.GsonMessageBodyHandler"/>
-    <bean id="errorHandler" class="org.wso2.carbon.certificate.mgt.cert.jaxrs.api.common.ErrorHandler"/>
+    <bean id="certificateServiceBean" class="io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.impl.CertificateManagementAdminServiceImpl"/>
+    <bean id="jsonProvider" class="io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common.GsonMessageBodyHandler"/>
+    <bean id="errorHandler" class="io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common.ErrorHandler"/>
 
 </beans>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/web.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/web.xml
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/web.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/web.xml
index b1ae20d952..54c26f0161 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/web.xml
@@ -75,7 +75,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.util.ApiOriginFilter</filter-class>
     </filter>
 
     <filter>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml
index 379e75b884..f6e35d7d2f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml
@@ -43,7 +43,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+    <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>
@@ -67,8 +67,8 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Device Management Core Bundle</Bundle-Description>
                         <Private-Package>
-                            org.wso2.carbon.certificate.mgt.core.internal,
-                            org.wso2.carbon.certificate.mgt.core.util
+                            io.entgra.device.mgt.core.certificate.mgt.core.internal,
+                            io.entgra.device.mgt.core.certificate.mgt.core.util
                         </Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
@@ -116,9 +116,9 @@
                             <!--org.bouncycastle.pkcs.jcajce-->
                         </Import-Package>
                         <Export-Package>
-                            !org.wso2.carbon.certificate.mgt.core.internal.*,
-                            !org.wso2.carbon.certificate.mgt.core.util,
-                            org.wso2.carbon.certificate.mgt.core.*
+                            !io.entgra.device.mgt.core.certificate.mgt.core.internal.*,
+                            !io.entgra.device.mgt.core.certificate.mgt.core.util,
+                            io.entgra.device.mgt.core.certificate.mgt.core.*
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/bean/Certificate.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/bean/Certificate.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/bean/Certificate.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/bean/Certificate.java
index 5ced778afa..cbe397dda3 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/bean/Certificate.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/bean/Certificate.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.bean;
+package io.entgra.device.mgt.core.certificate.mgt.core.bean;
 
 import java.security.cert.X509Certificate;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/cache/CertificateCacheManager.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/cache/CertificateCacheManager.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/cache/CertificateCacheManager.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/cache/CertificateCacheManager.java
index c5fe9715cc..5e8cfd1f7c 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/cache/CertificateCacheManager.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/cache/CertificateCacheManager.java
@@ -17,9 +17,9 @@
  */
 
 
-package org.wso2.carbon.certificate.mgt.core.cache;
+package io.entgra.device.mgt.core.certificate.mgt.core.cache;
 
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
 
 /**
  * This interface for caching the certificates.
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java
index 017b5820c4..bbc2e2df96 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/cache/impl/CertificateCacheManagerImpl.java
@@ -17,10 +17,10 @@
  */
 
 
-package org.wso2.carbon.certificate.mgt.core.cache.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.cache.impl;
 
-import org.wso2.carbon.certificate.mgt.core.cache.CertificateCacheManager;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.cache.CertificateCacheManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateConfigurationManager.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateConfigurationManager.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateConfigurationManager.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateConfigurationManager.java
index cae78fe48a..425aff8cfb 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateConfigurationManager.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateConfigurationManager.java
@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.config;
+package io.entgra.device.mgt.core.certificate.mgt.core.config;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagerUtil;
 import org.w3c.dom.Document;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagerUtil;
 import org.wso2.carbon.utils.CarbonUtils;
 
 import javax.xml.bind.JAXBContext;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateKeystoreConfig.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateKeystoreConfig.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateKeystoreConfig.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateKeystoreConfig.java
index 249b0ce478..1086ea394e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateKeystoreConfig.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateKeystoreConfig.java
@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.config;
+package io.entgra.device.mgt.core.certificate.mgt.core.config;
 
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateManagementConfig.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateManagementConfig.java
index cc85c2bbf6..78747c1899 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateManagementConfig.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.config;
+package io.entgra.device.mgt.core.certificate.mgt.core.config;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateManagementRepository.java
similarity index 89%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateManagementRepository.java
index b8a07779e0..942259d0bc 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/CertificateManagementRepository.java
@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.config;
+package io.entgra.device.mgt.core.certificate.mgt.core.config;
 
-import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.DataSourceConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/datasource/DataSourceConfig.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/datasource/DataSourceConfig.java
index 2c2871599f..5941301c63 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/datasource/DataSourceConfig.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.config.datasource;
+package io.entgra.device.mgt.core.certificate.mgt.core.config.datasource;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/JNDILookupDefinition.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/datasource/JNDILookupDefinition.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/JNDILookupDefinition.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/datasource/JNDILookupDefinition.java
index 0e9fffde87..70b76a7f98 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/JNDILookupDefinition.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/config/datasource/JNDILookupDefinition.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.config.datasource;
+package io.entgra.device.mgt.core.certificate.mgt.core.config.datasource;
 
 import javax.xml.bind.annotation.*;
 import java.util.List;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateDAO.java
similarity index 90%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateDAO.java
index cb97cf8892..1c9aba681a 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateDAO.java
@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao;
 
-import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 
 import java.util.List;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOException.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOException.java
index e37eef0fef..1dedda701a 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao;
 
 /**
  * Custom exception class for data access related exceptions.
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOFactory.java
similarity index 90%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOFactory.java
index 10e70a5baa..828ff45850 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOFactory.java
@@ -16,20 +16,20 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao;
-
+package io.entgra.device.mgt.core.certificate.mgt.core.dao;
+
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.impl.GenericCertificateDAOImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.impl.OracleCertificateDAOImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.impl.PostgreSQLCertificateDAOImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.impl.SQLServerCertificateDAOImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.IllegalTransactionStateException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.TransactionManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.UnsupportedDatabaseEngineException;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.JNDILookupDefinition;
-import org.wso2.carbon.certificate.mgt.core.dao.impl.GenericCertificateDAOImpl;
-import org.wso2.carbon.certificate.mgt.core.dao.impl.OracleCertificateDAOImpl;
-import org.wso2.carbon.certificate.mgt.core.dao.impl.PostgreSQLCertificateDAOImpl;
-import org.wso2.carbon.certificate.mgt.core.dao.impl.SQLServerCertificateDAOImpl;
-import org.wso2.carbon.certificate.mgt.core.exception.IllegalTransactionStateException;
-import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
-import org.wso2.carbon.certificate.mgt.core.exception.UnsupportedDatabaseEngineException;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.JNDILookupDefinition;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOUtil.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOUtil.java
index 4405ff8c6b..e120926d84 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/CertificateManagementDAOUtil.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java
similarity index 93%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java
index 4af136c987..2aeb3571f5 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java
@@ -16,18 +16,18 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.util.Serializer;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateDAO;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.Serializer;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.io.IOException;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java
similarity index 86%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java
index 0ec076da44..9e5a828df0 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java
@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.sql.Connection;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java
similarity index 86%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java
index a206162518..a919c98fa8 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java
@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.sql.Connection;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java
similarity index 86%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java
index bc894b7462..b2207301e2 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java
@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.sql.Connection;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java
similarity index 86%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java
index 3504fd4a9a..7ec250e3c3 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java
@@ -16,16 +16,16 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.dao.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.sql.Connection;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CAStatus.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/CAStatus.java
similarity index 89%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CAStatus.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/CAStatus.java
index e3439c17d1..9bcfbec65e 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CAStatus.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/CAStatus.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.dto;
+package io.entgra.device.mgt.core.certificate.mgt.core.dto;
 
 public enum CAStatus {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CertificateResponse.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/CertificateResponse.java
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CertificateResponse.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/CertificateResponse.java
index 5fc9c82e22..a49da0094f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CertificateResponse.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/CertificateResponse.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.dto;
+package io.entgra.device.mgt.core.certificate.mgt.core.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/SCEPResponse.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/SCEPResponse.java
similarity index 91%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/SCEPResponse.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/SCEPResponse.java
index e3aa25c805..a17ffd4b79 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/SCEPResponse.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dto/SCEPResponse.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.dto;
+package io.entgra.device.mgt.core.certificate.mgt.core.dto;
 
 public class SCEPResponse {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/CertificateManagementException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/CertificateManagementException.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/CertificateManagementException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/CertificateManagementException.java
index cb745be36b..f4cca61a97 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/CertificateManagementException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/CertificateManagementException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.exception;
+package io.entgra.device.mgt.core.certificate.mgt.core.exception;
 
 public class CertificateManagementException extends Exception {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/IllegalTransactionStateException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/IllegalTransactionStateException.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/IllegalTransactionStateException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/IllegalTransactionStateException.java
index b175c8ce11..3ce50fdcd3 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/IllegalTransactionStateException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/IllegalTransactionStateException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.exception;
+package io.entgra.device.mgt.core.certificate.mgt.core.exception;
 
 public class IllegalTransactionStateException extends RuntimeException {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/KeystoreException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/KeystoreException.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/KeystoreException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/KeystoreException.java
index ddc61c9699..99daa02585 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/KeystoreException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/KeystoreException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.exception;
+package io.entgra.device.mgt.core.certificate.mgt.core.exception;
 
 public class KeystoreException extends Exception {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/TransactionManagementException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/TransactionManagementException.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/TransactionManagementException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/TransactionManagementException.java
index eb131b98c6..96d7af072d 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/TransactionManagementException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/TransactionManagementException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.exception;
+package io.entgra.device.mgt.core.certificate.mgt.core.exception;
 
 public class TransactionManagementException extends Exception {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java
index 12bba7afc9..a02addd100 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.exception;
+package io.entgra.device.mgt.core.certificate.mgt.core.exception;
 
 /**
  * This runtime exception will be thrown if the server has configured with unsupported DB engine.
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java
similarity index 93%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java
index d686ff5115..d35f89569b 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java
@@ -15,8 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CommonUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -55,17 +57,15 @@ import org.jscep.message.PkiMessageEncoder;
 import org.jscep.transaction.FailInfo;
 import org.jscep.transaction.Nonce;
 import org.jscep.transaction.TransactionId;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dto.CAStatus;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
-import org.wso2.carbon.certificate.mgt.core.util.CommonUtil;
-import org.wso2.carbon.certificate.mgt.core.util.Serializer;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateDAO;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CAStatus;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.SCEPResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.TransactionManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.Serializer;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.naming.InvalidNameException;
@@ -220,9 +220,9 @@ public class CertificateGenerator {
 
             certificate.verify(certificate.getPublicKey());
 
-            List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
-            org.wso2.carbon.certificate.mgt.core.bean.Certificate certificateToStore =
-                    new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
+            List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
+            io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate certificateToStore =
+                    new io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate();
             certificateToStore.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
             certificateToStore.setCertificate(certificate);
             certificates.add(certificateToStore);
@@ -537,9 +537,9 @@ public class CertificateGenerator {
             issuedCert = new JcaX509CertificateConverter().setProvider(
                     CertificateManagementConstants.PROVIDER).getCertificate(
                     certificateBuilder.build(sigGen));
-            org.wso2.carbon.certificate.mgt.core.bean.Certificate certificate =
-                    new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
-            List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
+            io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate certificate =
+                    new io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate();
+            List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
             certificate.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
             certificate.setCertificate(issuedCert);
             certificates.add(certificate);
@@ -694,7 +694,7 @@ public class CertificateGenerator {
         }
     }
 
-    public void saveCertInKeyStore(List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificate)
+    public void saveCertInKeyStore(List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificate)
             throws KeystoreException {
 
         if (certificate == null) {
@@ -826,9 +826,9 @@ public class CertificateGenerator {
             issuedCert = (X509Certificate) certificateFactory
                     .generateCertificate(new ByteArrayInputStream(encodedCertificate));
 
-            org.wso2.carbon.certificate.mgt.core.bean.Certificate certificate =
-                    new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
-            List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
+            io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate certificate =
+                    new io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate();
+            List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
             certificate.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
             certificate.setCertificate(issuedCert);
             certificates.add(certificate);
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/KeyStoreReader.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/KeyStoreReader.java
similarity index 91%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/KeyStoreReader.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/KeyStoreReader.java
index 60a7800863..986f91d78a 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/KeyStoreReader.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/KeyStoreReader.java
@@ -15,21 +15,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.cache.CertificateCacheManager;
-import org.wso2.carbon.certificate.mgt.core.cache.impl.CertificateCacheManagerImpl;
-import org.wso2.carbon.certificate.mgt.core.config.CertificateConfigurationManager;
-import org.wso2.carbon.certificate.mgt.core.config.CertificateKeystoreConfig;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.util.Serializer;
+import io.entgra.device.mgt.core.certificate.mgt.core.cache.CertificateCacheManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.cache.impl.CertificateCacheManagerImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.CertificateConfigurationManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.CertificateKeystoreConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateDAO;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.Serializer;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementDataHolder.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/internal/CertificateManagementDataHolder.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementDataHolder.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/internal/CertificateManagementDataHolder.java
index 17632c249c..5c695150e5 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementDataHolder.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/internal/CertificateManagementDataHolder.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.certificate.mgt.core.internal;
+package io.entgra.device.mgt.core.certificate.mgt.core.internal;
 
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementServiceComponent.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/internal/CertificateManagementServiceComponent.java
similarity index 82%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementServiceComponent.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/internal/CertificateManagementServiceComponent.java
index 0766abe86d..b11f3da39f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementServiceComponent.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/internal/CertificateManagementServiceComponent.java
@@ -16,23 +16,23 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.internal;
+package io.entgra.device.mgt.core.certificate.mgt.core.internal;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManagerImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateMgtSchemaInitializer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.certificate.mgt.core.config.CertificateConfigurationManager;
-import org.wso2.carbon.certificate.mgt.core.config.CertificateManagementConfig;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManagerImpl;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateMgtSchemaInitializer;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.CertificateConfigurationManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.CertificateManagementConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementServiceImpl;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
 /**
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPException.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPException.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPException.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPException.java
index 936d99a5bf..90a11306a7 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPException.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPException.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.scep;
+package io.entgra.device.mgt.core.certificate.mgt.core.scep;
 
 public class SCEPException extends Exception {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManager.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPManager.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManager.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPManager.java
index 9c7b866ef4..01d7feb301 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManager.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPManager.java
@@ -33,7 +33,7 @@
  *  under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.scep;
+package io.entgra.device.mgt.core.certificate.mgt.core.scep;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManagerImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPManagerImpl.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManagerImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPManagerImpl.java
index 0e0b284a2c..5b04f33e55 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManagerImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/SCEPManagerImpl.java
@@ -33,12 +33,12 @@
  *  under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.scep;
+package io.entgra.device.mgt.core.certificate.mgt.core.scep;
 
 import org.apache.commons.collections.map.SingletonMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.internal.CertificateManagementDataHolder;
+import io.entgra.device.mgt.core.certificate.mgt.core.internal.CertificateManagementDataHolder;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/TenantedDeviceWrapper.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/TenantedDeviceWrapper.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/TenantedDeviceWrapper.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/TenantedDeviceWrapper.java
index b57d3db405..57aeba6042 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/TenantedDeviceWrapper.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/scep/TenantedDeviceWrapper.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.scep;
+package io.entgra.device.mgt.core.certificate.mgt.core.scep;
 
 import org.wso2.carbon.device.mgt.common.Device;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/CertificateManagementService.java
similarity index 85%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/CertificateManagementService.java
index 393dbdd0ed..c3cdf8bcf7 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/CertificateManagementService.java
@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.service;
+package io.entgra.device.mgt.core.certificate.mgt.core.service;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.SCEPResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
 
 import java.io.InputStream;
 import java.security.PrivateKey;
@@ -64,7 +64,7 @@ public interface CertificateManagementService {
 
     CertificateResponse getCertificateBySerial(String serial) throws KeystoreException;
 
-    void saveCertificate(List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificate)
+    void saveCertificate(List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificate)
             throws KeystoreException;
 
     X509Certificate pemToX509Certificate(String pem) throws KeystoreException;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/CertificateManagementServiceImpl.java
similarity index 89%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/CertificateManagementServiceImpl.java
index 67cca297c4..5eb0a6fa63 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/CertificateManagementServiceImpl.java
@@ -15,23 +15,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.service;
-
+package io.entgra.device.mgt.core.certificate.mgt.core.service;
+
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateDAO;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOException;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.SCEPResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.TransactionManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.KeyStoreReader;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagerUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.impl.KeyStoreReader;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagerUtil;
 
 import java.io.InputStream;
 import java.security.PrivateKey;
@@ -126,7 +126,7 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe
         return keyStoreReader.getCertificateBySerial(serial);
     }
 
-    public void saveCertificate(List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificate)
+    public void saveCertificate(List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificate)
             throws KeystoreException {
         certificateGenerator.saveCertInKeyStore(certificate);
     }
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/PaginationResult.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/PaginationResult.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/PaginationResult.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/PaginationResult.java
index 2328d9677f..60e709c944 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/PaginationResult.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/service/PaginationResult.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.service;
+package io.entgra.device.mgt.core.certificate.mgt.core.service;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagementConstants.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagementConstants.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java
index 96c6cc2148..6ff2cb914e 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagementConstants.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 public final class CertificateManagementConstants {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagerUtil.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagerUtil.java
similarity index 87%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagerUtil.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagerUtil.java
index 5bdf641500..343e0750d4 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagerUtil.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagerUtil.java
@@ -17,17 +17,17 @@
  */
 
 
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
-import org.wso2.carbon.certificate.mgt.core.config.CertificateConfigurationManager;
-import org.wso2.carbon.certificate.mgt.core.config.CertificateManagementConfig;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.JNDILookupDefinition;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.CertificateConfigurationManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.CertificateManagementConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.JNDILookupDefinition;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
 
 import javax.sql.DataSource;
 import javax.xml.XMLConstants;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java
similarity index 91%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java
index 9386564cfe..4647c3f2c9 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java
@@ -16,11 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.certificate.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.utils.CarbonUtils;
 import org.wso2.carbon.utils.dbcreator.DatabaseCreator;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtil.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java
similarity index 92%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtil.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java
index e9e59a8450..a27086fbaf 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtil.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import java.math.BigInteger;
 import java.util.Calendar;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/Serializer.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/Serializer.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/Serializer.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/Serializer.java
index 5db925923a..e7d31b2c97 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/Serializer.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/Serializer.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java
index 592a9b0e7c..6602a06ea5 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java
@@ -16,8 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.common;
+package io.entgra.device.mgt.core.certificate.mgt.core.common;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.util.TestUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
@@ -25,7 +26,6 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeSuite;
 import org.w3c.dom.Document;
 import org.wso2.carbon.base.MultitenantConstants;
-import org.wso2.carbon.certificate.mgt.core.util.TestUtils;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/common/DataSourceConfig.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/common/DataSourceConfig.java
index f3154d3bdc..a44c95061b 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/DataSourceConfig.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/common/DataSourceConfig.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.common;
+package io.entgra.device.mgt.core.certificate.mgt.core.common;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java
similarity index 71%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java
index 8eb45f394e..86ed531b5b 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateCacheManagerImplTests.java
@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
-import org.wso2.carbon.certificate.mgt.core.cache.CertificateCacheManager;
-import org.wso2.carbon.certificate.mgt.core.common.BaseDeviceManagementCertificateTest;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.cache.CertificateCacheManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.common.BaseDeviceManagementCertificateTest;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
 
 /**
  * This class tests CertificateCache manager methods
@@ -36,7 +36,7 @@ public class CertificateCacheManagerImplTests extends BaseDeviceManagementCertif
     public void init() throws Exception {
         initDataSource();
         CertificateManagementDAOFactory.init(this.getDataSource());
-        manager = org.wso2.carbon.certificate.mgt.core.cache.impl.CertificateCacheManagerImpl.getInstance();
+        manager = io.entgra.device.mgt.core.certificate.mgt.core.cache.impl.CertificateCacheManagerImpl.getInstance();
         Assert.assertNotNull(manager);
     }
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java
similarity index 97%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java
index 8fe7aee6ba..0ff902a8d1 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorNegativeTests.java
@@ -16,7 +16,8 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CSRGenerator;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.cert.CertIOException;
@@ -35,10 +36,9 @@ import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.wso2.carbon.base.MultitenantConstants;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.util.CSRGenerator;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import javax.sql.DataSource;
 import java.io.File;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java
index a252754f45..837df2428f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java
@@ -1,12 +1,12 @@
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorTests.java
similarity index 90%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorTests.java
index b7e8283ce4..de9df7dbf8 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGeneratorTests.java
@@ -16,13 +16,13 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
 import junit.framework.Assert;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.Test;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
 
 public class CertificateGeneratorTests {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java
similarity index 95%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java
index f0c0e765f3..24b3a134ac 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplNegativeTests.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.mockito.Mockito;
@@ -29,10 +29,10 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
 import org.wso2.carbon.base.MultitenantConstants;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.TransactionManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementServiceImpl;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.sql.DataSource;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java
similarity index 92%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java
index 4ecec86bbc..9bcf260ed2 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java
@@ -16,8 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CSRGenerator;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.DummyCertificate;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,18 +32,16 @@ import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import org.wso2.carbon.certificate.mgt.core.common.BaseDeviceManagementCertificateTest;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.dto.CAStatus;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl;
-import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
-import org.wso2.carbon.certificate.mgt.core.util.CSRGenerator;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
-import org.wso2.carbon.certificate.mgt.core.util.DummyCertificate;
+import io.entgra.device.mgt.core.certificate.mgt.core.common.BaseDeviceManagementCertificateTest;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CAStatus;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.SCEPResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.CertificateManagementException;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementServiceImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.PaginationResult;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
@@ -288,9 +288,9 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC
         byte[] caBytes = FileUtils.readFileToByteArray(caCert);
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         X509Certificate cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(caBytes));
-        List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
-        org.wso2.carbon.certificate.mgt.core.bean.Certificate certificateToStore =
-                new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
+        List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
+        io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate certificateToStore =
+                new io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate();
         certificateToStore.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
         certificateToStore.setCertificate(cert);
         certificates.add(certificateToStore);
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateTests.java
similarity index 88%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateTests.java
index 3c47eea758..559cf905c9 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateTests.java
@@ -16,12 +16,12 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
+import io.entgra.device.mgt.core.certificate.mgt.core.util.DummyCertificate;
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
-import org.wso2.carbon.certificate.mgt.core.util.DummyCertificate;
+import io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate;
 
 /**
  * This class tests the DTO for certificates
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/KeyGeneratorTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/KeyGeneratorTests.java
similarity index 92%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/KeyGeneratorTests.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/KeyGeneratorTests.java
index c23043d38f..fe1b4dcaaa 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/KeyGeneratorTests.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/KeyGeneratorTests.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.certificate.mgt.core.impl;
+package io.entgra.device.mgt.core.certificate.mgt.core.impl;
 
 public class KeyGeneratorTests {
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CSRGenerator.java
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CSRGenerator.java
index 5fa4f7dabd..dbe5c907ea 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CSRGenerator.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CSRGenerator.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtilTestSuite.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtilTestSuite.java
similarity index 94%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtilTestSuite.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtilTestSuite.java
index 45ab597868..192e950a81 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtilTestSuite.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtilTestSuite.java
@@ -1,4 +1,4 @@
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/DummyCertificate.java
similarity index 98%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/DummyCertificate.java
index f276df4625..b5b8bb71b4 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/DummyCertificate.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/DummyCertificate.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/TestUtils.java
similarity index 96%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/TestUtils.java
index 34d6936676..e566a015e7 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/util/TestUtils.java
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/util/TestUtils.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.certificate.mgt.core.util;
+package io.entgra.device.mgt.core.certificate.mgt.core.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.der b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ca_cert.der
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.der
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ca_cert.der
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.pem b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ca_cert.pem
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_cert.pem
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ca_cert.pem
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_private.key b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ca_private.key
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ca_private.key
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ca_private.key
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/carbon.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/certificate-config.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/log4j.properties
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/security/wso2certs.jks
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/certificate-config.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/certificate-config.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/certificate-config.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/data-source-config.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/data-source-config.xml
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/data-source-config.xml
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/data-source-config.xml
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ra_cert.pem b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ra_cert.pem
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/ra_cert.pem
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/ra_cert.pem
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/sql/h2.sql
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/sql/h2.sql
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/sql/h2.sql
diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/testng.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/testng.xml
new file mode 100644
index 0000000000..1444e03b35
--- /dev/null
+++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/testng.xml
@@ -0,0 +1,37 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ you may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<suite name="CertificateManagementServiceImplTests">
+
+    <test name="Operatoin Bean validation tests" preserve-order="true">
+        <classes>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.common.BaseDeviceManagementCertificateTest"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.common.DataSourceConfig"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateManagementServiceImplTests"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGeneratorTestSuite"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.util.CommonUtil"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGeneratorTests"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.KeyGeneratorTests"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateManagementServiceImplNegativeTests"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGeneratorNegativeTests"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateTests"/>
+            <class name="io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateCacheManagerImplTests"/>
+        </classes>
+    </test>
+</suite>
+
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/wso2certs.jks b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/wso2certs.jks
similarity index 100%
rename from components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/wso2certs.jks
rename to components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/wso2certs.jks
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml
deleted file mode 100644
index 13b5914320..0000000000
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/testng.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<!--
-  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ you may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<suite name="CertificateManagementServiceImplTests">
-
-    <test name="Operatoin Bean validation tests" preserve-order="true">
-        <classes>
-            <class name="org.wso2.carbon.certificate.mgt.core.common.BaseDeviceManagementCertificateTest"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.common.DataSourceConfig"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateManagementServiceImplTests"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateGeneratorTestSuite"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.util.CommonUtil"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateGeneratorTests"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.KeyGeneratorTests"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateManagementServiceImplNegativeTests"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateGeneratorNegativeTests"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateTests"/>
-            <class name="org.wso2.carbon.certificate.mgt.core.impl.CertificateCacheManagerImplTests"/>
-        </classes>
-    </test>
-</suite>
-
diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml
index bf53ff3b49..137bd4040d 100644
--- a/components/certificate-mgt/pom.xml
+++ b/components/certificate-mgt/pom.xml
@@ -27,16 +27,15 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.device.mgt.core</groupId>
     <artifactId>certificate-mgt</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Component</name>
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.certificate.mgt.core</module>
-        <module>org.wso2.carbon.certificate.mgt.api</module>
-        <module>org.wso2.carbon.certificate.mgt.cert.admin.api</module>
+        <module>io.entgra.device.mgt.core.certificate.mgt.core</module>
+        <module>io.entgra.device.mgt.core.certificate.mgt.api</module>
+        <module>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api</module>
     </modules>
 
     <build>
diff --git a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml
index efe3fd791c..7df3d80ae1 100644
--- a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml
+++ b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml
@@ -181,7 +181,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
index 70cc33aa74..3d586f54e5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
@@ -266,7 +266,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml
index 1fb676175e..97d158b968 100644
--- a/components/test-coverage/pom.xml
+++ b/components/test-coverage/pom.xml
@@ -37,12 +37,12 @@
 
         <!-- certificate mgt component related properties -->
         <certificate.mgt>certificate-mgt</certificate.mgt>
-        <certificate.mgt.api>${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.api</certificate.mgt.api>
+        <certificate.mgt.api>${basedir}/../${certificate.mgt}/io.entgra.device.mgt.core.certificate.mgt.api</certificate.mgt.api>
         <certificate.mgt.cert.admin>
-            ${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.cert.admin.api
+            ${basedir}/../${certificate.mgt}/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api
         </certificate.mgt.cert.admin>
         <certificate.mgt.core>
-            ${basedir}/../${certificate.mgt}/org.wso2.carbon.certificate.mgt.core
+            ${basedir}/../${certificate.mgt}/io.entgra.device.mgt.core.certificate.mgt.core
         </certificate.mgt.core>
 
         <!-- Device mgt component related properties -->
@@ -206,7 +206,7 @@
                                             </executiondata>
                                             <structure name="Carbon Device Management Component Coverage Report">
                                                 <group name="certificate-mgt">
-                                                    <group name="org.wso2.carbon.certificate.mgt.core">
+                                                    <group name="io.entgra.device.mgt.core.certificate.mgt.core">
                                                         <classfiles>
                                                             <fileset dir="${certificate.mgt.core}/${target}/${classes}" />
                                                         </classfiles>
@@ -214,7 +214,7 @@
                                                             <fileset dir="${certificate.mgt.core}/${source}" />
                                                         </sourcefiles>
                                                     </group>
-                                                    <group name="org.wso2.carbon.certificate.mgt.api">
+                                                    <group name="io.entgra.device.mgt.core.certificate.mgt.api">
                                                         <classfiles>
                                                             <fileset dir="${certificate.mgt.api}/${target}/${classes}" />
                                                         </classfiles>
@@ -222,7 +222,7 @@
                                                             <fileset dir="${certificate.mgt.api}/${source}" />
                                                         </sourcefiles>
                                                     </group>
-                                                    <group name="org.wso2.carbon.certificate.mgt.cert.admin.api">
+                                                    <group name="io.entgra.device.mgt.core.certificate.mgt.cert.admin.api">
                                                         <classfiles>
                                                             <fileset dir="${certificate.mgt.cert.admin}/${target}/${classes}" />
                                                         </classfiles>
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
index 4961b11efc..9e38583777 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
@@ -90,7 +90,7 @@
                             javax.servlet.http,
                             javax.xml,
                             org.apache.axis2.transport.http,
-                            org.wso2.carbon.certificate.mgt.core.*,
+                            io.entgra.device.mgt.core.certificate.mgt.core.*,
                             org.wso2.carbon.device.mgt.core.permission.mgt.*,
                             org.wso2.carbon.device.mgt.core.util.*,
                             org.wso2.carbon.device.mgt.common.*,
@@ -211,7 +211,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
index 023197a41d..230f7cb253 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java
@@ -23,11 +23,11 @@ import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPException;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.scep.TenantedDeviceWrapper;
+import io.entgra.device.mgt.core.certificate.mgt.core.dto.CertificateResponse;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPException;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.TenantedDeviceWrapper;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/AuthenticatorFrameworkDataHolder.java b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/AuthenticatorFrameworkDataHolder.java
index 7b8540accd..c18e98f1d7 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/AuthenticatorFrameworkDataHolder.java
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/AuthenticatorFrameworkDataHolder.java
@@ -18,8 +18,8 @@
  */
 package io.entgra.device.mgt.core.webapp.authenticator.framework.internal;
 
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.device.mgt.common.spi.OTPManagementService;
 import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
index b493512d67..313011a6d3 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/main/java/io/entgra/device/mgt/core/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
@@ -23,8 +23,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.device.mgt.common.spi.OTPManagementService;
 import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
@@ -53,13 +53,13 @@ import java.util.Properties;
  * bind="setRealmService"
  * unbind="unsetRealmService"
  * @scr.reference name="org.wso2.carbon.certificate.mgt"
- * interface="org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService"
+ * interface="io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService"
  * policy="dynamic"
  * cardinality="1..n"
  * bind="setCertificateManagementService"
  * unbind="unsetCertificateManagementService"
- * @scr.reference name="org.wso2.carbon.certificate.mgt.core.scep"
- * interface="org.wso2.carbon.certificate.mgt.core.scep.SCEPManager"
+ * @scr.reference name="io.entgra.device.mgt.core.certificate.mgt.core.scep"
+ * interface="io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager"
  * policy="dynamic"
  * cardinality="1..n"
  * bind="setSCEPManagementService"
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticatorTest.java b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticatorTest.java
index 9ee678a178..31f39c1b92 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticatorTest.java
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/authenticator/CertificateAuthenticatorTest.java
@@ -35,16 +35,16 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.wso2.carbon.base.MultitenantConstants;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.impl.KeyStoreReader;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPException;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManager;
-import org.wso2.carbon.certificate.mgt.core.scep.SCEPManagerImpl;
-import org.wso2.carbon.certificate.mgt.core.scep.TenantedDeviceWrapper;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
-import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.KeyStoreReader;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPException;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManager;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.SCEPManagerImpl;
+import io.entgra.device.mgt.core.certificate.mgt.core.scep.TenantedDeviceWrapper;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementService;
+import io.entgra.device.mgt.core.certificate.mgt.core.service.CertificateManagementServiceImpl;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/util/TestCertificateGenerator.java b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/util/TestCertificateGenerator.java
index 54ce59c4c3..935a4a3e22 100644
--- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/util/TestCertificateGenerator.java
+++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/src/test/java/io/entgra/device/mgt/core/webapp/authenticator/framework/util/TestCertificateGenerator.java
@@ -26,11 +26,11 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
-import org.wso2.carbon.certificate.mgt.core.util.CommonUtil;
+import io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate;
+import io.entgra.device.mgt.core.certificate.mgt.core.exception.KeystoreException;
+import io.entgra.device.mgt.core.certificate.mgt.core.impl.CertificateGenerator;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagementConstants;
+import io.entgra.device.mgt.core.certificate.mgt.core.util.CommonUtil;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.security.auth.x500.X500Principal;
@@ -80,8 +80,8 @@ public class TestCertificateGenerator extends CertificateGenerator {
                     .getCertificate(certificateBuilder.build(contentSigner));
             certificate.verify(certificate.getPublicKey());
             List<Certificate> certificates = new ArrayList<>();
-            org.wso2.carbon.certificate.mgt.core.bean.Certificate certificateToStore =
-                    new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
+            Certificate certificateToStore =
+                    new Certificate();
             certificateToStore.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
             certificateToStore.setCertificate(certificate);
             certificates.add(certificateToStore);
diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml
index 13ba2e1055..0a6662b1f1 100644
--- a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml
+++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml
@@ -49,7 +49,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>io.entgra.device.mgt.core</groupId>
-                                    <artifactId>org.wso2.carbon.certificate.mgt.api
+                                    <artifactId>io.entgra.device.mgt.core.certificate.mgt.api
                                     </artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml
index d119473aba..736b0bd3d3 100644
--- a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml
+++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml
@@ -49,7 +49,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>io.entgra.device.mgt.core</groupId>
-                                    <artifactId>org.wso2.carbon.certificate.mgt.cert.admin.api
+                                    <artifactId>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api
                                     </artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml
index 5bde95eef8..e0e882b639 100644
--- a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml
+++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.org.bouncycastle</groupId>
@@ -118,7 +118,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:org.wso2.carbon.certificate.mgt.core:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.core:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
                                     org.wso2.orbit.org.bouncycastle:bcpkix-jdk15on:${bcpkix.wso2.version}
diff --git a/pom.xml b/pom.xml
index a734f4e03f..2378ab1ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 <!--        <module>components/apimgt-extensions</module>-->
 <!--        <module>components/application-mgt</module>-->
 <!--        <module>components/policy-mgt</module>-->
-<!--        <module>components/certificate-mgt</module>-->
+        <module>components/certificate-mgt</module>
         <module>components/ui-request-interceptor</module>
         <module>components/transport-mgt</module>
         <module>components/analytics-mgt</module>
@@ -55,7 +55,7 @@
 <!--        <module>features/apimgt-extensions</module>-->
 <!--        <module>features/application-mgt</module>-->
 <!--        <module>features/policy-mgt</module>-->
-<!--        <module>features/certificate-mgt</module>-->
+        <module>features/certificate-mgt</module>
 <!--        <module>features/heartbeat-management</module>-->
         <module>features/ui-request-interceptor</module>
 <!--        <module>features/jwt-client</module>-->
@@ -183,7 +183,7 @@
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+                <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>