diff --git a/database-plugins/src/main/java/io/cdap/plugin/db/batch/sink/DBSink.java b/database-plugins/src/main/java/io/cdap/plugin/db/batch/sink/DBSink.java
index f4b10a0d1..63af93116 100644
--- a/database-plugins/src/main/java/io/cdap/plugin/db/batch/sink/DBSink.java
+++ b/database-plugins/src/main/java/io/cdap/plugin/db/batch/sink/DBSink.java
@@ -48,10 +48,10 @@
 import io.cdap.plugin.common.LineageRecorder;
 import io.cdap.plugin.common.ReferenceBatchSink;
 import io.cdap.plugin.common.ReferencePluginConfig;
+import io.cdap.plugin.common.db.DBErrorDetailsProvider;
 import io.cdap.plugin.common.db.DBUtils;
 import io.cdap.plugin.db.batch.TransactionIsolationLevel;
 import io.cdap.plugin.db.common.DBBaseConfig;
-import io.cdap.plugin.db.common.DBErrorDetailsProvider;
 import io.cdap.plugin.db.common.FQNGenerator;
 import io.cdap.plugin.db.connector.DBConnector;
 import io.cdap.plugin.db.connector.DBConnectorConfig;
diff --git a/database-plugins/src/main/java/io/cdap/plugin/db/batch/source/DBSource.java b/database-plugins/src/main/java/io/cdap/plugin/db/batch/source/DBSource.java
index f918bda57..380cf43f1 100644
--- a/database-plugins/src/main/java/io/cdap/plugin/db/batch/source/DBSource.java
+++ b/database-plugins/src/main/java/io/cdap/plugin/db/batch/source/DBSource.java
@@ -47,11 +47,11 @@
 import io.cdap.plugin.common.ReferenceBatchSource;
 import io.cdap.plugin.common.ReferencePluginConfig;
 import io.cdap.plugin.common.SourceInputFormatProvider;
+import io.cdap.plugin.common.db.DBErrorDetailsProvider;
 import io.cdap.plugin.common.db.DBUtils;
 import io.cdap.plugin.common.db.DriverCleanup;
 import io.cdap.plugin.db.batch.TransactionIsolationLevel;
 import io.cdap.plugin.db.common.DBBaseConfig;
-import io.cdap.plugin.db.common.DBErrorDetailsProvider;
 import io.cdap.plugin.db.common.FQNGenerator;
 import io.cdap.plugin.db.connector.DBConnector;
 import io.cdap.plugin.db.connector.DBConnectorConfig;
diff --git a/database-plugins/src/main/java/io/cdap/plugin/db/common/DBErrorDetailsProvider.java b/hydrator-common/src/main/java/io/cdap/plugin/common/db/DBErrorDetailsProvider.java
similarity index 99%
rename from database-plugins/src/main/java/io/cdap/plugin/db/common/DBErrorDetailsProvider.java
rename to hydrator-common/src/main/java/io/cdap/plugin/common/db/DBErrorDetailsProvider.java
index c4edc1b77..4e5ad7240 100644
--- a/database-plugins/src/main/java/io/cdap/plugin/db/common/DBErrorDetailsProvider.java
+++ b/hydrator-common/src/main/java/io/cdap/plugin/common/db/DBErrorDetailsProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package io.cdap.plugin.db.common;
+package io.cdap.plugin.common.db;
 
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;