diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 00938f1918..33efc96495 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -103,7 +103,7 @@
                             org.wso2.carbon.ndatasource.core,
                             org.wso2.carbon.ntask.core.*,
                             org.wso2.carbon.ntask.common,
-                            io.entgra.task.mgt.common.*,
+                            io.entgra.device.mgt.core.task.mgt.common.*,
                             org.apache.commons.collections;version="${commons-collections.version.range}",
                             org.wso2.carbon.email.sender.*,
                             io.swagger.annotations.*;resolution:=optional,
@@ -352,7 +352,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.task.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java
index ad3269be00..7e6d0f916d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java
@@ -19,7 +19,7 @@
 package org.wso2.carbon.device.mgt.core.task.impl;
 
 import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DynamicTaskContext;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml
similarity index 93%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/pom.xml
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml
index fb22fd0d98..494f55f2d9 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/pom.xml
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.task.mgt.common</artifactId>
+    <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - Task Management Common</name>
     <description>Entgra IoT - Task Management Common</description>
@@ -44,7 +44,7 @@
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Task Management Common Bundle</Bundle-Description>
                         <Export-Package>
-                            io.entgra.task.mgt.common.*
+                            io.entgra.device.mgt.core.task.mgt.common.*
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/bean/DynamicTask.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/bean/DynamicTask.java
similarity index 97%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/bean/DynamicTask.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/bean/DynamicTask.java
index ece8d4dc26..22fa2868ce 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/bean/DynamicTask.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/bean/DynamicTask.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.bean;
+package io.entgra.device.mgt.core.task.mgt.common.bean;
 
 import java.util.Map;
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/constant/TaskMgtConstants.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java
similarity index 97%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/constant/TaskMgtConstants.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java
index 2ffe960964..2c485c03d3 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/constant/TaskMgtConstants.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.constant;
+package io.entgra.device.mgt.core.task.mgt.common.constant;
 
 public class TaskMgtConstants {
     public static final class DataSourceProperties {
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/IllegalTransactionStateException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/IllegalTransactionStateException.java
similarity index 95%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/IllegalTransactionStateException.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/IllegalTransactionStateException.java
index 4c4c996c59..f8f02bd7e1 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/IllegalTransactionStateException.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/IllegalTransactionStateException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.exception;
+package io.entgra.device.mgt.core.task.mgt.common.exception;
 
 public class IllegalTransactionStateException extends RuntimeException {
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementDAOException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementDAOException.java
similarity index 93%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementDAOException.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementDAOException.java
index 9b683dba20..b66285be54 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementDAOException.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementDAOException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.exception;
+package io.entgra.device.mgt.core.task.mgt.common.exception;
 
 public class TaskManagementDAOException extends Exception {
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementException.java
similarity index 93%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementException.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementException.java
index d9705e6438..5266008b76 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementException.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.exception;
+package io.entgra.device.mgt.core.task.mgt.common.exception;
 
 public class TaskManagementException extends Exception {
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskNotFoundException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskNotFoundException.java
similarity index 94%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskNotFoundException.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskNotFoundException.java
index 2d2f568fe2..87d9ceb9bd 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskNotFoundException.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskNotFoundException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.exception;
+package io.entgra.device.mgt.core.task.mgt.common.exception;
 
 /**
  * Represents the exception thrown during validating the request.
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TransactionManagementException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TransactionManagementException.java
similarity index 95%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TransactionManagementException.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TransactionManagementException.java
index 5e43237e43..4ca6801627 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TransactionManagementException.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TransactionManagementException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.exception;
+package io.entgra.device.mgt.core.task.mgt.common.exception;
 
 public class TransactionManagementException extends Exception {
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/UnsupportedDatabaseEngineException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/UnsupportedDatabaseEngineException.java
similarity index 95%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/UnsupportedDatabaseEngineException.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/UnsupportedDatabaseEngineException.java
index a29f954e12..ad3009d96c 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/UnsupportedDatabaseEngineException.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/UnsupportedDatabaseEngineException.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.exception;
+package io.entgra.device.mgt.core.task.mgt.common.exception;
 
 /**
  * This runtime exception will be thrown if the server has configured with unsupported DB engine.
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/spi/TaskManagementService.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java
similarity index 83%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/spi/TaskManagementService.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java
index fac557e0bd..5c0b075477 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/spi/TaskManagementService.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.common.spi;
+package io.entgra.device.mgt.core.task.mgt.common.spi;
 
-import io.entgra.task.mgt.common.exception.TaskNotFoundException;
-import io.entgra.task.mgt.common.exception.TaskManagementException;
-import io.entgra.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskNotFoundException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
 
 import java.util.List;
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml
similarity index 92%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/pom.xml
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml
index 36b6b99422..a92d1046e2 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/pom.xml
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.task.mgt.core</artifactId>
+    <artifactId>io.entgra.device.mgt.core.task.mgt.core</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - Task manager Core</name>
     <description>Entgra IoT - Task manager Core</description>
@@ -48,7 +48,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Task Management Core Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.task.mgt.core.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.task.mgt.core.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -59,7 +59,7 @@
                             javax.xml.bind,
                             javax.sql,
                             javax.naming,
-                            io.entgra.task.mgt.common.*,
+                            io.entgra.device.mgt.core.task.mgt.common.*,
                             org.wso2.carbon.utils.*,
                             org.wso2.carbon.ntask.core.*,
                             org.wso2.carbon.ntask.common,
@@ -72,8 +72,8 @@
                             io.entgra.server.bootup.heartbeat.beacon.service,
                         </Import-Package>
                         <Export-Package>
-                            !io.entgra.task.mgt.core.internal,
-                            io.entgra.task.mgt.core.*
+                            !io.entgra.device.mgt.core.task.mgt.core.internal,
+                            io.entgra.device.mgt.core.task.mgt.core.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -99,7 +99,7 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.task.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskConfigurationManager.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskConfigurationManager.java
similarity index 90%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskConfigurationManager.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskConfigurationManager.java
index 2779a07ff9..d245cf4cd2 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskConfigurationManager.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskConfigurationManager.java
@@ -15,11 +15,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.config;
+package io.entgra.device.mgt.core.task.mgt.core.config;
 
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
-import io.entgra.task.mgt.common.exception.TaskManagementException;
-import io.entgra.task.mgt.core.util.TaskManagementUtil;
+import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
 import org.w3c.dom.Document;
 import org.wso2.carbon.utils.CarbonUtils;
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfig.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfig.java
similarity index 96%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfig.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfig.java
index 2b3ae468ac..fb9ec5e488 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfig.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfig.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.config;
+package io.entgra.device.mgt.core.task.mgt.core.config;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfigRepository.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfigRepository.java
similarity index 90%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfigRepository.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfigRepository.java
index a81617f738..26f78cc021 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfigRepository.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfigRepository.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.config;
+package io.entgra.device.mgt.core.task.mgt.core.config;
 
-import io.entgra.task.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/DataSourceConfig.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/DataSourceConfig.java
similarity index 95%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/DataSourceConfig.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/DataSourceConfig.java
index b4c4d9fc2d..05cacf68f1 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/DataSourceConfig.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/DataSourceConfig.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.config.datasource;
+package io.entgra.device.mgt.core.task.mgt.core.config.datasource;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/JNDILookupDefinition.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/JNDILookupDefinition.java
similarity index 96%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/JNDILookupDefinition.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/JNDILookupDefinition.java
index 5101af8d49..1fba6b9973 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/JNDILookupDefinition.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/JNDILookupDefinition.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package io.entgra.task.mgt.core.config.datasource;
+package io.entgra.device.mgt.core.task.mgt.core.config.datasource;
 
 import javax.xml.bind.annotation.*;
 import java.util.List;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskDAO.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java
similarity index 86%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskDAO.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java
index 317870dba1..d1eb9afd08 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskDAO.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.dao;
+package io.entgra.device.mgt.core.task.mgt.core.dao;
 
-import io.entgra.task.mgt.common.bean.DynamicTask;
-import io.entgra.task.mgt.common.exception.TaskManagementDAOException;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException;
 
 import java.util.List;
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskPropDAO.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java
similarity index 89%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskPropDAO.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java
index b458417298..6f5759b24f 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskPropDAO.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.dao;
+package io.entgra.device.mgt.core.task.mgt.core.dao;
 
-import io.entgra.task.mgt.common.exception.TaskManagementDAOException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException;
 
 import java.util.Map;
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/common/TaskManagementDAOFactory.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java
similarity index 88%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/common/TaskManagementDAOFactory.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java
index c8f8623777..cf3bff0dc9 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/common/TaskManagementDAOFactory.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java
@@ -15,19 +15,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.dao.common;
-
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
-import io.entgra.task.mgt.common.exception.IllegalTransactionStateException;
-import io.entgra.task.mgt.common.exception.TransactionManagementException;
-import io.entgra.task.mgt.common.exception.UnsupportedDatabaseEngineException;
-import io.entgra.task.mgt.core.config.datasource.DataSourceConfig;
-import io.entgra.task.mgt.core.config.datasource.JNDILookupDefinition;
-import io.entgra.task.mgt.core.dao.DynamicTaskDAO;
-import io.entgra.task.mgt.core.dao.DynamicTaskPropDAO;
-import io.entgra.task.mgt.core.dao.impl.DynamicTaskDAOImpl;
-import io.entgra.task.mgt.core.dao.impl.DynamicTaskPropDAOImpl;
-import io.entgra.task.mgt.core.dao.util.TaskManagementDAOUtil;
+package io.entgra.device.mgt.core.task.mgt.core.dao.common;
+
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.exception.IllegalTransactionStateException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TransactionManagementException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.UnsupportedDatabaseEngineException;
+import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.task.mgt.core.config.datasource.JNDILookupDefinition;
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO;
+import io.entgra.device.mgt.core.task.mgt.core.dao.impl.DynamicTaskDAOImpl;
+import io.entgra.device.mgt.core.task.mgt.core.dao.impl.DynamicTaskPropDAOImpl;
+import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -183,7 +183,7 @@ public class TaskManagementDAOFactory {
                     "Device Management Repository data source configuration " + "is null and " +
                             "thus, is not initialized");
         }
-        io.entgra.task.mgt.core.config.datasource.JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
+        JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
         if (jndiConfig != null) {
             if (log.isDebugEnabled()) {
                 log.debug("Initializing Device Management Repository data source using the JNDI " +
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java
similarity index 94%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java
index 80fcb98e15..90d73ca21b 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java
@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.task.mgt.core.dao.impl;
 
-import io.entgra.task.mgt.common.bean.DynamicTask;
-import io.entgra.task.mgt.common.exception.TaskManagementDAOException;
-import io.entgra.task.mgt.core.dao.DynamicTaskDAO;
-import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory;
-import io.entgra.task.mgt.core.dao.util.TaskManagementDAOUtil;
+import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
+import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException;
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java
similarity index 91%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java
index 66d6920feb..fb613e683e 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java
@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.dao.impl;
+package io.entgra.device.mgt.core.task.mgt.core.dao.impl;
 
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
-import io.entgra.task.mgt.common.exception.TaskManagementDAOException;
-import io.entgra.task.mgt.core.dao.DynamicTaskPropDAO;
-import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory;
-import io.entgra.task.mgt.core.dao.util.TaskManagementDAOUtil;
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO;
+import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
+import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/util/TaskManagementDAOUtil.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/util/TaskManagementDAOUtil.java
similarity index 96%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/util/TaskManagementDAOUtil.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/util/TaskManagementDAOUtil.java
index c9ba9ea07a..324249d750 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/util/TaskManagementDAOUtil.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/util/TaskManagementDAOUtil.java
@@ -15,9 +15,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.dao.util;
+package io.entgra.device.mgt.core.task.mgt.core.dao.util;
 
-import io.entgra.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerDataHolder.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java
similarity index 93%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerDataHolder.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java
index 8de0cbb40f..aa8265a785 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerDataHolder.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.internal;
+package io.entgra.device.mgt.core.task.mgt.core.internal;
 
 import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
-import io.entgra.task.mgt.common.spi.TaskManagementService;
+import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService;
 import org.wso2.carbon.ntask.core.service.TaskService;
 
 public class TaskManagerDataHolder {
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerServiceComponent.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java
similarity index 90%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerServiceComponent.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java
index 9021b070ec..947dd5340f 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerServiceComponent.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java
@@ -15,15 +15,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.internal;
+package io.entgra.device.mgt.core.task.mgt.core.internal;
 
+import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
 import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
-import io.entgra.task.mgt.core.config.TaskManagementConfig;
-import io.entgra.task.mgt.core.config.datasource.DataSourceConfig;
-import io.entgra.task.mgt.common.spi.TaskManagementService;
-import io.entgra.task.mgt.core.config.TaskConfigurationManager;
-import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory;
-import io.entgra.task.mgt.core.service.TaskManagementServiceImpl;
+import io.entgra.device.mgt.core.task.mgt.core.config.TaskManagementConfig;
+import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig;
+import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService;
+import io.entgra.device.mgt.core.task.mgt.core.config.TaskConfigurationManager;
+import io.entgra.device.mgt.core.task.mgt.core.service.TaskManagementServiceImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/service/TaskManagementServiceImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java
similarity index 94%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/service/TaskManagementServiceImpl.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java
index fe3a7cb97e..91334172bf 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/service/TaskManagementServiceImpl.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java
@@ -15,21 +15,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.service;
+package io.entgra.device.mgt.core.task.mgt.core.service;
 
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO;
+import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
+import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder;
+import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil;
 import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import io.entgra.task.mgt.common.bean.DynamicTask;
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
-import io.entgra.task.mgt.common.exception.TaskManagementDAOException;
-import io.entgra.task.mgt.common.exception.TaskManagementException;
-import io.entgra.task.mgt.common.exception.TaskNotFoundException;
-import io.entgra.task.mgt.common.exception.TransactionManagementException;
-import io.entgra.task.mgt.common.spi.TaskManagementService;
-import io.entgra.task.mgt.core.dao.DynamicTaskDAO;
-import io.entgra.task.mgt.core.dao.DynamicTaskPropDAO;
-import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory;
-import io.entgra.task.mgt.core.internal.TaskManagerDataHolder;
-import io.entgra.task.mgt.core.util.TaskManagementUtil;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskNotFoundException;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TransactionManagementException;
+import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService;
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/util/TaskManagementUtil.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java
similarity index 91%
rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/util/TaskManagementUtil.java
rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java
index 5308fc29c9..b4a2a7e3b7 100755
--- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/util/TaskManagementUtil.java
+++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java
@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.core.util;
+package io.entgra.device.mgt.core.task.mgt.core.util;
 
 import com.google.gson.Gson;
 import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
-import io.entgra.task.mgt.common.exception.TaskManagementException;
-import io.entgra.task.mgt.core.internal.TaskManagerDataHolder;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
+import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/task-mgt/task-manager/pom.xml b/components/task-mgt/task-manager/pom.xml
index 95f26adef5..c375f2f302 100755
--- a/components/task-mgt/task-manager/pom.xml
+++ b/components/task-mgt/task-manager/pom.xml
@@ -32,8 +32,8 @@
     <url>http://entgra.io</url>
 
     <modules>
-        <module>io.entgra.task.mgt.core</module>
-        <module>io.entgra.task.mgt.common</module>
+        <module>io.entgra.device.mgt.core.task.mgt.core</module>
+        <module>io.entgra.device.mgt.core.task.mgt.common</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/pom.xml b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml
similarity index 86%
rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/pom.xml
rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml
index f85b4f3b5c..ac95521f94 100755
--- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/pom.xml
+++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.task.mgt.watcher</artifactId>
+    <artifactId>io.entgra.device.mgt.core.task.mgt.watcher</artifactId>
     <packaging>bundle</packaging>
     <name>Entgra IoT - Task Watcher </name>
     <description>Entgra IoT - Task Watcher</description>
@@ -48,11 +48,11 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Task Watcher Bundle</Bundle-Description>
-                        <Private-Package>io.entgra.task.mgt.watcher.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.core.task.mgt.watcher.internal</Private-Package>
                         <Import-Package>
                             io.entgra.server.bootup.heartbeat.beacon.*,
-                            io.entgra.task.mgt.common.*,
-                            io.entgra.task.mgt.core.*,
+                            io.entgra.device.mgt.core.task.mgt.common.*,
+                            io.entgra.device.mgt.core.task.mgt.core.*,
                             org.apache.commons.logging,
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -64,7 +64,7 @@
                             org.wso2.carbon.user.core.*,
                         </Import-Package>
                         <Export-Package>
-                            io.entgra.task.mgt.watcher.*
+                            io.entgra.device.mgt.core.task.mgt.watcher.*
                         </Export-Package>
                     </instructions>
                 </configuration>
@@ -90,12 +90,12 @@
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.task.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.task.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.task.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -133,6 +133,12 @@
             <artifactId>org.wso2.carbon.utils</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!--nTask dependencies-->
+        <dependency>
+            <groupId>org.wso2.carbon.commons</groupId>
+            <artifactId>org.wso2.carbon.ntask.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/IoTSStartupHandler.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java
similarity index 96%
rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/IoTSStartupHandler.java
rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java
index 355fba3825..16794243ad 100755
--- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/IoTSStartupHandler.java
+++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java
@@ -16,14 +16,14 @@
  * under the License.
  */
 
-package io.entgra.task.mgt.watcher;
+package io.entgra.device.mgt.core.task.mgt.watcher;
 
 import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import io.entgra.task.mgt.common.bean.DynamicTask;
-import io.entgra.task.mgt.common.constant.TaskMgtConstants;
-import io.entgra.task.mgt.common.exception.TaskManagementException;
-import io.entgra.task.mgt.core.util.TaskManagementUtil;
-import io.entgra.task.mgt.watcher.internal.TaskWatcherDataHolder;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
+import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
+import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
+import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil;
+import io.entgra.device.mgt.core.task.mgt.watcher.internal.TaskWatcherDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherDataHolder.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java
similarity index 94%
rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherDataHolder.java
rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java
index 9e2953ae25..39a3ef89f1 100755
--- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherDataHolder.java
+++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java
@@ -15,10 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.watcher.internal;
+package io.entgra.device.mgt.core.task.mgt.watcher.internal;
 
 import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
-import io.entgra.task.mgt.common.spi.TaskManagementService;
+import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService;
 import org.wso2.carbon.ntask.core.service.TaskService;
 import org.wso2.carbon.user.core.service.RealmService;
 
diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherServiceComponent.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java
similarity index 92%
rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherServiceComponent.java
rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java
index 209113df84..da3c47c962 100755
--- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherServiceComponent.java
+++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java
@@ -15,13 +15,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.entgra.task.mgt.watcher.internal;
+package io.entgra.device.mgt.core.task.mgt.watcher.internal;
 
+import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService;
+import io.entgra.device.mgt.core.task.mgt.core.config.TaskConfigurationManager;
+import io.entgra.device.mgt.core.task.mgt.core.config.TaskManagementConfig;
+import io.entgra.device.mgt.core.task.mgt.watcher.IoTSStartupHandler;
 import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService;
-import io.entgra.task.mgt.common.spi.TaskManagementService;
-import io.entgra.task.mgt.core.config.TaskConfigurationManager;
-import io.entgra.task.mgt.core.config.TaskManagementConfig;
-import io.entgra.task.mgt.watcher.IoTSStartupHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
@@ -32,7 +32,7 @@ import org.wso2.carbon.user.core.service.RealmService;
 
 /**
  * @scr.component
- * name="io.entgra.task.mgt.watcher" immediate="true"
+ * name="io.entgra.device.mgt.core.task.mgt.watcher" immediate="true"
  * @scr.reference name="app.mgt.ntask.component"
  * interface="org.wso2.carbon.ntask.core.service.TaskService"
  * cardinality="1..1"
@@ -40,7 +40,7 @@ import org.wso2.carbon.user.core.service.RealmService;
  * bind="setTaskService"
  * unbind="unsetTaskService"
  * @scr.reference name="io.entgra.task.mgt.service"
- * interface="io.entgra.task.mgt.common.spi.TaskManagementService"
+ * interface="io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService"
  * cardinality="1..1"
  * policy="dynamic"
  * bind="setTaskMgtService"
diff --git a/components/task-mgt/task-watcher/pom.xml b/components/task-mgt/task-watcher/pom.xml
index 8d5cf3eba1..36accd91df 100755
--- a/components/task-mgt/task-watcher/pom.xml
+++ b/components/task-mgt/task-watcher/pom.xml
@@ -32,7 +32,7 @@
     <url>http://entgra.io</url>
 
     <modules>
-        <module>io.entgra.task.mgt.watcher</module>
+        <module>io.entgra.device.mgt.core.task.mgt.watcher</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml
index 1325658984..7b1dff689f 100755
--- a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml
+++ b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml
@@ -34,11 +34,11 @@
     <dependencies>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.task.mgt.core</artifactId>
+            <artifactId>io.entgra.device.mgt.core.task.mgt.core</artifactId>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
-            <artifactId>io.entgra.task.mgt.common</artifactId>
+            <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
         </dependency>
     </dependencies>
 
@@ -91,13 +91,13 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.task.mgt.core:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.core:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.task.mgt.common:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.core:io.entgra.task.mgt.watcher:${carbon.device.mgt.version}
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.watcher:${carbon.device.mgt.version}
                                 </bundleDef>
                             </bundles>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index b63361b233..dfbf7a7798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 <!--        <module>components/analytics-mgt</module>-->
 <!--        <module>components/webapp-authenticator-framework</module>-->
 <!--        <module>components/logger</module>-->
-<!--        <module>components/task-mgt</module>-->
+        <module>components/task-mgt</module>
         <module>components/subtype-mgt</module>
         <module>components/tenant-mgt</module>
         <module>components/operation-template-mgt</module>
@@ -64,7 +64,7 @@
 <!--        <module>features/analytics-mgt</module>-->
 <!--        <module>features/webapp-authenticator-framework</module>-->
 <!--        <module>features/logger</module>-->
-<!--        <module>features/task-mgt</module>-->
+        <module>features/task-mgt</module>
         <module>features/subtype-mgt</module>
         <module>features/tenant-mgt</module>
         <module>features/operation-template-mgt-plugin-feature</module>
@@ -367,17 +367,17 @@
             <!-- Task Management dependencies -->
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.task.mgt.common</artifactId>
+                <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.task.mgt.core</artifactId>
+                <artifactId>io.entgra.device.mgt.core.task.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
-                <artifactId>io.entgra.task.mgt.watcher</artifactId>
+                <artifactId>io.entgra.device.mgt.core.task.mgt.watcher</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>