diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..0e40fe8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+
+# Default ignored files
+/workspace.xml
\ No newline at end of file
diff --git a/.idea/AnyQ.iml b/.idea/AnyQ.iml
new file mode 100644
index 0000000..7c9d48f
--- /dev/null
+++ b/.idea/AnyQ.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="pytest" />
+    <option name="PROJECT_TEST_RUNNER" value="pytest" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..65531ca
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..783807f
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/AnyQ.iml" filepath="$PROJECT_DIR$/.idea/AnyQ.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/tools/simnet/train/tf/examples/bow-pairwise.json b/tools/simnet/train/tf/examples/bow-pairwise.json
index d064d41..408b57c 100755
--- a/tools/simnet/train/tf/examples/bow-pairwise.json
+++ b/tools/simnet/train/tf/examples/bow-pairwise.json
@@ -37,7 +37,7 @@
     },
 
     "test_data": {
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file": "model/pairwise/bow.epoch1",
         "test_result": "result_bow_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/bow-pointwise.json b/tools/simnet/train/tf/examples/bow-pointwise.json
index 2e07eac..1af7c39 100755
--- a/tools/simnet/train/tf/examples/bow-pointwise.json
+++ b/tools/simnet/train/tf/examples/bow-pointwise.json
@@ -36,7 +36,7 @@
     },
 
     "test_data": {
-        "test_file": "data/convert_test_point_data",
+        "test_file": "data/convert_test_pointwise_data",
         "test_model_file": "model/pointwise/bow.epoch1",
         "test_result": "result_bow_pointwise"
     },
diff --git a/tools/simnet/train/tf/examples/cnn-pairwise.json b/tools/simnet/train/tf/examples/cnn-pairwise.json
index f6b9d85..128893b 100755
--- a/tools/simnet/train/tf/examples/cnn-pairwise.json
+++ b/tools/simnet/train/tf/examples/cnn-pairwise.json
@@ -38,7 +38,7 @@
     },
 
     "test_data":{
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file":  "model/pairwise/cnn.epoch1",
         "test_result": "result_cnn_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/knrm-pairwise.json b/tools/simnet/train/tf/examples/knrm-pairwise.json
index 38a2067..a88a878 100755
--- a/tools/simnet/train/tf/examples/knrm-pairwise.json
+++ b/tools/simnet/train/tf/examples/knrm-pairwise.json
@@ -1,6 +1,6 @@
 {
     "train_data": {
-        "train_file": "data/convert_train_pair_data",
+        "train_file": "data/convert_train_pairwise_data",
         "data_size": 62,
         "left_slots": [["left", 32]],
         "right_slots": [["right", 32]]
@@ -37,7 +37,7 @@
     },
 
     "test_data": {
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file": "model/pairwise/knrm.epoch1",
         "test_result": "result_knrm_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/knrm-pointwise.json b/tools/simnet/train/tf/examples/knrm-pointwise.json
index 4d1b989..e3ac146 100755
--- a/tools/simnet/train/tf/examples/knrm-pointwise.json
+++ b/tools/simnet/train/tf/examples/knrm-pointwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file":"data/convert_train_point_data",
+        "train_file":"data/convert_train_pointwise_data",
         "data_size":400,
         "left_slots":[["left",32]],
         "right_slots":[["right",32]]
diff --git a/tools/simnet/train/tf/examples/lstm-pairwise.json b/tools/simnet/train/tf/examples/lstm-pairwise.json
index 56186e3..d0fdf56 100755
--- a/tools/simnet/train/tf/examples/lstm-pairwise.json
+++ b/tools/simnet/train/tf/examples/lstm-pairwise.json
@@ -37,7 +37,7 @@
     },
 
     "test_data":{
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file":  "model/pairwise/lstm.epoch1",
         "test_result": "result_lstm_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/mmdnn-pairwise.json b/tools/simnet/train/tf/examples/mmdnn-pairwise.json
index ac358f9..34391b3 100755
--- a/tools/simnet/train/tf/examples/mmdnn-pairwise.json
+++ b/tools/simnet/train/tf/examples/mmdnn-pairwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file": "data/convert_train_pair_data",
+        "train_file": "data/convert_train_pairwise_data",
         "data_size": 62,
         "left_slots" : [["left",32]],
         "right_slots" : [["right",32]]
@@ -43,7 +43,7 @@
     },
 
     "test_data":{
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file":  "model/pairwise/mmdnn.epoch1",
         "test_result": "result_mmdnn_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/mmdnn-pointwise.json b/tools/simnet/train/tf/examples/mmdnn-pointwise.json
index e9f5e57..a742ff2 100755
--- a/tools/simnet/train/tf/examples/mmdnn-pointwise.json
+++ b/tools/simnet/train/tf/examples/mmdnn-pointwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file": "data/convert_train_point_data",
+        "train_file": "data/convert_train_pointwise_data",
         "data_size": 400,
         "left_slots" : [["left",32]],
         "right_slots" : [["right",32]]
diff --git a/tools/simnet/train/tf/examples/mvlstm-pairwise.json b/tools/simnet/train/tf/examples/mvlstm-pairwise.json
index 8792c7b..fced8ea 100755
--- a/tools/simnet/train/tf/examples/mvlstm-pairwise.json
+++ b/tools/simnet/train/tf/examples/mvlstm-pairwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file": "data/convert_train_pair_data",
+        "train_file": "data/convert_train_pairwise_data",
         "data_size": 62,
         "left_slots" : [["left",32]],
         "right_slots" : [["right",32]]
@@ -38,7 +38,7 @@
     },
 
     "test_data":{
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file":  "model/pairwise/mvlstm.epoch1",
         "test_result": "result_mvlstm_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/mvlstm-pointwise.json b/tools/simnet/train/tf/examples/mvlstm-pointwise.json
index dc13d8e..a3b81f1 100755
--- a/tools/simnet/train/tf/examples/mvlstm-pointwise.json
+++ b/tools/simnet/train/tf/examples/mvlstm-pointwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file": "data/convert_train_point_data",
+        "train_file": "data/convert_train_pointwise_data",
         "data_size": 400,
         "left_slots" : [["left",32]],
         "right_slots" : [["right",32]]
diff --git a/tools/simnet/train/tf/examples/pyramid-pairwise.json b/tools/simnet/train/tf/examples/pyramid-pairwise.json
index d7c68d3..9ca5bf9 100755
--- a/tools/simnet/train/tf/examples/pyramid-pairwise.json
+++ b/tools/simnet/train/tf/examples/pyramid-pairwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file": "data/convert_train_pair_data",
+        "train_file": "data/convert_train_pairwise_data",
         "data_size": 62,
         "left_slots" : [["left",32]],
         "right_slots" : [["right",32]]
@@ -42,7 +42,7 @@
     },
 
     "test_data":{
-        "test_file": "data/convert_test_pair_data",
+        "test_file": "data/convert_test_pairwise_data",
         "test_model_file":  "model/pairwise/pyramid.epoch1",
         "test_result": "result_pyramid_pairwise"
     },
diff --git a/tools/simnet/train/tf/examples/pyramid-pointwise.json b/tools/simnet/train/tf/examples/pyramid-pointwise.json
index 50f676e..f0d2447 100755
--- a/tools/simnet/train/tf/examples/pyramid-pointwise.json
+++ b/tools/simnet/train/tf/examples/pyramid-pointwise.json
@@ -1,6 +1,6 @@
 {
     "train_data":{
-        "train_file": "data/convert_train_point_data",
+        "train_file": "data/convert_train_pointwise_data",
         "data_size": 400,
         "left_slots" : [["left",32]],
         "right_slots" : [["right",32]]