diff --git a/paddle/math/Function.cpp b/paddle/function/Function.cpp
similarity index 100%
rename from paddle/math/Function.cpp
rename to paddle/function/Function.cpp
diff --git a/paddle/math/Function.h b/paddle/function/Function.h
similarity index 100%
rename from paddle/math/Function.h
rename to paddle/function/Function.h
diff --git a/paddle/math/cross_map_normal_op.cpp b/paddle/function/cross_map_normal_op.cpp
similarity index 100%
rename from paddle/math/cross_map_normal_op.cpp
rename to paddle/function/cross_map_normal_op.cpp
diff --git a/paddle/math/cross_map_normal_op.h b/paddle/function/cross_map_normal_op.h
similarity index 100%
rename from paddle/math/cross_map_normal_op.h
rename to paddle/function/cross_map_normal_op.h
diff --git a/paddle/math/cross_map_normal_op_gpu.cu b/paddle/function/cross_map_normal_op_gpu.cu
similarity index 100%
rename from paddle/math/cross_map_normal_op_gpu.cu
rename to paddle/function/cross_map_normal_op_gpu.cu
diff --git a/paddle/gserver/layers/NormProjectionLayer.cpp b/paddle/gserver/layers/NormProjectionLayer.cpp
index d6923c2192cf189749c9a2137e1bc63f1d4b0932..e69c40699305466261b5febf0588c94597e04d25 100644
--- a/paddle/gserver/layers/NormProjectionLayer.cpp
+++ b/paddle/gserver/layers/NormProjectionLayer.cpp
@@ -13,7 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "NormProjectionLayer.h"
-#include "paddle/math/cross_map_normal_op.h"
 #include "paddle/utils/Logging.h"
 #include "paddle/utils/Stat.h"
 
diff --git a/paddle/gserver/layers/NormProjectionLayer.h b/paddle/gserver/layers/NormProjectionLayer.h
index 82aa427f8d425da0d91251365a3762bd3e50700b..3c4876ece609e70393e92b14d33a9bc6f13136c9 100644
--- a/paddle/gserver/layers/NormProjectionLayer.h
+++ b/paddle/gserver/layers/NormProjectionLayer.h
@@ -16,7 +16,7 @@ limitations under the License. */
 
 #include <vector>
 #include "NormLayer.h"
-#include "paddle/math/Function.h"
+#include "paddle/function/Function.h"
 #include "paddle/math/Matrix.h"
 
 namespace paddle {
diff --git a/paddle/math/tests/test_matrixCompare.cpp b/paddle/math/tests/test_matrixCompare.cpp
index bc146514572a4df301d19cf0afa44ef527dd445d..da7a585484e7ee1f6579732206d3cafa109bd3cb 100644
--- a/paddle/math/tests/test_matrixCompare.cpp
+++ b/paddle/math/tests/test_matrixCompare.cpp
@@ -18,11 +18,10 @@ limitations under the License. */
 
 #include <gtest/gtest.h>
 #include "TensorCheck.h"
+#include "paddle/function/Function.h"
 #include "paddle/gserver/tests/TestUtil.h"
-#include "paddle/math/Function.h"
 #include "paddle/math/Matrix.h"
 #include "paddle/math/SparseMatrix.h"
-#include "paddle/math/cross_map_normal_op.h"
 #include "paddle/utils/Stat.h"
 #include "paddle/utils/Util.h"