diff --git a/ambry-api/src/main/java/com/github/ambry/clustermap/FileStoreException.java b/ambry-api/src/main/java/com/github/ambry/store/FileStoreException.java
similarity index 98%
rename from ambry-api/src/main/java/com/github/ambry/clustermap/FileStoreException.java
rename to ambry-api/src/main/java/com/github/ambry/store/FileStoreException.java
index f2aa7e41e5..021dc5bd52 100644
--- a/ambry-api/src/main/java/com/github/ambry/clustermap/FileStoreException.java
+++ b/ambry-api/src/main/java/com/github/ambry/store/FileStoreException.java
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  */
 
-package com.github.ambry.clustermap;
+package com.github.ambry.store;
 
 /**
  * Custom exception class for FileStore-related errors.
diff --git a/ambry-store/src/main/java/com/github/ambry/store/FileStore.java b/ambry-store/src/main/java/com/github/ambry/store/FileStore.java
index ea75f2a97d..69d01b6a3c 100644
--- a/ambry-store/src/main/java/com/github/ambry/store/FileStore.java
+++ b/ambry-store/src/main/java/com/github/ambry/store/FileStore.java
@@ -14,7 +14,6 @@
 
 package com.github.ambry.store;
 
-import com.github.ambry.clustermap.FileStoreException;
 import com.github.ambry.config.FileCopyConfig;
 import com.github.ambry.utils.CrcInputStream;
 import com.github.ambry.utils.CrcOutputStream;
@@ -35,7 +34,7 @@
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.List;
-import com.github.ambry.clustermap.FileStoreException.FileStoreErrorCode;
+import com.github.ambry.store.FileStoreException.FileStoreErrorCode;
 import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -195,7 +194,8 @@ public void putChunkToFile(String outputFilePath, DataInputStream dataInputStrea
     int fileSize = dataInputStream.available();
     byte[] content = Utils.readBytesFromStream(dataInputStream, fileSize);
 
-    // Write content to file with create and append options
+    // Write content to file with create and append options, which will create a new file if file doesn't exist
+    // and append to the existing file if file exists
     Files.write(Paths.get(outputFilePath), content,
                 StandardOpenOption.CREATE, StandardOpenOption.APPEND);
 
diff --git a/ambry-store/src/test/java/com/github/ambry/store/FileStoreTest.java b/ambry-store/src/test/java/com/github/ambry/store/FileStoreTest.java
index 26d4b1c96a..26e482f9c9 100644
--- a/ambry-store/src/test/java/com/github/ambry/store/FileStoreTest.java
+++ b/ambry-store/src/test/java/com/github/ambry/store/FileStoreTest.java
@@ -13,13 +13,11 @@
  */
 package com.github.ambry.store;
 
-import com.github.ambry.clustermap.FileStoreException;
 import com.github.ambry.config.FileCopyConfig;
 import com.github.ambry.config.VerifiableProperties;
 import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.RandomAccessFile;