diff --git a/clone-detector/sourcerer-cc.properties b/clone-detector/sourcerer-cc.properties
index 2dd958948..40f788cf9 100644
--- a/clone-detector/sourcerer-cc.properties
+++ b/clone-detector/sourcerer-cc.properties
@@ -1,7 +1,7 @@
 #Sourcerer-CC-D specific
 NODE_PREFIX=NODE
-QUERY_DIR_PATH=${NODE_PREFIX}/query
-OUTPUT_DIR=${NODE_PREFIX}/output
+QUERY_DIR_PATH=query
+OUTPUT_DIR=output
 DATASET_DIR_PATH=input/dataset
 IS_GEN_CANDIDATE_STATISTICS=false
 IS_STATUS_REPORTER_ON=true
diff --git a/clone-detector/src/com/mondego/indexbased/SearchManager.java b/clone-detector/src/com/mondego/indexbased/SearchManager.java
index 56175fa9d..5b08bcaf4 100644
--- a/clone-detector/src/com/mondego/indexbased/SearchManager.java
+++ b/clone-detector/src/com/mondego/indexbased/SearchManager.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import net.jmatrix.eproperties.EProperties;
+import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
@@ -105,7 +105,7 @@ public class SearchManager {
     // private List<FSDirectory> invertedIndexDirectories;
     // private List<FSDirectory> forwardIndexDirectories;
     public static List<IndexWriter> indexerWriters;
-    private static EProperties properties = new EProperties();
+    private static Properties properties = new Properties();
 
     public static Object lock = new Object();
     private int qlq_thread_count;
@@ -314,9 +314,9 @@ public static void main(String[] args)
                     properties.getProperty("IS_STATUS_REPORTER_ON"));
             SearchManager.NODE_PREFIX = properties.getProperty("NODE_PREFIX")
                     .toUpperCase();
-            SearchManager.OUTPUT_DIR = SearchManager.ROOT_DIR
+            SearchManager.OUTPUT_DIR = SearchManager.ROOT_DIR + SearchManager.NODE_PREFIX + "/"
                     + properties.getProperty("OUTPUT_DIR");
-            SearchManager.QUERY_DIR_PATH = SearchManager.ROOT_DIR
+            SearchManager.QUERY_DIR_PATH = SearchManager.ROOT_DIR + SearchManager.NODE_PREFIX + "/"
                     + properties.getProperty("QUERY_DIR_PATH");
             logger.debug("Query path:" + SearchManager.QUERY_DIR_PATH);
             SearchManager.LOG_PROCESSED_LINENUMBER_AFTER_X_LINES = Integer