diff --git a/fluid/ce_demo/kpi.py b/fluid/ce_demo/kpi.py
deleted file mode 100644
index 970f498463fecf22ed8942b276d4a01b164725b4..0000000000000000000000000000000000000000
--- a/fluid/ce_demo/kpi.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# this file is copied from CE
-# it can also shared to models from CE in some other ways, such as wget.
-# it can only take effect in CE environment.
diff --git a/fluid/ce_demo/mnist_directory_in_ce/latest_kpis/some_kpi.txt b/fluid/ce_demo/mnist_directory_in_ce/latest_kpis/some_kpi.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/fluid/ce_demo/mnist_directory_in_ce/run.xsh b/fluid/ce_demo/mnist_directory_in_ce/run.xsh
deleted file mode 100755
index 0ea19f9d71e211bd545cd84cdeff687af1667f53..0000000000000000000000000000000000000000
--- a/fluid/ce_demo/mnist_directory_in_ce/run.xsh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd $mnist_model_in_models
-
-./.run_ce.sh
diff --git a/fluid/ce_demo/mnist/.run_ce.sh b/fluid/mnist/.run_ce.sh
similarity index 100%
rename from fluid/ce_demo/mnist/.run_ce.sh
rename to fluid/mnist/.run_ce.sh
diff --git a/fluid/ce_demo/mnist/_ce.py b/fluid/mnist/_ce.py
similarity index 82%
rename from fluid/ce_demo/mnist/_ce.py
rename to fluid/mnist/_ce.py
index 0bc4b02ba535e7687bfc6efd428653c3f791d8f9..d419bcf655e13ae5ad23f1201b4986f95381791d 100644
--- a/fluid/ce_demo/mnist/_ce.py
+++ b/fluid/mnist/_ce.py
@@ -35,11 +35,13 @@ def parse_log(log):
     train_acc\t1.2
     "
     '''
-    for line in log.split():
+    #kpi_map = {}
+    for line in log.split('\n'):
         fs = line.strip().split('\t')
-        if len(fs) == 2:
-            kpi_name = fs[0]
-            kpi_value = float(fs[1])
+        print (fs)
+        if len(fs) == 3 and fs[0] == 'kpis':
+            kpi_name = fs[1]
+            kpi_value = float(fs[2])
             yield kpi_name, kpi_value
 
 
@@ -49,7 +51,9 @@ def log_to_ce(log):
         kpi_tracker[kpi.name] = kpi
 
     for (kpi_name, kpi_value) in parse_log(log):
+        print (kpi_name, kpi_value)
         kpi_tracker[kpi_name].add_record(kpi_value)
+        kpi_tracker[kpi_name].persist()
 
 
 if __name__ == '__main__':
diff --git a/fluid/ce_demo/mnist/model.py b/fluid/mnist/model.py
similarity index 94%
rename from fluid/ce_demo/mnist/model.py
rename to fluid/mnist/model.py
index b75ccc0d3c03c5252453f66469262c07ab32e41b..8ab8f985303742e673b2e3df71a13635e512a34b 100644
--- a/fluid/ce_demo/mnist/model.py
+++ b/fluid/mnist/model.py
@@ -181,15 +181,10 @@ def run_benchmark(model, args):
             "pass=%d, train_avg_acc=%f,train_avg_loss=%f, test_avg_acc=%f, elapse=%f"
             % (pass_id, train_avg_acc, train_avg_loss, test_avg_acc,
                (pass_end - pass_start)))
-
-        with open("train_acc_factor.txt", 'a+') as f:
-            f.write("%s\n" % train_avg_acc)
-        with open("train_cost_factor.txt", 'a+') as f:
-            f.write('%s\n' % [train_avg_loss])
-        with open("test_acc_factor.txt", 'a+') as f:
-            f.write("%s\n" % test_avg_acc)
-        with open("train_duration_factor.txt", 'a+') as f:
-            f.write('%s\n' % [pass_end - pass_start])
+        print ("kpis	train_acc	%f" % train_avg_acc)
+        print ("kpis	train_cost	%f" % train_avg_loss)  
+        print ("kpis	test_acc	%f" % test_avg_acc)  
+        print ("kpis	train_duration	%f" % (pass_end - pass_start))  
 
 
 if __name__ == '__main__':