diff --git a/ddl/ddl.go b/ddl/ddl.go
index 96624e694f..c917d2ab7e 100644
--- a/ddl/ddl.go
+++ b/ddl/ddl.go
@@ -27,12 +27,12 @@ import (
 	"github.com/ngaut/log"
 	"github.com/pingcap/tidb/column"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/model"
 	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/parser/coldef"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/table"
diff --git a/expression/builtin/builtin.go b/evaluator/builtin/builtin.go
similarity index 100%
rename from expression/builtin/builtin.go
rename to evaluator/builtin/builtin.go
diff --git a/expression/builtin/builtin_test.go b/evaluator/builtin/builtin_test.go
similarity index 100%
rename from expression/builtin/builtin_test.go
rename to evaluator/builtin/builtin_test.go
diff --git a/expression/builtin/control.go b/evaluator/builtin/control.go
similarity index 100%
rename from expression/builtin/control.go
rename to evaluator/builtin/control.go
diff --git a/expression/builtin/control_test.go b/evaluator/builtin/control_test.go
similarity index 100%
rename from expression/builtin/control_test.go
rename to evaluator/builtin/control_test.go
diff --git a/expression/builtin/info.go b/evaluator/builtin/info.go
similarity index 100%
rename from expression/builtin/info.go
rename to evaluator/builtin/info.go
diff --git a/expression/builtin/info_test.go b/evaluator/builtin/info_test.go
similarity index 100%
rename from expression/builtin/info_test.go
rename to evaluator/builtin/info_test.go
diff --git a/expression/builtin/math.go b/evaluator/builtin/math.go
similarity index 100%
rename from expression/builtin/math.go
rename to evaluator/builtin/math.go
diff --git a/expression/builtin/math_test.go b/evaluator/builtin/math_test.go
similarity index 100%
rename from expression/builtin/math_test.go
rename to evaluator/builtin/math_test.go
diff --git a/expression/builtin/string.go b/evaluator/builtin/string.go
similarity index 100%
rename from expression/builtin/string.go
rename to evaluator/builtin/string.go
diff --git a/expression/builtin/string_test.go b/evaluator/builtin/string_test.go
similarity index 100%
rename from expression/builtin/string_test.go
rename to evaluator/builtin/string_test.go
diff --git a/expression/builtin/time.go b/evaluator/builtin/time.go
similarity index 100%
rename from expression/builtin/time.go
rename to evaluator/builtin/time.go
diff --git a/expression/builtin/time_test.go b/evaluator/builtin/time_test.go
similarity index 100%
rename from expression/builtin/time_test.go
rename to evaluator/builtin/time_test.go
diff --git a/optimizer/evaluator/evaluator.go b/evaluator/evaluator.go
similarity index 99%
rename from optimizer/evaluator/evaluator.go
rename to evaluator/evaluator.go
index 7a2ef49b04..7521a6d7ad 100644
--- a/optimizer/evaluator/evaluator.go
+++ b/evaluator/evaluator.go
@@ -22,7 +22,7 @@ import (
 	"github.com/ngaut/log"
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/context"
-	"github.com/pingcap/tidb/expression/builtin"
+	"github.com/pingcap/tidb/evaluator/builtin"
 	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/sessionctx/variable"
diff --git a/optimizer/evaluator/evaluator_binop.go b/evaluator/evaluator_binop.go
similarity index 100%
rename from optimizer/evaluator/evaluator_binop.go
rename to evaluator/evaluator_binop.go
diff --git a/optimizer/evaluator/evaluator_like.go b/evaluator/evaluator_like.go
similarity index 100%
rename from optimizer/evaluator/evaluator_like.go
rename to evaluator/evaluator_like.go
diff --git a/optimizer/evaluator/evaluator_test.go b/evaluator/evaluator_test.go
similarity index 100%
rename from optimizer/evaluator/evaluator_test.go
rename to evaluator/evaluator_test.go
diff --git a/optimizer/evaluator/helper.go b/evaluator/helper.go
similarity index 100%
rename from optimizer/evaluator/helper.go
rename to evaluator/helper.go
diff --git a/executor/aggregate_test.go b/executor/aggregate_test.go
index 55174925d3..87198b64da 100644
--- a/executor/aggregate_test.go
+++ b/executor/aggregate_test.go
@@ -16,7 +16,7 @@ package executor
 import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/ast"
-	"github.com/pingcap/tidb/optimizer/evaluator"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/util/mock"
 )
 
diff --git a/executor/executor.go b/executor/executor.go
index 556eb83c2c..2127984deb 100644
--- a/executor/executor.go
+++ b/executor/executor.go
@@ -20,10 +20,10 @@ import (
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/column"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/inspectkv"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/model"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/optimizer/plan"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/db"
diff --git a/executor/executor_simple.go b/executor/executor_simple.go
index 9849b73131..b5d35e37a8 100644
--- a/executor/executor_simple.go
+++ b/executor/executor_simple.go
@@ -20,10 +20,10 @@ import (
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/model"
 	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/db"
 	"github.com/pingcap/tidb/sessionctx/variable"
diff --git a/executor/executor_write.go b/executor/executor_write.go
index 8d827eb14b..96bd047727 100644
--- a/executor/executor_write.go
+++ b/executor/executor_write.go
@@ -21,9 +21,9 @@ import (
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/column"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/table"
diff --git a/executor/prepared.go b/executor/prepared.go
index 3893fb3425..01371246ee 100644
--- a/executor/prepared.go
+++ b/executor/prepared.go
@@ -19,9 +19,9 @@ import (
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/optimizer"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/optimizer/plan"
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/sessionctx"
diff --git a/optimizer/logic.go b/optimizer/logic.go
index 54b8e5f4ac..36070dbf7c 100644
--- a/optimizer/logic.go
+++ b/optimizer/logic.go
@@ -16,7 +16,7 @@ package optimizer
 import (
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/context"
-	"github.com/pingcap/tidb/optimizer/evaluator"
+	"github.com/pingcap/tidb/evaluator"
 )
 
 // logicOptimize does logic optimization works on AST.
diff --git a/table/table.go b/table/table.go
index 1a19de4325..576953f63f 100644
--- a/table/table.go
+++ b/table/table.go
@@ -23,11 +23,11 @@ import (
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/column"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta/autoid"
 	"github.com/pingcap/tidb/model"
 	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/sessionctx/db"
 )
 
diff --git a/table/tables/tables.go b/table/tables/tables.go
index a50e29d2e7..66e0f6aed1 100644
--- a/table/tables/tables.go
+++ b/table/tables/tables.go
@@ -26,11 +26,11 @@ import (
 	"github.com/ngaut/log"
 	"github.com/pingcap/tidb/column"
 	"github.com/pingcap/tidb/context"
+	"github.com/pingcap/tidb/evaluator"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta/autoid"
 	"github.com/pingcap/tidb/model"
 	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/optimizer/evaluator"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/terror"