diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/view/HoodieMetadataException.java b/hudi-common/src/main/java/org/apache/hudi/exception/HoodieMetadataException.java
similarity index 100%
rename from hudi-common/src/main/java/org/apache/hudi/common/table/view/HoodieMetadataException.java
rename to hudi-common/src/main/java/org/apache/hudi/exception/HoodieMetadataException.java
diff --git a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestSqlSource.java b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestSqlSource.java
index 1395ae672508..9c3d5584a5dd 100644
--- a/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestSqlSource.java
+++ b/hudi-utilities/src/test/java/org/apache/hudi/utilities/sources/TestSqlSource.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.hudi.utilities.testutils.sources;
+package org.apache.hudi.utilities.sources;
 
 import org.apache.avro.generic.GenericRecord;
 import org.apache.hadoop.fs.Path;
@@ -26,8 +26,6 @@
 import org.apache.hudi.common.util.Option;
 import org.apache.hudi.utilities.deltastreamer.SourceFormatAdapter;
 import org.apache.hudi.utilities.schema.FilebasedSchemaProvider;
-import org.apache.hudi.utilities.sources.InputBatch;
-import org.apache.hudi.utilities.sources.SqlSource;
 import org.apache.hudi.utilities.testutils.UtilitiesTestBase;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.sql.AnalysisException;