diff --git a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/common/FactoryMgtDAOFactory.java b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/FactoryMgtDAOFactory.java
similarity index 98%
rename from components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/common/FactoryMgtDAOFactory.java
rename to components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/FactoryMgtDAOFactory.java
index 7e7ab190be9..f327d333a4d 100755
--- a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/common/FactoryMgtDAOFactory.java
+++ b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/FactoryMgtDAOFactory.java
@@ -16,9 +16,8 @@
  * under the License.
  */
 
-package io.entgra.device.mgt.core.factory.mgt.core.dao.common;
+package io.entgra.device.mgt.core.factory.mgt.core.dao;
 
-import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAO;
 import io.entgra.device.mgt.core.factory.mgt.core.dao.impl.FactoryMgtDAOImpl;
 import io.entgra.device.mgt.core.factory.mgt.common.util.FactoryMgtConstants;
 import io.entgra.device.mgt.core.factory.mgt.core.exception.IllegalTransactionStateException;
diff --git a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/impl/FactoryMgtDAOImpl.java b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/impl/FactoryMgtDAOImpl.java
index 024e1b1cb14..f3d638b5bbc 100644
--- a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/impl/FactoryMgtDAOImpl.java
+++ b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/dao/impl/FactoryMgtDAOImpl.java
@@ -19,11 +19,11 @@
 package io.entgra.device.mgt.core.factory.mgt.core.dao.impl;
 
 import io.entgra.device.mgt.core.factory.mgt.common.bean.PaginatedMeterRequestQuery;
-import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAO;
-import io.entgra.device.mgt.core.factory.mgt.core.dao.common.FactoryMgtDAOFactory;
-import io.entgra.device.mgt.core.factory.mgt.core.util.FactoryMgtDAOUtil;
 import io.entgra.device.mgt.core.factory.mgt.common.dto.ProductionPlan;
 import io.entgra.device.mgt.core.factory.mgt.common.exception.FactoryMgtDAOException;
+import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAO;
+import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAOFactory;
+import io.entgra.device.mgt.core.factory.mgt.core.util.FactoryMgtDAOUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/internal/FactoryMgtServiceComponent.java b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/internal/FactoryMgtServiceComponent.java
index 62619a80e5c..231b43e7983 100644
--- a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/internal/FactoryMgtServiceComponent.java
+++ b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/internal/FactoryMgtServiceComponent.java
@@ -23,7 +23,7 @@ import io.entgra.device.mgt.core.factory.mgt.common.spi.ProductionPlanService;
 import io.entgra.device.mgt.core.factory.mgt.core.config.FactoryConfigurationManager;
 import io.entgra.device.mgt.core.factory.mgt.core.config.FactoryMgtConfig;
 import io.entgra.device.mgt.core.factory.mgt.core.config.datasource.DataSourceConfig;
-import io.entgra.device.mgt.core.factory.mgt.core.dao.common.FactoryMgtDAOFactory;
+import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAOFactory;
 import io.entgra.device.mgt.core.factory.mgt.core.service.impl.ProductionPlanServiceImpl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/service/impl/ProductionPlanServiceImpl.java b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/service/impl/ProductionPlanServiceImpl.java
index fafd3615129..c08c6e0623e 100644
--- a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/service/impl/ProductionPlanServiceImpl.java
+++ b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/main/java/io/entgra/device/mgt/core/factory/mgt/core/service/impl/ProductionPlanServiceImpl.java
@@ -28,7 +28,7 @@ import io.entgra.device.mgt.core.factory.mgt.common.responses.FailedResponse;
 import io.entgra.device.mgt.core.factory.mgt.common.spi.ProductionPlanService;
 import io.entgra.device.mgt.core.factory.mgt.common.wrapper.ProductionPlanWrapper;
 import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAO;
-import io.entgra.device.mgt.core.factory.mgt.core.dao.common.FactoryMgtDAOFactory;
+import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAOFactory;
 import io.entgra.device.mgt.core.factory.mgt.common.dto.ProductionPlan;
 import io.entgra.device.mgt.core.factory.mgt.common.exception.FactoryMgtDAOException;
 import io.entgra.device.mgt.core.factory.mgt.core.exception.TransactionManagementException;
diff --git a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/TestUtils.java b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/TestUtils.java
index e32f6c7e558..88af5d27185 100644
--- a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/TestUtils.java
+++ b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/TestUtils.java
@@ -19,7 +19,7 @@
 package io.entgra.device.mgt.core.factory.mgt.core;
 
 import io.entgra.device.mgt.core.factory.mgt.common.dto.ProductionPlan;
-import io.entgra.device.mgt.core.factory.mgt.core.dao.common.FactoryMgtDAOFactory;
+import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAOFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.testng.Assert;
diff --git a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/mock/BaseFactoryMgtPluginTest.java b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/mock/BaseFactoryMgtPluginTest.java
index 58726142e41..a6b256377bd 100644
--- a/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/mock/BaseFactoryMgtPluginTest.java
+++ b/components/factory-mgt/io.entgra.device.mgt.core.factory.mgt.core/src/test/java/io/entgra/device/mgt/core/factory/mgt/core/mock/BaseFactoryMgtPluginTest.java
@@ -23,7 +23,7 @@ import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementEx
 import io.entgra.device.mgt.core.device.mgt.core.util.DeviceManagerUtil;
 import io.entgra.device.mgt.core.factory.mgt.core.DataSourceConfig;
 import io.entgra.device.mgt.core.factory.mgt.core.TestUtils;
-import io.entgra.device.mgt.core.factory.mgt.core.dao.common.FactoryMgtDAOFactory;
+import io.entgra.device.mgt.core.factory.mgt.core.dao.FactoryMgtDAOFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.PoolProperties;