diff --git a/.gitignore b/.gitignore
index 1512c1438e9e0b0b7b6e0c273a24b273cb652b04..7480bd53a403d74932d56409fdb0a9dd7bb6b9d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ third_party/
 cmake-build-*
 
 # generated while compiling
-python/paddle/v2/framework/core.so
+python/paddle/v2/fluid/core.so
 paddle/pybind/pybind.h
 CMakeFiles
 cmake_install.cmake
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 32578ad7799c0a276972ccef7770c2eae8438069..c8632295a25b160513a8e154bf1a5453c0005031 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -37,10 +37,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
 
 
-add_custom_command(OUTPUT ${PADDLE_SOURCE_DIR}/python/paddle/v2/framework/core.so
-        COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${PADDLE_SOURCE_DIR}/python/paddle/v2/framework/core.so
+add_custom_command(OUTPUT ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/core.so
+        COMMAND cmake -E copy $<TARGET_FILE:paddle_pybind> ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/core.so
         DEPENDS paddle_pybind)
-add_custom_target(copy_paddle_pybind ALL DEPENDS ${PADDLE_SOURCE_DIR}/python/paddle/v2/framework/core.so)
+add_custom_target(copy_paddle_pybind ALL DEPENDS ${PADDLE_SOURCE_DIR}/python/paddle/v2/fluid/core.so)
 
 
 add_custom_command(OUTPUT ${PADDLE_PYTHON_BUILD_DIR}/.timestamp
@@ -66,7 +66,7 @@ if (WITH_TESTING)
     add_subdirectory(paddle/v2/tests)
     add_subdirectory(paddle/v2/reader/tests)
     add_subdirectory(paddle/v2/plot/tests)
-    add_subdirectory(paddle/v2/framework/tests)
+    add_subdirectory(paddle/v2/fluid/tests)
   endif()
 endif()
 install(DIRECTORY ${PADDLE_PYTHON_PACKAGE_DIR}
diff --git a/python/paddle/v2/framework/.gitignore b/python/paddle/v2/fluid/.gitignore
similarity index 100%
rename from python/paddle/v2/framework/.gitignore
rename to python/paddle/v2/fluid/.gitignore
diff --git a/python/paddle/v2/framework/__init__.py b/python/paddle/v2/fluid/__init__.py
similarity index 100%
rename from python/paddle/v2/framework/__init__.py
rename to python/paddle/v2/fluid/__init__.py
diff --git a/python/paddle/v2/framework/backward.py b/python/paddle/v2/fluid/backward.py
similarity index 97%
rename from python/paddle/v2/framework/backward.py
rename to python/paddle/v2/fluid/backward.py
index 678efd5d20585355a684bb2df16fdb57a69e0eeb..f188582178f667125ec95cd230100fdb10ce7e88 100644
--- a/python/paddle/v2/framework/backward.py
+++ b/python/paddle/v2/fluid/backward.py
@@ -1,4 +1,4 @@
-from paddle.v2.framework import framework as framework
+from paddle.v2.fluid import framework as framework
 
 __all__ = ['append_backward_ops']
 
diff --git a/python/paddle/v2/framework/default_scope_funcs.py b/python/paddle/v2/fluid/default_scope_funcs.py
similarity index 92%
rename from python/paddle/v2/framework/default_scope_funcs.py
rename to python/paddle/v2/fluid/default_scope_funcs.py
index c07f9a6ab96ac86fd6d20fbe0bc560845107f063..60c6165b6bd959f7bb3d92afed667f00f73f144f 100644
--- a/python/paddle/v2/framework/default_scope_funcs.py
+++ b/python/paddle/v2/fluid/default_scope_funcs.py
@@ -13,7 +13,7 @@ A `scoped_function` will take a `function` as input. That function will be
 invoked in a new local scope. 
 """
 
-import paddle.v2.framework.core
+import paddle.v2.fluid.core
 import threading
 
 __tl_scope__ = threading.local()
@@ -27,13 +27,13 @@ __all__ = [
 def get_cur_scope():
     """
     Get current scope.
-    :rtype: paddle.v2.framework.core.Scope
+    :rtype: paddle.v2.fluid.core.Scope
     """
     cur_scope_stack = getattr(__tl_scope__, 'cur_scope', None)
     if cur_scope_stack is None:
         __tl_scope__.cur_scope = list()
     if len(__tl_scope__.cur_scope) == 0:
-        __tl_scope__.cur_scope.append(paddle.v2.framework.core.Scope())
+        __tl_scope__.cur_scope.append(paddle.v2.fluid.core.Scope())
     return __tl_scope__.cur_scope[-1]
 
 
diff --git a/python/paddle/v2/framework/evaluator.py b/python/paddle/v2/fluid/evaluator.py
similarity index 94%
rename from python/paddle/v2/framework/evaluator.py
rename to python/paddle/v2/fluid/evaluator.py
index 254dd5f1a33eef17ad7a0117541255a4399ef23c..180d0135ffe8fa8982cfcde242033b5a69eed1cf 100644
--- a/python/paddle/v2/framework/evaluator.py
+++ b/python/paddle/v2/fluid/evaluator.py
@@ -1,6 +1,6 @@
-import paddle.v2.framework.op as op
+import paddle.v2.fluid.op as op
 import numpy as np
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 def avg_accumulate(accumulated_var, per_eval, num_batches, place):
@@ -22,7 +22,7 @@ class Evaluator(object):
         NOTE: default run on CPUPlace(), running on GPUPlace doesn't improve performance much.
 
         :param scope: the scope instance contains the input.
-        :type scope: paddle.v2.framework.core.scope
+        :type scope: paddle.v2.fluid.core.scope
         :param operator: operator name for caculating the evaluation for each mini-batch.
         :type operator: string
         :param input: output variable name of forward network.
diff --git a/python/paddle/v2/framework/executor.py b/python/paddle/v2/fluid/executor.py
similarity index 94%
rename from python/paddle/v2/framework/executor.py
rename to python/paddle/v2/fluid/executor.py
index f5c833190e73a277bef2509e02c4be051768933d..ed1c2c06daa7ede97e138049a1f7044d071c31e8 100644
--- a/python/paddle/v2/framework/executor.py
+++ b/python/paddle/v2/fluid/executor.py
@@ -1,5 +1,5 @@
-import paddle.v2.framework.core as core
-from paddle.v2.framework.framework import Block, Program, g_main_program
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.framework import Block, Program, g_main_program
 
 g_scope = core.Scope()
 
diff --git a/python/paddle/v2/framework/framework.py b/python/paddle/v2/fluid/framework.py
similarity index 99%
rename from python/paddle/v2/framework/framework.py
rename to python/paddle/v2/fluid/framework.py
index 0e6f083e5ba25f4c64fe6988965de93be1d1688b..e2587b4f74506c6eb2b253fa9b24db4838bfedbc 100644
--- a/python/paddle/v2/framework/framework.py
+++ b/python/paddle/v2/fluid/framework.py
@@ -1,5 +1,5 @@
-import paddle.v2.framework.core as core
-import paddle.v2.framework.proto.framework_pb2 as framework_pb2
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
 import collections
 import numpy as np
 import copy
diff --git a/python/paddle/v2/framework/initializer.py b/python/paddle/v2/fluid/initializer.py
similarity index 99%
rename from python/paddle/v2/framework/initializer.py
rename to python/paddle/v2/fluid/initializer.py
index 98a87bfa86efb39f381b9f99b2b1f0d7ec7d9833..ded144ecd5db83ce50ca0dc6243fdc52ac0b7a2f 100644
--- a/python/paddle/v2/framework/initializer.py
+++ b/python/paddle/v2/fluid/initializer.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.framework as framework
+import paddle.v2.fluid.framework as framework
 import numpy as np
 
 __all__ = [
diff --git a/python/paddle/v2/framework/io.py b/python/paddle/v2/fluid/io.py
similarity index 98%
rename from python/paddle/v2/framework/io.py
rename to python/paddle/v2/fluid/io.py
index 5c247904a330e25b1a9f53db431947840db3f615..394a171c67a99ffb0c7caaf71e850fe541f8286e 100644
--- a/python/paddle/v2/framework/io.py
+++ b/python/paddle/v2/fluid/io.py
@@ -1,7 +1,7 @@
 import os
 import cPickle as pickle
 
-from paddle.v2.framework.framework import Program, Parameter, g_main_program, \
+from paddle.v2.fluid.framework import Program, Parameter, g_main_program, \
     Variable
 
 __all__ = [
diff --git a/python/paddle/v2/framework/layer_helper.py b/python/paddle/v2/fluid/layer_helper.py
similarity index 98%
rename from python/paddle/v2/framework/layer_helper.py
rename to python/paddle/v2/fluid/layer_helper.py
index 552976185dfc2ece8689ae4dceb3bb3a68a27ea7..9dc3c119ea47ca11956d85119ce1ec6d3d6bb7e8 100644
--- a/python/paddle/v2/framework/layer_helper.py
+++ b/python/paddle/v2/fluid/layer_helper.py
@@ -1,9 +1,9 @@
 import copy
 import itertools
 
-from paddle.v2.framework.framework import Variable, g_main_program, \
+from paddle.v2.fluid.framework import Variable, g_main_program, \
     g_startup_program, unique_name, Program
-from paddle.v2.framework.initializer import ConstantInitializer, \
+from paddle.v2.fluid.initializer import ConstantInitializer, \
     UniformInitializer, XavierInitializer
 
 
diff --git a/python/paddle/v2/framework/layers.py b/python/paddle/v2/fluid/layers.py
similarity index 99%
rename from python/paddle/v2/framework/layers.py
rename to python/paddle/v2/fluid/layers.py
index 4d97a8e234e6e1b1cd9487a692bf854123a85fca..8a1aa1c42d5a006539d221f96e3535434c9a4c43 100644
--- a/python/paddle/v2/framework/layers.py
+++ b/python/paddle/v2/fluid/layers.py
@@ -1,10 +1,10 @@
-import paddle.v2.framework.core as core
-import paddle.v2.framework.proto.framework_pb2 as framework_pb2
-from paddle.v2.framework.framework import OpProtoHolder, Variable, Program, \
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
+from paddle.v2.fluid.framework import OpProtoHolder, Variable, Program, \
     Operator
-from paddle.v2.framework.initializer import ConstantInitializer, \
+from paddle.v2.fluid.initializer import ConstantInitializer, \
     NormalInitializer
-from paddle.v2.framework.layer_helper import LayerHelper, unique_name
+from paddle.v2.fluid.layer_helper import LayerHelper, unique_name
 import re
 import cStringIO
 
diff --git a/python/paddle/v2/framework/net_drawer.py b/python/paddle/v2/fluid/net_drawer.py
similarity index 96%
rename from python/paddle/v2/framework/net_drawer.py
rename to python/paddle/v2/fluid/net_drawer.py
index 045e267c253e2485e75df3fb95cc0e591ee29ea5..17ad547c2bb5b79ef8225dd1a8f1ef49a6572508 100644
--- a/python/paddle/v2/framework/net_drawer.py
+++ b/python/paddle/v2/fluid/net_drawer.py
@@ -3,8 +3,8 @@ import json
 import logging
 from collections import defaultdict
 
-import paddle.v2.framework.core as core
-import paddle.v2.framework.proto.framework_pb2 as framework_pb2
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
diff --git a/python/paddle/v2/framework/nets.py b/python/paddle/v2/fluid/nets.py
similarity index 98%
rename from python/paddle/v2/framework/nets.py
rename to python/paddle/v2/fluid/nets.py
index 725d2fa7f5e7a862eea0ef9172a9e63858ebd0dd..5e14ca594bc7965dc29039ba57bb7b26b1ce6871 100644
--- a/python/paddle/v2/framework/nets.py
+++ b/python/paddle/v2/fluid/nets.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.layers as layers
+import paddle.v2.fluid.layers as layers
 
 __all__ = ["simple_img_conv_pool", "sequence_conv_pool"]
 
diff --git a/python/paddle/v2/framework/op.py b/python/paddle/v2/fluid/op.py
similarity index 98%
rename from python/paddle/v2/framework/op.py
rename to python/paddle/v2/fluid/op.py
index bc771a964adf9f97cbeae87c06ce954c76051150..5828803497ec06bc7644da18ca752f61469ca53f 100644
--- a/python/paddle/v2/framework/op.py
+++ b/python/paddle/v2/fluid/op.py
@@ -1,5 +1,5 @@
-import paddle.v2.framework.core as core
-import paddle.v2.framework.proto.framework_pb2 as framework_pb2
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
 
 
 def get_all_op_protos():
diff --git a/python/paddle/v2/framework/optimizer.py b/python/paddle/v2/fluid/optimizer.py
similarity index 98%
rename from python/paddle/v2/framework/optimizer.py
rename to python/paddle/v2/fluid/optimizer.py
index f06c0fb98d572fb54a85996668cc6f32726ec9de..4252a6f08509fec92ac5c45d32169232e1dd190f 100644
--- a/python/paddle/v2/framework/optimizer.py
+++ b/python/paddle/v2/fluid/optimizer.py
@@ -1,11 +1,11 @@
 from collections import defaultdict
 
-import paddle.v2.framework.framework as framework
-from paddle.v2.framework.framework import unique_name, Program
-from paddle.v2.framework.backward import append_backward_ops
-from paddle.v2.framework.initializer import ConstantInitializer
-from paddle.v2.framework.regularizer import append_regularization_ops
-from paddle.v2.framework.layer_helper import LayerHelper
+import paddle.v2.fluid.framework as framework
+from paddle.v2.fluid.framework import unique_name, Program
+from paddle.v2.fluid.backward import append_backward_ops
+from paddle.v2.fluid.initializer import ConstantInitializer
+from paddle.v2.fluid.regularizer import append_regularization_ops
+from paddle.v2.fluid.layer_helper import LayerHelper
 
 __all__ = [
     'SGDOptimizer', 'MomentumOptimizer', 'AdagradOptimizer', 'AdamOptimizer',
diff --git a/python/paddle/v2/framework/regularizer.py b/python/paddle/v2/fluid/regularizer.py
similarity index 98%
rename from python/paddle/v2/framework/regularizer.py
rename to python/paddle/v2/fluid/regularizer.py
index 5111ac5566feb7d334ff4cd8e70daa0cfbd6e552..098cd0dd6439554f49e429ab75fb11bfa2c9d28c 100644
--- a/python/paddle/v2/framework/regularizer.py
+++ b/python/paddle/v2/fluid/regularizer.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.framework as framework
+import paddle.v2.fluid.framework as framework
 
 __all__ = [
     'append_regularization_ops', 'L2DecayRegularizer', 'L1DecayRegularizer'
diff --git a/python/paddle/v2/framework/tests/.gitignore b/python/paddle/v2/fluid/tests/.gitignore
similarity index 100%
rename from python/paddle/v2/framework/tests/.gitignore
rename to python/paddle/v2/fluid/tests/.gitignore
diff --git a/python/paddle/v2/framework/tests/CMakeLists.txt b/python/paddle/v2/fluid/tests/CMakeLists.txt
similarity index 100%
rename from python/paddle/v2/framework/tests/CMakeLists.txt
rename to python/paddle/v2/fluid/tests/CMakeLists.txt
diff --git a/python/paddle/v2/framework/tests/book/CMakeLists.txt b/python/paddle/v2/fluid/tests/book/CMakeLists.txt
similarity index 100%
rename from python/paddle/v2/framework/tests/book/CMakeLists.txt
rename to python/paddle/v2/fluid/tests/book/CMakeLists.txt
diff --git a/python/paddle/v2/framework/tests/book/test_fit_a_line.py b/python/paddle/v2/fluid/tests/book/test_fit_a_line.py
similarity index 87%
rename from python/paddle/v2/framework/tests/book/test_fit_a_line.py
rename to python/paddle/v2/fluid/tests/book/test_fit_a_line.py
index 6e09b88dca34de2579131e7bdc16b26cf6cde49c..5ef963bffa4e4fa3992e1f811d7f514662809410 100644
--- a/python/paddle/v2/framework/tests/book/test_fit_a_line.py
+++ b/python/paddle/v2/fluid/tests/book/test_fit_a_line.py
@@ -1,11 +1,11 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.io import save_persistables, load_persistables
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.io import save_persistables, load_persistables
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_image_classification_train.py b/python/paddle/v2/fluid/tests/book/test_image_classification_train.py
similarity index 95%
rename from python/paddle/v2/framework/tests/book/test_image_classification_train.py
rename to python/paddle/v2/fluid/tests/book/test_image_classification_train.py
index a4165da9703c55ae3347123409407f0cae30856f..e253b8d27fd29746b41d82a63b11485032e77ebb 100644
--- a/python/paddle/v2/framework/tests/book/test_image_classification_train.py
+++ b/python/paddle/v2/fluid/tests/book/test_image_classification_train.py
@@ -1,12 +1,12 @@
 import numpy as np
 import paddle.v2 as paddle
-import paddle.v2.framework.core as core
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-import paddle.v2.framework.optimizer as optimizer
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.framework import g_startup_program, g_main_program
-from paddle.v2.framework.initializer import XavierInitializer
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+import paddle.v2.fluid.optimizer as optimizer
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.framework import g_startup_program, g_main_program
+from paddle.v2.fluid.initializer import XavierInitializer
 
 
 def resnet_cifar10(input, depth=32, main_program=None, startup_program=None):
diff --git a/python/paddle/v2/framework/tests/book/test_recognize_digits_conv.py b/python/paddle/v2/fluid/tests/book/test_recognize_digits_conv.py
similarity index 90%
rename from python/paddle/v2/framework/tests/book/test_recognize_digits_conv.py
rename to python/paddle/v2/fluid/tests/book/test_recognize_digits_conv.py
index 66c629eb4261a9b971f25611d8e49f0cb671304a..2b723125412c17f3805ee3cae046b0788aa34997 100644
--- a/python/paddle/v2/framework/tests/book/test_recognize_digits_conv.py
+++ b/python/paddle/v2/fluid/tests/book/test_recognize_digits_conv.py
@@ -1,11 +1,11 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_recognize_digits_mlp.py b/python/paddle/v2/fluid/tests/book/test_recognize_digits_mlp.py
similarity index 88%
rename from python/paddle/v2/framework/tests/book/test_recognize_digits_mlp.py
rename to python/paddle/v2/fluid/tests/book/test_recognize_digits_mlp.py
index 076cf882160cd53f45ef291d82ba57ada843a287..2e1a9f236b6621c7334a9eb04272a6eb69c86fab 100644
--- a/python/paddle/v2/framework/tests/book/test_recognize_digits_mlp.py
+++ b/python/paddle/v2/fluid/tests/book/test_recognize_digits_mlp.py
@@ -1,12 +1,12 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
-
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.regularizer import L2DecayRegularizer
-from paddle.v2.framework.initializer import UniformInitializer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
+
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.regularizer import L2DecayRegularizer
+from paddle.v2.fluid.initializer import UniformInitializer
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_recommender_system.py b/python/paddle/v2/fluid/tests/book/test_recommender_system.py
similarity index 97%
rename from python/paddle/v2/framework/tests/book/test_recommender_system.py
rename to python/paddle/v2/fluid/tests/book/test_recommender_system.py
index 31562b4391d16b831d53801cfa21c7bdf8c3ab8d..4708dfe3e9209a3254a9e1903cbedf07ebc5d2d0 100644
--- a/python/paddle/v2/framework/tests/book/test_recommender_system.py
+++ b/python/paddle/v2/fluid/tests/book/test_recommender_system.py
@@ -1,11 +1,11 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_understand_sentiment_conv.py b/python/paddle/v2/fluid/tests/book/test_understand_sentiment_conv.py
similarity index 90%
rename from python/paddle/v2/framework/tests/book/test_understand_sentiment_conv.py
rename to python/paddle/v2/fluid/tests/book/test_understand_sentiment_conv.py
index eb377e9264b6031e9bf484a90b7c2b39442407f1..dc4b63da9b37aff55fc6362f239e3e61004a3866 100644
--- a/python/paddle/v2/framework/tests/book/test_understand_sentiment_conv.py
+++ b/python/paddle/v2/fluid/tests/book/test_understand_sentiment_conv.py
@@ -1,11 +1,11 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program, g_main_program, g_startup_program
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import Program, g_main_program, g_startup_program
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_understand_sentiment_dynamic_lstm.py b/python/paddle/v2/fluid/tests/book/test_understand_sentiment_dynamic_lstm.py
similarity index 91%
rename from python/paddle/v2/framework/tests/book/test_understand_sentiment_dynamic_lstm.py
rename to python/paddle/v2/fluid/tests/book/test_understand_sentiment_dynamic_lstm.py
index 2457c71e1a627c6d3edb298ab463a5d01243cea3..6d507f4c8e39ba039603a5b7618e7a82d1dcb21b 100644
--- a/python/paddle/v2/framework/tests/book/test_understand_sentiment_dynamic_lstm.py
+++ b/python/paddle/v2/fluid/tests/book/test_understand_sentiment_dynamic_lstm.py
@@ -1,11 +1,11 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program, g_main_program, g_startup_program
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import Program, g_main_program, g_startup_program
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_understand_sentiment_lstm.py b/python/paddle/v2/fluid/tests/book/test_understand_sentiment_lstm.py
similarity index 92%
rename from python/paddle/v2/framework/tests/book/test_understand_sentiment_lstm.py
rename to python/paddle/v2/fluid/tests/book/test_understand_sentiment_lstm.py
index 26cbd01bc04916e53554e6f70bee7bcf25d6371c..848dcce974a107402c33013e9f84211fd4979e21 100644
--- a/python/paddle/v2/framework/tests/book/test_understand_sentiment_lstm.py
+++ b/python/paddle/v2/fluid/tests/book/test_understand_sentiment_lstm.py
@@ -1,10 +1,10 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import g_main_program, g_startup_program
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import g_main_program, g_startup_program
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/book/test_word2vec.py b/python/paddle/v2/fluid/tests/book/test_word2vec.py
similarity index 95%
rename from python/paddle/v2/framework/tests/book/test_word2vec.py
rename to python/paddle/v2/fluid/tests/book/test_word2vec.py
index cb9fc2ab62b56348db7a320f7d40d2f0a7bf9d21..054dbd5a3d090ba8a08e8f101de11c69ddd36d8a 100644
--- a/python/paddle/v2/framework/tests/book/test_word2vec.py
+++ b/python/paddle/v2/fluid/tests/book/test_word2vec.py
@@ -1,10 +1,10 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
 
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/op_test.py b/python/paddle/v2/fluid/tests/op_test.py
similarity index 98%
rename from python/paddle/v2/framework/tests/op_test.py
rename to python/paddle/v2/fluid/tests/op_test.py
index 4a269341a4be6c1b72fde5166b7dd089236700b8..90269e308a31d2606b23d741ce0d0fa91a0a6aeb 100644
--- a/python/paddle/v2/framework/tests/op_test.py
+++ b/python/paddle/v2/fluid/tests/op_test.py
@@ -2,12 +2,12 @@ import unittest
 import numpy as np
 import random
 import itertools
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import collections
-from paddle.v2.framework.backward import append_backward_ops
-from paddle.v2.framework.op import Operator
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.framework import Program, OpProtoHolder
+from paddle.v2.fluid.backward import append_backward_ops
+from paddle.v2.fluid.op import Operator
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.framework import Program, OpProtoHolder
 
 
 def randomize_probability(batch_size, class_num, dtype='float32'):
diff --git a/python/paddle/v2/framework/tests/test_accuracy_op.py b/python/paddle/v2/fluid/tests/test_accuracy_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_accuracy_op.py
rename to python/paddle/v2/fluid/tests/test_accuracy_op.py
diff --git a/python/paddle/v2/framework/tests/test_activation_op.py b/python/paddle/v2/fluid/tests/test_activation_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_activation_op.py
rename to python/paddle/v2/fluid/tests/test_activation_op.py
diff --git a/python/paddle/v2/framework/tests/test_adadelta_op.py b/python/paddle/v2/fluid/tests/test_adadelta_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_adadelta_op.py
rename to python/paddle/v2/fluid/tests/test_adadelta_op.py
diff --git a/python/paddle/v2/framework/tests/test_adagrad_op.py b/python/paddle/v2/fluid/tests/test_adagrad_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_adagrad_op.py
rename to python/paddle/v2/fluid/tests/test_adagrad_op.py
diff --git a/python/paddle/v2/framework/tests/test_adam_op.py b/python/paddle/v2/fluid/tests/test_adam_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_adam_op.py
rename to python/paddle/v2/fluid/tests/test_adam_op.py
diff --git a/python/paddle/v2/framework/tests/test_adamax_op.py b/python/paddle/v2/fluid/tests/test_adamax_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_adamax_op.py
rename to python/paddle/v2/fluid/tests/test_adamax_op.py
diff --git a/python/paddle/v2/framework/tests/test_array_read_write_op.py b/python/paddle/v2/fluid/tests/test_array_read_write_op.py
similarity index 91%
rename from python/paddle/v2/framework/tests/test_array_read_write_op.py
rename to python/paddle/v2/fluid/tests/test_array_read_write_op.py
index 79e9938216e2abda5432e525804b0bcb9a655655..e019a4e15f0e25deaedf30911b44e576c8f89013 100644
--- a/python/paddle/v2/framework/tests/test_array_read_write_op.py
+++ b/python/paddle/v2/fluid/tests/test_array_read_write_op.py
@@ -1,9 +1,9 @@
 import unittest
-import paddle.v2.framework.core as core
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.backward import append_backward_ops
-from paddle.v2.framework.framework import g_main_program
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.backward import append_backward_ops
+from paddle.v2.fluid.framework import g_main_program
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_assign_op.py b/python/paddle/v2/fluid/tests/test_assign_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_assign_op.py
rename to python/paddle/v2/fluid/tests/test_assign_op.py
diff --git a/python/paddle/v2/framework/tests/test_auc_op.py b/python/paddle/v2/fluid/tests/test_auc_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_auc_op.py
rename to python/paddle/v2/fluid/tests/test_auc_op.py
diff --git a/python/paddle/v2/framework/tests/test_batch_norm_op.py b/python/paddle/v2/fluid/tests/test_batch_norm_op.py
similarity index 99%
rename from python/paddle/v2/framework/tests/test_batch_norm_op.py
rename to python/paddle/v2/fluid/tests/test_batch_norm_op.py
index dee339f43c2ee33fc8a691e0915bddf2c1679285..71f9599e0de83c86808f7e62547f80d3d50ffc7d 100644
--- a/python/paddle/v2/framework/tests/test_batch_norm_op.py
+++ b/python/paddle/v2/fluid/tests/test_batch_norm_op.py
@@ -1,8 +1,8 @@
 import unittest
 import numpy as np
 from op_test import OpTest
-import paddle.v2.framework.core as core
-from paddle.v2.framework.op import Operator
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.op import Operator
 
 
 def grad_var_name(var_name):
diff --git a/python/paddle/v2/framework/tests/test_bilinear_tensor_product_op.py b/python/paddle/v2/fluid/tests/test_bilinear_tensor_product_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_bilinear_tensor_product_op.py
rename to python/paddle/v2/fluid/tests/test_bilinear_tensor_product_op.py
diff --git a/python/paddle/v2/framework/tests/test_cast_op.py b/python/paddle/v2/fluid/tests/test_cast_op.py
similarity index 93%
rename from python/paddle/v2/framework/tests/test_cast_op.py
rename to python/paddle/v2/fluid/tests/test_cast_op.py
index 52ee71a8a4058a1367d9e493e02d8f2469ccfc9f..0c4b6310652e84d3dd7f281a8b98ae0435072afb 100644
--- a/python/paddle/v2/framework/tests/test_cast_op.py
+++ b/python/paddle/v2/fluid/tests/test_cast_op.py
@@ -1,7 +1,7 @@
 import op_test
 import unittest
 import numpy as np
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 class TestCastOp(op_test.OpTest):
diff --git a/python/paddle/v2/framework/tests/test_chunk_eval_op.py b/python/paddle/v2/fluid/tests/test_chunk_eval_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_chunk_eval_op.py
rename to python/paddle/v2/fluid/tests/test_chunk_eval_op.py
diff --git a/python/paddle/v2/framework/tests/test_clip_by_norm_op.py b/python/paddle/v2/fluid/tests/test_clip_by_norm_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_clip_by_norm_op.py
rename to python/paddle/v2/fluid/tests/test_clip_by_norm_op.py
diff --git a/python/paddle/v2/framework/tests/test_clip_op.py b/python/paddle/v2/fluid/tests/test_clip_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_clip_op.py
rename to python/paddle/v2/fluid/tests/test_clip_op.py
diff --git a/python/paddle/v2/framework/tests/test_compare_op.py b/python/paddle/v2/fluid/tests/test_compare_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_compare_op.py
rename to python/paddle/v2/fluid/tests/test_compare_op.py
diff --git a/python/paddle/v2/framework/tests/test_concat_op.py b/python/paddle/v2/fluid/tests/test_concat_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_concat_op.py
rename to python/paddle/v2/fluid/tests/test_concat_op.py
diff --git a/python/paddle/v2/framework/tests/test_cond_op.py b/python/paddle/v2/fluid/tests/test_cond_op.py
similarity index 97%
rename from python/paddle/v2/framework/tests/test_cond_op.py
rename to python/paddle/v2/fluid/tests/test_cond_op.py
index 09a3f5dc97c342fc61cd407bb338c1696e8d6c76..9d1df44b9065f8101e90b87815660f8c0818645f 100644
--- a/python/paddle/v2/framework/tests/test_cond_op.py
+++ b/python/paddle/v2/fluid/tests/test_cond_op.py
@@ -1,8 +1,8 @@
 import logging
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
 import numpy as np
-from paddle.v2.framework.op import Operator, CondOp
+from paddle.v2.fluid.op import Operator, CondOp
 
 
 class PySimpleCond(object):
diff --git a/python/paddle/v2/framework/tests/test_conditional_block.py b/python/paddle/v2/fluid/tests/test_conditional_block.py
similarity index 80%
rename from python/paddle/v2/framework/tests/test_conditional_block.py
rename to python/paddle/v2/fluid/tests/test_conditional_block.py
index 9b96ff306c37a6f96bd78951752d32274cca6282..293803f004a1513611fba30634d5552e1da84fef 100644
--- a/python/paddle/v2/framework/tests/test_conditional_block.py
+++ b/python/paddle/v2/fluid/tests/test_conditional_block.py
@@ -1,9 +1,9 @@
 import unittest
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.core as core
-from paddle.v2.framework.framework import g_startup_program, g_main_program
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.backward import append_backward_ops
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.framework import g_startup_program, g_main_program
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.backward import append_backward_ops
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_conv2d_op.py b/python/paddle/v2/fluid/tests/test_conv2d_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_conv2d_op.py
rename to python/paddle/v2/fluid/tests/test_conv2d_op.py
diff --git a/python/paddle/v2/framework/tests/test_conv2d_transpose_op.py b/python/paddle/v2/fluid/tests/test_conv2d_transpose_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_conv2d_transpose_op.py
rename to python/paddle/v2/fluid/tests/test_conv2d_transpose_op.py
diff --git a/python/paddle/v2/framework/tests/test_conv3d_op.py b/python/paddle/v2/fluid/tests/test_conv3d_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_conv3d_op.py
rename to python/paddle/v2/fluid/tests/test_conv3d_op.py
diff --git a/python/paddle/v2/framework/tests/test_conv3d_transpose_op.py b/python/paddle/v2/fluid/tests/test_conv3d_transpose_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_conv3d_transpose_op.py
rename to python/paddle/v2/fluid/tests/test_conv3d_transpose_op.py
diff --git a/python/paddle/v2/framework/tests/test_conv_shift_op.py b/python/paddle/v2/fluid/tests/test_conv_shift_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_conv_shift_op.py
rename to python/paddle/v2/fluid/tests/test_conv_shift_op.py
diff --git a/python/paddle/v2/framework/tests/test_cos_sim_op.py b/python/paddle/v2/fluid/tests/test_cos_sim_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_cos_sim_op.py
rename to python/paddle/v2/fluid/tests/test_cos_sim_op.py
diff --git a/python/paddle/v2/framework/tests/test_create_op_doc_string.py b/python/paddle/v2/fluid/tests/test_create_op_doc_string.py
similarity index 80%
rename from python/paddle/v2/framework/tests/test_create_op_doc_string.py
rename to python/paddle/v2/fluid/tests/test_create_op_doc_string.py
index d21e96df2a64d3fa418dca94690ea0b820db80de..42b6f7a3616bbce53a8cae68a5fc1eda411a7422 100644
--- a/python/paddle/v2/framework/tests/test_create_op_doc_string.py
+++ b/python/paddle/v2/fluid/tests/test_create_op_doc_string.py
@@ -1,5 +1,5 @@
 import unittest
-import paddle.v2.framework.layers as layers
+import paddle.v2.fluid.layers as layers
 
 
 class TestDocString(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_crf_decoding_op.py b/python/paddle/v2/fluid/tests/test_crf_decoding_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_crf_decoding_op.py
rename to python/paddle/v2/fluid/tests/test_crf_decoding_op.py
diff --git a/python/paddle/v2/framework/tests/test_crop_op.py b/python/paddle/v2/fluid/tests/test_crop_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_crop_op.py
rename to python/paddle/v2/fluid/tests/test_crop_op.py
diff --git a/python/paddle/v2/framework/tests/test_cross_entropy_op.py b/python/paddle/v2/fluid/tests/test_cross_entropy_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_cross_entropy_op.py
rename to python/paddle/v2/fluid/tests/test_cross_entropy_op.py
diff --git a/python/paddle/v2/framework/tests/test_decayed_adagrad_op.py b/python/paddle/v2/fluid/tests/test_decayed_adagrad_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_decayed_adagrad_op.py
rename to python/paddle/v2/fluid/tests/test_decayed_adagrad_op.py
diff --git a/python/paddle/v2/framework/tests/test_default_scope_funcs.py b/python/paddle/v2/fluid/tests/test_default_scope_funcs.py
similarity index 94%
rename from python/paddle/v2/framework/tests/test_default_scope_funcs.py
rename to python/paddle/v2/fluid/tests/test_default_scope_funcs.py
index 09a9850d054e3d7e6bf6db363fc577bdff8e9f43..738e69529ea447e87516d5e0efc098910b966ded 100644
--- a/python/paddle/v2/framework/tests/test_default_scope_funcs.py
+++ b/python/paddle/v2/fluid/tests/test_default_scope_funcs.py
@@ -1,4 +1,4 @@
-from paddle.v2.framework.default_scope_funcs import *
+from paddle.v2.fluid.default_scope_funcs import *
 import unittest
 
 
diff --git a/python/paddle/v2/framework/tests/test_dropout_op.py b/python/paddle/v2/fluid/tests/test_dropout_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_dropout_op.py
rename to python/paddle/v2/fluid/tests/test_dropout_op.py
diff --git a/python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py b/python/paddle/v2/fluid/tests/test_dynamic_recurrent_op.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py
rename to python/paddle/v2/fluid/tests/test_dynamic_recurrent_op.py
index 70af9dbc49f5ff3222cf3d549a110931140b43c4..c2d8b48ea944ae40a451492b8e9fad38dda0835c 100644
--- a/python/paddle/v2/framework/tests/test_dynamic_recurrent_op.py
+++ b/python/paddle/v2/fluid/tests/test_dynamic_recurrent_op.py
@@ -1,7 +1,7 @@
 import logging
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
-from paddle.v2.framework.op import Operator, DynamicRecurrentOp
+from paddle.v2.fluid.op import Operator, DynamicRecurrentOp
 import numpy as np
 
 # for siplicity, just one level LoD
diff --git a/python/paddle/v2/framework/tests/test_elementwise_add_op.py b/python/paddle/v2/fluid/tests/test_elementwise_add_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_elementwise_add_op.py
rename to python/paddle/v2/fluid/tests/test_elementwise_add_op.py
diff --git a/python/paddle/v2/framework/tests/test_elementwise_div_op.py b/python/paddle/v2/fluid/tests/test_elementwise_div_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_elementwise_div_op.py
rename to python/paddle/v2/fluid/tests/test_elementwise_div_op.py
diff --git a/python/paddle/v2/framework/tests/test_elementwise_mul_op.py b/python/paddle/v2/fluid/tests/test_elementwise_mul_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_elementwise_mul_op.py
rename to python/paddle/v2/fluid/tests/test_elementwise_mul_op.py
diff --git a/python/paddle/v2/framework/tests/test_elementwise_sub_op.py b/python/paddle/v2/fluid/tests/test_elementwise_sub_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_elementwise_sub_op.py
rename to python/paddle/v2/fluid/tests/test_elementwise_sub_op.py
diff --git a/python/paddle/v2/framework/tests/test_evaluator.py b/python/paddle/v2/fluid/tests/test_evaluator.py
similarity index 92%
rename from python/paddle/v2/framework/tests/test_evaluator.py
rename to python/paddle/v2/fluid/tests/test_evaluator.py
index 37dbfbc06bcd0da7e11924a048679c74a1cfb373..1d51205b703f83ec32c2e948394e5d3f5c87d1d9 100644
--- a/python/paddle/v2/framework/tests/test_evaluator.py
+++ b/python/paddle/v2/fluid/tests/test_evaluator.py
@@ -1,6 +1,6 @@
-from paddle.v2.framework.evaluator import Evaluator
-from paddle.v2.framework.op import Operator
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.evaluator import Evaluator
+from paddle.v2.fluid.op import Operator
+import paddle.v2.fluid.core as core
 import unittest
 import op_test
 import numpy as np
diff --git a/python/paddle/v2/framework/tests/test_exception.py b/python/paddle/v2/fluid/tests/test_exception.py
similarity index 89%
rename from python/paddle/v2/framework/tests/test_exception.py
rename to python/paddle/v2/fluid/tests/test_exception.py
index 5ae048817cfcc1ec85e0d0e0c5db749da4521012..b871f40c4a07ae2db7559e5a0f15664b21e94402 100644
--- a/python/paddle/v2/framework/tests/test_exception.py
+++ b/python/paddle/v2/fluid/tests/test_exception.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
 
 
diff --git a/python/paddle/v2/framework/tests/test_executor_and_mul.py b/python/paddle/v2/fluid/tests/test_executor_and_mul.py
similarity index 83%
rename from python/paddle/v2/framework/tests/test_executor_and_mul.py
rename to python/paddle/v2/fluid/tests/test_executor_and_mul.py
index c885cfbebd4b665ddf50adbc43673942dc949a0b..709250d0c86dde84ac22c37d8e2385ca4a80a40a 100644
--- a/python/paddle/v2/framework/tests/test_executor_and_mul.py
+++ b/python/paddle/v2/fluid/tests/test_executor_and_mul.py
@@ -1,8 +1,8 @@
 import unittest
-from paddle.v2.framework.layers import mul, data
-import paddle.v2.framework.core as core
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.framework import g_main_program
+from paddle.v2.fluid.layers import mul, data
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.framework import g_main_program
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_expand_op.py b/python/paddle/v2/fluid/tests/test_expand_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_expand_op.py
rename to python/paddle/v2/fluid/tests/test_expand_op.py
diff --git a/python/paddle/v2/framework/tests/test_feed_fetch_method.py b/python/paddle/v2/fluid/tests/test_feed_fetch_method.py
similarity index 95%
rename from python/paddle/v2/framework/tests/test_feed_fetch_method.py
rename to python/paddle/v2/fluid/tests/test_feed_fetch_method.py
index fbd659ece0188140e197982ea818d7c3897daf4e..178c85b0dd50df61b1fd35ef5d53ebbf39445cb4 100644
--- a/python/paddle/v2/framework/tests/test_feed_fetch_method.py
+++ b/python/paddle/v2/fluid/tests/test_feed_fetch_method.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/test_fill_constant_batch_size_like_op.py b/python/paddle/v2/fluid/tests/test_fill_constant_batch_size_like_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_fill_constant_batch_size_like_op.py
rename to python/paddle/v2/fluid/tests/test_fill_constant_batch_size_like_op.py
diff --git a/python/paddle/v2/framework/tests/test_fill_constant_op.py b/python/paddle/v2/fluid/tests/test_fill_constant_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_fill_constant_op.py
rename to python/paddle/v2/fluid/tests/test_fill_constant_op.py
diff --git a/python/paddle/v2/framework/tests/test_fill_zeros_like_op.py b/python/paddle/v2/fluid/tests/test_fill_zeros_like_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_fill_zeros_like_op.py
rename to python/paddle/v2/fluid/tests/test_fill_zeros_like_op.py
diff --git a/python/paddle/v2/framework/tests/test_framework_debug_str.py b/python/paddle/v2/fluid/tests/test_framework_debug_str.py
similarity index 85%
rename from python/paddle/v2/framework/tests/test_framework_debug_str.py
rename to python/paddle/v2/fluid/tests/test_framework_debug_str.py
index 8fdf8f91171ee334fac93c05a4d49056fa0e803d..a4cbabdb36362c4ca14b76f366b648d6dbdbf7b3 100644
--- a/python/paddle/v2/framework/tests/test_framework_debug_str.py
+++ b/python/paddle/v2/fluid/tests/test_framework_debug_str.py
@@ -1,5 +1,5 @@
 import unittest
-from paddle.v2.framework.framework import Program
+from paddle.v2.fluid.framework import Program
 
 
 class TestDebugStringFramework(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_gather_op.py b/python/paddle/v2/fluid/tests/test_gather_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_gather_op.py
rename to python/paddle/v2/fluid/tests/test_gather_op.py
diff --git a/python/paddle/v2/framework/tests/test_gaussian_random_op.py b/python/paddle/v2/fluid/tests/test_gaussian_random_op.py
similarity index 91%
rename from python/paddle/v2/framework/tests/test_gaussian_random_op.py
rename to python/paddle/v2/fluid/tests/test_gaussian_random_op.py
index 0dc7e091a5c8dd046f36cab7f79a15b2281cdd90..627ab4e23562f14538d85f2e21edeb7d72d940bb 100644
--- a/python/paddle/v2/framework/tests/test_gaussian_random_op.py
+++ b/python/paddle/v2/fluid/tests/test_gaussian_random_op.py
@@ -1,6 +1,6 @@
 import unittest
-import paddle.v2.framework.core as core
-from paddle.v2.framework.op import Operator
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.op import Operator
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_gru_op.py b/python/paddle/v2/fluid/tests/test_gru_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_gru_op.py
rename to python/paddle/v2/fluid/tests/test_gru_op.py
diff --git a/python/paddle/v2/framework/tests/test_gru_unit_op.py b/python/paddle/v2/fluid/tests/test_gru_unit_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_gru_unit_op.py
rename to python/paddle/v2/fluid/tests/test_gru_unit_op.py
diff --git a/python/paddle/v2/framework/tests/test_huber_loss_op.py b/python/paddle/v2/fluid/tests/test_huber_loss_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_huber_loss_op.py
rename to python/paddle/v2/fluid/tests/test_huber_loss_op.py
diff --git a/python/paddle/v2/framework/tests/test_image_classification_layer.py b/python/paddle/v2/fluid/tests/test_image_classification_layer.py
similarity index 95%
rename from python/paddle/v2/framework/tests/test_image_classification_layer.py
rename to python/paddle/v2/fluid/tests/test_image_classification_layer.py
index b1a267ec32b1c937b946bee82e41b846ebbf1288..bf5444107fa1609e67b09823b82e5fb92234b0a4 100644
--- a/python/paddle/v2/framework/tests/test_image_classification_layer.py
+++ b/python/paddle/v2/fluid/tests/test_image_classification_layer.py
@@ -1,8 +1,8 @@
 import unittest
 
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-from paddle.v2.framework.framework import Program
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+from paddle.v2.fluid.framework import Program
 
 
 def conv_block(input,
diff --git a/python/paddle/v2/framework/tests/test_infer_shape.py b/python/paddle/v2/fluid/tests/test_infer_shape.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_infer_shape.py
rename to python/paddle/v2/fluid/tests/test_infer_shape.py
index 2b2995f5e22d8c50d67498688c069252bf6e02fc..9f6695ce02de749178046fbb613a58ba591b3dbc 100644
--- a/python/paddle/v2/framework/tests/test_infer_shape.py
+++ b/python/paddle/v2/fluid/tests/test_infer_shape.py
@@ -1,6 +1,6 @@
 import unittest
 
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 class TestInferShape(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_inference_model_io.py b/python/paddle/v2/fluid/tests/test_inference_model_io.py
similarity index 90%
rename from python/paddle/v2/framework/tests/test_inference_model_io.py
rename to python/paddle/v2/fluid/tests/test_inference_model_io.py
index 48984f86a1864baade58aeb8e35c6065cc2a4bbb..98b95713b73e8eba93bd6a58eaaed603cfae7952 100644
--- a/python/paddle/v2/framework/tests/test_inference_model_io.py
+++ b/python/paddle/v2/fluid/tests/test_inference_model_io.py
@@ -1,11 +1,11 @@
 import paddle.v2 as paddle
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.core as core
-import paddle.v2.framework.optimizer as optimizer
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.optimizer as optimizer
 
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.io import save_inference_model, load_inference_model
-import paddle.v2.framework.executor as executor
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.io import save_inference_model, load_inference_model
+import paddle.v2.fluid.executor as executor
 import unittest
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/test_initializer.py b/python/paddle/v2/fluid/tests/test_initializer.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_initializer.py
rename to python/paddle/v2/fluid/tests/test_initializer.py
index bd4d2e39d770aebb7468d516f463533185ea8680..f2eb79b209627f5814847db6d96c0a17300d9b5a 100644
--- a/python/paddle/v2/framework/tests/test_initializer.py
+++ b/python/paddle/v2/fluid/tests/test_initializer.py
@@ -1,8 +1,8 @@
 import numpy as np
 import unittest
 
-import paddle.v2.framework.framework as framework
-import paddle.v2.framework.initializer as initializer
+import paddle.v2.fluid.framework as framework
+import paddle.v2.fluid.initializer as initializer
 
 DELTA = 0.00001
 
diff --git a/python/paddle/v2/framework/tests/test_l1_norm_op.py b/python/paddle/v2/fluid/tests/test_l1_norm_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_l1_norm_op.py
rename to python/paddle/v2/fluid/tests/test_l1_norm_op.py
diff --git a/python/paddle/v2/framework/tests/test_layers.py b/python/paddle/v2/fluid/tests/test_layers.py
similarity index 97%
rename from python/paddle/v2/framework/tests/test_layers.py
rename to python/paddle/v2/fluid/tests/test_layers.py
index b42af5ea45d54723e96279f9e16f82a1d52ad236..3d18e7ce3a4dc6c6b917a1000de39fca71f6ac18 100644
--- a/python/paddle/v2/framework/tests/test_layers.py
+++ b/python/paddle/v2/fluid/tests/test_layers.py
@@ -1,7 +1,7 @@
-import paddle.v2.framework.layers as layers
-import paddle.v2.framework.nets as nets
-from paddle.v2.framework.framework import Program
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.layers as layers
+import paddle.v2.fluid.nets as nets
+from paddle.v2.fluid.framework import Program
+import paddle.v2.fluid.core as core
 import unittest
 
 
diff --git a/python/paddle/v2/framework/tests/test_linear_chain_crf_op.py b/python/paddle/v2/fluid/tests/test_linear_chain_crf_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_linear_chain_crf_op.py
rename to python/paddle/v2/fluid/tests/test_linear_chain_crf_op.py
diff --git a/python/paddle/v2/framework/tests/test_lod_array_length_op.py b/python/paddle/v2/fluid/tests/test_lod_array_length_op.py
similarity index 79%
rename from python/paddle/v2/framework/tests/test_lod_array_length_op.py
rename to python/paddle/v2/fluid/tests/test_lod_array_length_op.py
index af2b4d705e7ec121bd5f1350f0a642ae8c44bf1e..a01ae83772185df218b8c453557dc0cac719673b 100644
--- a/python/paddle/v2/framework/tests/test_lod_array_length_op.py
+++ b/python/paddle/v2/fluid/tests/test_lod_array_length_op.py
@@ -1,7 +1,7 @@
 import unittest
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.executor import Executor
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.executor import Executor
+import paddle.v2.fluid.core as core
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_lod_rank_table.py b/python/paddle/v2/fluid/tests/test_lod_rank_table.py
similarity index 78%
rename from python/paddle/v2/framework/tests/test_lod_rank_table.py
rename to python/paddle/v2/fluid/tests/test_lod_rank_table.py
index 408145c10f46e24e8a54b05b4f3afa9231b6ffd6..bbc11930b9e804c2769cc590c298c6e90dc36ca6 100644
--- a/python/paddle/v2/framework/tests/test_lod_rank_table.py
+++ b/python/paddle/v2/fluid/tests/test_lod_rank_table.py
@@ -1,7 +1,7 @@
-from paddle.v2.framework.layers import lod_rank_table, data
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.framework import g_main_program
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.layers import lod_rank_table, data
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.framework import g_main_program
+import paddle.v2.fluid.core as core
 import numpy
 import unittest
 
diff --git a/python/paddle/v2/framework/tests/test_lod_reset_op.py b/python/paddle/v2/fluid/tests/test_lod_reset_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_lod_reset_op.py
rename to python/paddle/v2/fluid/tests/test_lod_reset_op.py
diff --git a/python/paddle/v2/framework/tests/test_lod_tensor_array.py b/python/paddle/v2/fluid/tests/test_lod_tensor_array.py
similarity index 96%
rename from python/paddle/v2/framework/tests/test_lod_tensor_array.py
rename to python/paddle/v2/fluid/tests/test_lod_tensor_array.py
index a433bcf622b14a1d2d33b5b98d555e1a21e4b9e8..d6d3e23fd8898a62528d63795d1bff1b72752477 100644
--- a/python/paddle/v2/framework/tests/test_lod_tensor_array.py
+++ b/python/paddle/v2/fluid/tests/test_lod_tensor_array.py
@@ -1,5 +1,5 @@
 import unittest
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_lod_tensor_array_ops.py b/python/paddle/v2/fluid/tests/test_lod_tensor_array_ops.py
similarity index 96%
rename from python/paddle/v2/framework/tests/test_lod_tensor_array_ops.py
rename to python/paddle/v2/fluid/tests/test_lod_tensor_array_ops.py
index e9713666b3f64d7a39afadab7da6b22f149b8cf8..b18cb6b49fa41f26e1b6de1128690507c5a2f099 100644
--- a/python/paddle/v2/framework/tests/test_lod_tensor_array_ops.py
+++ b/python/paddle/v2/fluid/tests/test_lod_tensor_array_ops.py
@@ -1,10 +1,10 @@
 import unittest
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import numpy
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.backward import append_backward_ops
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.backward import append_backward_ops
 
 
 class TestCPULoDTensorArrayOps(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_lookup_table_op.py b/python/paddle/v2/fluid/tests/test_lookup_table_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_lookup_table_op.py
rename to python/paddle/v2/fluid/tests/test_lookup_table_op.py
diff --git a/python/paddle/v2/framework/tests/test_lrn_op.py b/python/paddle/v2/fluid/tests/test_lrn_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_lrn_op.py
rename to python/paddle/v2/fluid/tests/test_lrn_op.py
diff --git a/python/paddle/v2/framework/tests/test_lstm_op.py b/python/paddle/v2/fluid/tests/test_lstm_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_lstm_op.py
rename to python/paddle/v2/fluid/tests/test_lstm_op.py
diff --git a/python/paddle/v2/framework/tests/test_lstm_unit_op.py b/python/paddle/v2/fluid/tests/test_lstm_unit_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_lstm_unit_op.py
rename to python/paddle/v2/fluid/tests/test_lstm_unit_op.py
diff --git a/python/paddle/v2/framework/tests/test_margin_rank_loss_op.py b/python/paddle/v2/fluid/tests/test_margin_rank_loss_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_margin_rank_loss_op.py
rename to python/paddle/v2/fluid/tests/test_margin_rank_loss_op.py
diff --git a/python/paddle/v2/framework/tests/test_matmul_op.py b/python/paddle/v2/fluid/tests/test_matmul_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_matmul_op.py
rename to python/paddle/v2/fluid/tests/test_matmul_op.py
diff --git a/python/paddle/v2/framework/tests/test_mean_op.py b/python/paddle/v2/fluid/tests/test_mean_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_mean_op.py
rename to python/paddle/v2/fluid/tests/test_mean_op.py
diff --git a/python/paddle/v2/framework/tests/test_minus_op.py b/python/paddle/v2/fluid/tests/test_minus_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_minus_op.py
rename to python/paddle/v2/fluid/tests/test_minus_op.py
diff --git a/python/paddle/v2/framework/tests/test_modified_huber_loss_op.py b/python/paddle/v2/fluid/tests/test_modified_huber_loss_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_modified_huber_loss_op.py
rename to python/paddle/v2/fluid/tests/test_modified_huber_loss_op.py
diff --git a/python/paddle/v2/framework/tests/test_momentum_op.py b/python/paddle/v2/fluid/tests/test_momentum_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_momentum_op.py
rename to python/paddle/v2/fluid/tests/test_momentum_op.py
diff --git a/python/paddle/v2/framework/tests/test_mul_op.py b/python/paddle/v2/fluid/tests/test_mul_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_mul_op.py
rename to python/paddle/v2/fluid/tests/test_mul_op.py
diff --git a/python/paddle/v2/framework/tests/test_multiplex_op.py b/python/paddle/v2/fluid/tests/test_multiplex_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_multiplex_op.py
rename to python/paddle/v2/fluid/tests/test_multiplex_op.py
diff --git a/python/paddle/v2/framework/tests/test_nccl_init_op.py b/python/paddle/v2/fluid/tests/test_nccl_init_op.py
similarity index 91%
rename from python/paddle/v2/framework/tests/test_nccl_init_op.py
rename to python/paddle/v2/fluid/tests/test_nccl_init_op.py
index 054909fdf5517a68c6a07971c65a1d5bdc20d4fa..a536800ccd81fdc2f3b7c8320cede4f8ecf3a8cb 100644
--- a/python/paddle/v2/framework/tests/test_nccl_init_op.py
+++ b/python/paddle/v2/fluid/tests/test_nccl_init_op.py
@@ -1,8 +1,8 @@
 import unittest, os
 import numpy as np
 import paddle.v2 as paddle
-from paddle.v2.framework.op import Operator
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.op import Operator
+import paddle.v2.fluid.core as core
 from op_test import OpTest, create_op, set_input
 
 if not core.is_compile_gpu():
diff --git a/python/paddle/v2/framework/tests/test_net.py b/python/paddle/v2/fluid/tests/test_net.py
similarity index 93%
rename from python/paddle/v2/framework/tests/test_net.py
rename to python/paddle/v2/fluid/tests/test_net.py
index 8503257feb8e1a5802f3f889f72c559a2aaa583a..318df08a9e73ac95cab73c34182bc6220ef6c681 100644
--- a/python/paddle/v2/framework/tests/test_net.py
+++ b/python/paddle/v2/fluid/tests/test_net.py
@@ -1,5 +1,5 @@
-import paddle.v2.framework.core as core
-from paddle.v2.framework.op import Operator
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.op import Operator
 import unittest
 
 
diff --git a/python/paddle/v2/framework/tests/test_op_support_gpu.py b/python/paddle/v2/fluid/tests/test_op_support_gpu.py
similarity index 84%
rename from python/paddle/v2/framework/tests/test_op_support_gpu.py
rename to python/paddle/v2/fluid/tests/test_op_support_gpu.py
index dd36c666c440a5c378dfceac4502cd8277417412..a0eb4bd5fd2cc178ffe0763efdee61524ad6d4bd 100644
--- a/python/paddle/v2/framework/tests/test_op_support_gpu.py
+++ b/python/paddle/v2/fluid/tests/test_op_support_gpu.py
@@ -1,5 +1,5 @@
 import unittest
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 class TestOpSupportGPU(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_operator.py b/python/paddle/v2/fluid/tests/test_operator.py
similarity index 97%
rename from python/paddle/v2/framework/tests/test_operator.py
rename to python/paddle/v2/fluid/tests/test_operator.py
index 98f6b2f5ee639120557cb85b3ada6d2931f7d0d2..4aa022ef90159cd96eed4e4dbe30cf5d1e8a41a7 100644
--- a/python/paddle/v2/framework/tests/test_operator.py
+++ b/python/paddle/v2/fluid/tests/test_operator.py
@@ -1,7 +1,7 @@
 import unittest
-import paddle.v2.framework.op as op
-import paddle.v2.framework.core as core
-import paddle.v2.framework.proto.framework_pb2 as framework_pb2
+import paddle.v2.fluid.op as op
+import paddle.v2.fluid.core as core
+import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
 
 
 class TestGetAllProtos(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_operator_desc.py b/python/paddle/v2/fluid/tests/test_operator_desc.py
similarity index 96%
rename from python/paddle/v2/framework/tests/test_operator_desc.py
rename to python/paddle/v2/fluid/tests/test_operator_desc.py
index a0bc4e0b91602cfc90f91a1e2dd4bce22c0dbf6d..e8362d2e9c6038c04c24dce35de8c53bfde78142 100644
--- a/python/paddle/v2/framework/tests/test_operator_desc.py
+++ b/python/paddle/v2/fluid/tests/test_operator_desc.py
@@ -1,6 +1,6 @@
 import unittest
-from paddle.v2.framework.framework import Variable, Program, g_main_program
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.framework import Variable, Program, g_main_program
+import paddle.v2.fluid.core as core
 
 
 class TestOperator(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_optimizer.py b/python/paddle/v2/fluid/tests/test_optimizer.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_optimizer.py
rename to python/paddle/v2/fluid/tests/test_optimizer.py
index a39e7402600c7a94301de030c90ea51264248cf1..0ebf7cdf208c41eacfdff88f59455584eff4ff8f 100644
--- a/python/paddle/v2/framework/tests/test_optimizer.py
+++ b/python/paddle/v2/fluid/tests/test_optimizer.py
@@ -1,8 +1,8 @@
 import unittest
 
-import paddle.v2.framework.framework as framework
-import paddle.v2.framework.optimizer as optimizer
-from paddle.v2.framework.backward import append_backward_ops
+import paddle.v2.fluid.framework as framework
+import paddle.v2.fluid.optimizer as optimizer
+from paddle.v2.fluid.backward import append_backward_ops
 
 
 class TestOptimizer(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_pad_op.py b/python/paddle/v2/fluid/tests/test_pad_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_pad_op.py
rename to python/paddle/v2/fluid/tests/test_pad_op.py
diff --git a/python/paddle/v2/framework/tests/test_parameter.py b/python/paddle/v2/fluid/tests/test_parameter.py
similarity index 87%
rename from python/paddle/v2/framework/tests/test_parameter.py
rename to python/paddle/v2/fluid/tests/test_parameter.py
index f04eb4cf27276b0f7da0793c97742ac42e4583be..71a1bd2aaf5a9c6362ce0d35c256ed228e942fce 100644
--- a/python/paddle/v2/framework/tests/test_parameter.py
+++ b/python/paddle/v2/fluid/tests/test_parameter.py
@@ -1,6 +1,6 @@
 import unittest
-from paddle.v2.framework.framework import g_main_program
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.framework import g_main_program
+import paddle.v2.fluid.core as core
 
 
 class TestParameter(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_pool2d_op.py b/python/paddle/v2/fluid/tests/test_pool2d_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_pool2d_op.py
rename to python/paddle/v2/fluid/tests/test_pool2d_op.py
diff --git a/python/paddle/v2/framework/tests/test_pool3d_op.py b/python/paddle/v2/fluid/tests/test_pool3d_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_pool3d_op.py
rename to python/paddle/v2/fluid/tests/test_pool3d_op.py
diff --git a/python/paddle/v2/framework/tests/test_pool_max_op.py b/python/paddle/v2/fluid/tests/test_pool_max_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_pool_max_op.py
rename to python/paddle/v2/fluid/tests/test_pool_max_op.py
diff --git a/python/paddle/v2/framework/tests/test_positive_negative_pair_op.py b/python/paddle/v2/fluid/tests/test_positive_negative_pair_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_positive_negative_pair_op.py
rename to python/paddle/v2/fluid/tests/test_positive_negative_pair_op.py
diff --git a/python/paddle/v2/framework/tests/test_precision_recall_op.py b/python/paddle/v2/fluid/tests/test_precision_recall_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_precision_recall_op.py
rename to python/paddle/v2/fluid/tests/test_precision_recall_op.py
diff --git a/python/paddle/v2/framework/tests/test_prelu_op.py b/python/paddle/v2/fluid/tests/test_prelu_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_prelu_op.py
rename to python/paddle/v2/fluid/tests/test_prelu_op.py
diff --git a/python/paddle/v2/framework/tests/test_program.py b/python/paddle/v2/fluid/tests/test_program.py
similarity index 96%
rename from python/paddle/v2/framework/tests/test_program.py
rename to python/paddle/v2/fluid/tests/test_program.py
index 7be67b6614ee3302a319289b821a214a81b6f64e..ef2daf6916e14c015a39ae0193948e7ff6531449 100644
--- a/python/paddle/v2/framework/tests/test_program.py
+++ b/python/paddle/v2/fluid/tests/test_program.py
@@ -1,8 +1,8 @@
 import unittest
 
-import paddle.v2.framework.core as core
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.framework import g_main_program
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.framework import g_main_program
 
 
 class TestProgram(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_protobuf.py b/python/paddle/v2/fluid/tests/test_protobuf.py
similarity index 92%
rename from python/paddle/v2/framework/tests/test_protobuf.py
rename to python/paddle/v2/fluid/tests/test_protobuf.py
index 848a396b3b6eec57d500b464780b64f339b09e94..e064374176fa221cfd042b7dbd2ddcb3b5ec41ec 100644
--- a/python/paddle/v2/framework/tests/test_protobuf.py
+++ b/python/paddle/v2/fluid/tests/test_protobuf.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.proto.framework_pb2 as framework_pb2
+import paddle.v2.fluid.proto.framework_pb2 as framework_pb2
 import unittest
 
 
diff --git a/python/paddle/v2/framework/tests/test_protobuf_descs.py b/python/paddle/v2/fluid/tests/test_protobuf_descs.py
similarity index 99%
rename from python/paddle/v2/framework/tests/test_protobuf_descs.py
rename to python/paddle/v2/fluid/tests/test_protobuf_descs.py
index 2fd3d5d165ada5026510e0dc3e2c55b6e0596ff3..098a9802dfc6763ce2a2356b7267a439145b7939 100644
--- a/python/paddle/v2/framework/tests/test_protobuf_descs.py
+++ b/python/paddle/v2/fluid/tests/test_protobuf_descs.py
@@ -1,5 +1,5 @@
 import unittest
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 class TestOpDesc(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_proximal_adagrad_op.py b/python/paddle/v2/fluid/tests/test_proximal_adagrad_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_proximal_adagrad_op.py
rename to python/paddle/v2/fluid/tests/test_proximal_adagrad_op.py
diff --git a/python/paddle/v2/framework/tests/test_proximal_gd_op.py b/python/paddle/v2/fluid/tests/test_proximal_gd_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_proximal_gd_op.py
rename to python/paddle/v2/fluid/tests/test_proximal_gd_op.py
diff --git a/python/paddle/v2/framework/tests/test_rank_loss_op.py b/python/paddle/v2/fluid/tests/test_rank_loss_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_rank_loss_op.py
rename to python/paddle/v2/fluid/tests/test_rank_loss_op.py
diff --git a/python/paddle/v2/framework/tests/test_recurrent_op.py b/python/paddle/v2/fluid/tests/test_recurrent_op.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_recurrent_op.py
rename to python/paddle/v2/fluid/tests/test_recurrent_op.py
index 16100429dd4010eb5c9a3e8896212f39295a4c8a..b623d1231838faff9e91c9234befb1f647fe8ec2 100644
--- a/python/paddle/v2/framework/tests/test_recurrent_op.py
+++ b/python/paddle/v2/fluid/tests/test_recurrent_op.py
@@ -1,11 +1,11 @@
 import unittest
 
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.backward import append_backward_ops
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.backward import append_backward_ops
 import numpy as np
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 class PyRNNBase(object):
diff --git a/python/paddle/v2/framework/tests/test_reduce_op.py b/python/paddle/v2/fluid/tests/test_reduce_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_reduce_op.py
rename to python/paddle/v2/fluid/tests/test_reduce_op.py
diff --git a/python/paddle/v2/framework/tests/test_regularizer.py b/python/paddle/v2/fluid/tests/test_regularizer.py
similarity index 92%
rename from python/paddle/v2/framework/tests/test_regularizer.py
rename to python/paddle/v2/fluid/tests/test_regularizer.py
index b21dceb584bdc660e48598a600f57cb6095b3802..f5d1eb3b96211bd7c7335dbe116a1d765d7bae50 100644
--- a/python/paddle/v2/framework/tests/test_regularizer.py
+++ b/python/paddle/v2/fluid/tests/test_regularizer.py
@@ -1,9 +1,9 @@
 import unittest
 
-import paddle.v2.framework.framework as framework
-import paddle.v2.framework.optimizer as optimizer
-import paddle.v2.framework.regularizer as regularizer
-from paddle.v2.framework.backward import append_backward_ops
+import paddle.v2.fluid.framework as framework
+import paddle.v2.fluid.optimizer as optimizer
+import paddle.v2.fluid.regularizer as regularizer
+from paddle.v2.fluid.backward import append_backward_ops
 
 
 class TestL2DecayRegularizer(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_reshape_op.py b/python/paddle/v2/fluid/tests/test_reshape_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_reshape_op.py
rename to python/paddle/v2/fluid/tests/test_reshape_op.py
diff --git a/python/paddle/v2/framework/tests/test_rmsprop_op.py b/python/paddle/v2/fluid/tests/test_rmsprop_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_rmsprop_op.py
rename to python/paddle/v2/fluid/tests/test_rmsprop_op.py
diff --git a/python/paddle/v2/framework/tests/test_rnn_memory_helper_op.py b/python/paddle/v2/fluid/tests/test_rnn_memory_helper_op.py
similarity index 95%
rename from python/paddle/v2/framework/tests/test_rnn_memory_helper_op.py
rename to python/paddle/v2/fluid/tests/test_rnn_memory_helper_op.py
index 731beff17cc96d26c2d9390a956c774b8676b179..a3cba92504a28590083df57e69f7662a887d94a6 100644
--- a/python/paddle/v2/framework/tests/test_rnn_memory_helper_op.py
+++ b/python/paddle/v2/fluid/tests/test_rnn_memory_helper_op.py
@@ -1,10 +1,10 @@
 import unittest
 
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.backward import append_backward_ops
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.backward import append_backward_ops
 import numpy as np
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 
 
 def create_tensor(np_data, place):
diff --git a/python/paddle/v2/framework/tests/test_scale_op.py b/python/paddle/v2/fluid/tests/test_scale_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_scale_op.py
rename to python/paddle/v2/fluid/tests/test_scale_op.py
diff --git a/python/paddle/v2/framework/tests/test_scatter_op.py b/python/paddle/v2/fluid/tests/test_scatter_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_scatter_op.py
rename to python/paddle/v2/fluid/tests/test_scatter_op.py
diff --git a/python/paddle/v2/framework/tests/test_scope.py b/python/paddle/v2/fluid/tests/test_scope.py
similarity index 81%
rename from python/paddle/v2/framework/tests/test_scope.py
rename to python/paddle/v2/fluid/tests/test_scope.py
index 14743654792716e4a7ebce5238b142addc86337e..e4857b590aa6e09f1fa37c4a8a70a3ec9495b085 100644
--- a/python/paddle/v2/framework/tests/test_scope.py
+++ b/python/paddle/v2/fluid/tests/test_scope.py
@@ -1,22 +1,22 @@
-import paddle.v2.framework.core
+import paddle.v2.fluid.core
 import unittest
 
 
 class TestScope(unittest.TestCase):
     def test_create_destroy(self):
-        paddle_c = paddle.v2.framework.core
+        paddle_c = paddle.v2.fluid.core
         scope = paddle_c.Scope()
         self.assertIsNotNone(scope)
         scope_with_parent = scope.new_scope()
         self.assertIsNotNone(scope_with_parent)
 
     def test_none_variable(self):
-        paddle_c = paddle.v2.framework.core
+        paddle_c = paddle.v2.fluid.core
         scope = paddle_c.Scope()
         self.assertIsNone(scope.find_var("test"))
 
     def test_create_var_get_var(self):
-        paddle_c = paddle.v2.framework.core
+        paddle_c = paddle.v2.fluid.core
         scope = paddle_c.Scope()
         var_a = scope.var("var_a")
         self.assertIsNotNone(var_a)
@@ -25,7 +25,7 @@ class TestScope(unittest.TestCase):
         self.assertIsNotNone(scope2.find_var('var_a'))
 
     def test_var_get_int(self):
-        paddle_c = paddle.v2.framework.core
+        paddle_c = paddle.v2.fluid.core
         scope = paddle_c.Scope()
         var = scope.var("test_int")
         var.set_int(10)
diff --git a/python/paddle/v2/framework/tests/test_selected_rows.py b/python/paddle/v2/fluid/tests/test_selected_rows.py
similarity index 96%
rename from python/paddle/v2/framework/tests/test_selected_rows.py
rename to python/paddle/v2/fluid/tests/test_selected_rows.py
index e8a930cb08c42b48f678bdd7bdb7698923535d4f..93daf37aa2ceb8a599973f7b02874f23fe0763ff 100644
--- a/python/paddle/v2/framework/tests/test_selected_rows.py
+++ b/python/paddle/v2/fluid/tests/test_selected_rows.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/test_seq_concat_op.py b/python/paddle/v2/fluid/tests/test_seq_concat_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_seq_concat_op.py
rename to python/paddle/v2/fluid/tests/test_seq_concat_op.py
diff --git a/python/paddle/v2/framework/tests/test_seq_conv.py b/python/paddle/v2/fluid/tests/test_seq_conv.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_seq_conv.py
rename to python/paddle/v2/fluid/tests/test_seq_conv.py
diff --git a/python/paddle/v2/framework/tests/test_seq_expand.py b/python/paddle/v2/fluid/tests/test_seq_expand.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_seq_expand.py
rename to python/paddle/v2/fluid/tests/test_seq_expand.py
diff --git a/python/paddle/v2/framework/tests/test_seq_pool.py b/python/paddle/v2/fluid/tests/test_seq_pool.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_seq_pool.py
rename to python/paddle/v2/fluid/tests/test_seq_pool.py
diff --git a/python/paddle/v2/framework/tests/test_sequence_softmax_op.py b/python/paddle/v2/fluid/tests/test_sequence_softmax_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_sequence_softmax_op.py
rename to python/paddle/v2/fluid/tests/test_sequence_softmax_op.py
diff --git a/python/paddle/v2/framework/tests/test_sgd_op.py b/python/paddle/v2/fluid/tests/test_sgd_op.py
similarity index 97%
rename from python/paddle/v2/framework/tests/test_sgd_op.py
rename to python/paddle/v2/fluid/tests/test_sgd_op.py
index 01262bba4d43adaed179baef88ccab6e69b0884b..ca05a381f06cfd40b7939dbda8d4f1f4aacd0271 100644
--- a/python/paddle/v2/framework/tests/test_sgd_op.py
+++ b/python/paddle/v2/fluid/tests/test_sgd_op.py
@@ -1,7 +1,7 @@
 import unittest
 import numpy as np
-import paddle.v2.framework.core as core
-from paddle.v2.framework.op import Operator
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.op import Operator
 from op_test import OpTest
 
 
diff --git a/python/paddle/v2/framework/tests/test_shrink_rnn_memory.py b/python/paddle/v2/fluid/tests/test_shrink_rnn_memory.py
similarity index 86%
rename from python/paddle/v2/framework/tests/test_shrink_rnn_memory.py
rename to python/paddle/v2/fluid/tests/test_shrink_rnn_memory.py
index 2090455b969806685b525f1e588b6570e3072430..1a3b88e18e38b88d75ad17a0bb6a2965d1e60406 100644
--- a/python/paddle/v2/framework/tests/test_shrink_rnn_memory.py
+++ b/python/paddle/v2/fluid/tests/test_shrink_rnn_memory.py
@@ -1,9 +1,9 @@
 import unittest
-import paddle.v2.framework.core as core
-from paddle.v2.framework.executor import Executor
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.backward import append_backward_ops
-from paddle.v2.framework.framework import g_main_program
+import paddle.v2.fluid.core as core
+from paddle.v2.fluid.executor import Executor
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.backward import append_backward_ops
+from paddle.v2.fluid.framework import g_main_program
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_sigmoid_cross_entropy_with_logits_op.py b/python/paddle/v2/fluid/tests/test_sigmoid_cross_entropy_with_logits_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_sigmoid_cross_entropy_with_logits_op.py
rename to python/paddle/v2/fluid/tests/test_sigmoid_cross_entropy_with_logits_op.py
diff --git a/python/paddle/v2/framework/tests/test_sign_op.py b/python/paddle/v2/fluid/tests/test_sign_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_sign_op.py
rename to python/paddle/v2/fluid/tests/test_sign_op.py
diff --git a/python/paddle/v2/framework/tests/test_smooth_l1_loss_op.py b/python/paddle/v2/fluid/tests/test_smooth_l1_loss_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_smooth_l1_loss_op.py
rename to python/paddle/v2/fluid/tests/test_smooth_l1_loss_op.py
diff --git a/python/paddle/v2/framework/tests/test_softmax_op.py b/python/paddle/v2/fluid/tests/test_softmax_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_softmax_op.py
rename to python/paddle/v2/fluid/tests/test_softmax_op.py
diff --git a/python/paddle/v2/framework/tests/test_softmax_with_cross_entropy_op.py b/python/paddle/v2/fluid/tests/test_softmax_with_cross_entropy_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_softmax_with_cross_entropy_op.py
rename to python/paddle/v2/fluid/tests/test_softmax_with_cross_entropy_op.py
diff --git a/python/paddle/v2/framework/tests/test_split_and_merge_lod_tensor_op.py b/python/paddle/v2/fluid/tests/test_split_and_merge_lod_tensor_op.py
similarity index 95%
rename from python/paddle/v2/framework/tests/test_split_and_merge_lod_tensor_op.py
rename to python/paddle/v2/fluid/tests/test_split_and_merge_lod_tensor_op.py
index 6ba1e568249d4a72820cc26193a8e0e030ae5f7c..3aed83b2ea3418c54f9540279ae6e2e0045421fa 100644
--- a/python/paddle/v2/framework/tests/test_split_and_merge_lod_tensor_op.py
+++ b/python/paddle/v2/fluid/tests/test_split_and_merge_lod_tensor_op.py
@@ -1,10 +1,10 @@
 import unittest
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import numpy as np
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.framework import Program
-from paddle.v2.framework.executor import Executor
-from paddle.v2.framework.backward import append_backward_ops
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.framework import Program
+from paddle.v2.fluid.executor import Executor
+from paddle.v2.fluid.backward import append_backward_ops
 
 
 class TestCPULoDTensorArrayOps(unittest.TestCase):
diff --git a/python/paddle/v2/framework/tests/test_split_op.py b/python/paddle/v2/fluid/tests/test_split_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_split_op.py
rename to python/paddle/v2/fluid/tests/test_split_op.py
diff --git a/python/paddle/v2/framework/tests/test_squared_l2_distance_op.py b/python/paddle/v2/fluid/tests/test_squared_l2_distance_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_squared_l2_distance_op.py
rename to python/paddle/v2/fluid/tests/test_squared_l2_distance_op.py
diff --git a/python/paddle/v2/framework/tests/test_squared_l2_norm_op.py b/python/paddle/v2/fluid/tests/test_squared_l2_norm_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_squared_l2_norm_op.py
rename to python/paddle/v2/fluid/tests/test_squared_l2_norm_op.py
diff --git a/python/paddle/v2/framework/tests/test_sum_op.py b/python/paddle/v2/fluid/tests/test_sum_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_sum_op.py
rename to python/paddle/v2/fluid/tests/test_sum_op.py
diff --git a/python/paddle/v2/framework/tests/test_tensor.py b/python/paddle/v2/fluid/tests/test_tensor.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_tensor.py
rename to python/paddle/v2/fluid/tests/test_tensor.py
index e0cd2fa8aaf2db2991ad2b9a3053f0d00b509cd4..9f870d9eb3485aa0b54eb781b906f4232d12c49e 100644
--- a/python/paddle/v2/framework/tests/test_tensor.py
+++ b/python/paddle/v2/fluid/tests/test_tensor.py
@@ -1,4 +1,4 @@
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
 import numpy
 
diff --git a/python/paddle/v2/framework/tests/test_tensor_array.py b/python/paddle/v2/fluid/tests/test_tensor_array.py
similarity index 98%
rename from python/paddle/v2/framework/tests/test_tensor_array.py
rename to python/paddle/v2/fluid/tests/test_tensor_array.py
index 50b3e09162a24201ee45cbd017dfef8a60f0da78..d6929ba16e4dae0c57adcceb4f0e78c094eee55c 100644
--- a/python/paddle/v2/framework/tests/test_tensor_array.py
+++ b/python/paddle/v2/fluid/tests/test_tensor_array.py
@@ -1,5 +1,5 @@
 import logging
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.core as core
 import unittest
 import numpy as np
 
diff --git a/python/paddle/v2/framework/tests/test_top_k_op.py b/python/paddle/v2/fluid/tests/test_top_k_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_top_k_op.py
rename to python/paddle/v2/fluid/tests/test_top_k_op.py
diff --git a/python/paddle/v2/framework/tests/test_transpose_op.py b/python/paddle/v2/fluid/tests/test_transpose_op.py
similarity index 100%
rename from python/paddle/v2/framework/tests/test_transpose_op.py
rename to python/paddle/v2/fluid/tests/test_transpose_op.py
diff --git a/python/paddle/v2/framework/tests/test_uniform_random_op.py b/python/paddle/v2/fluid/tests/test_uniform_random_op.py
similarity index 90%
rename from python/paddle/v2/framework/tests/test_uniform_random_op.py
rename to python/paddle/v2/fluid/tests/test_uniform_random_op.py
index ded777105e0fc64eb82bf4013bfba7ba9d0ddefa..f736dfb2e85552b321403c961da517f3b3efb100 100644
--- a/python/paddle/v2/framework/tests/test_uniform_random_op.py
+++ b/python/paddle/v2/fluid/tests/test_uniform_random_op.py
@@ -1,6 +1,6 @@
 import unittest
-from paddle.v2.framework.op import Operator
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.op import Operator
+import paddle.v2.fluid.core as core
 import numpy
 
 
diff --git a/python/paddle/v2/framework/tests/test_variable.py b/python/paddle/v2/fluid/tests/test_variable.py
similarity index 93%
rename from python/paddle/v2/framework/tests/test_variable.py
rename to python/paddle/v2/fluid/tests/test_variable.py
index 03115f10a5a494424c6f8310c544c569be818e5b..a3e60a751719666bdca56a3096b688125d09f4b2 100644
--- a/python/paddle/v2/framework/tests/test_variable.py
+++ b/python/paddle/v2/fluid/tests/test_variable.py
@@ -1,6 +1,6 @@
 import unittest
-from paddle.v2.framework.framework import Variable, g_main_program, Program
-import paddle.v2.framework.core as core
+from paddle.v2.fluid.framework import Variable, g_main_program, Program
+import paddle.v2.fluid.core as core
 import numpy as np
 
 
diff --git a/python/paddle/v2/framework/tests/test_while_op.py b/python/paddle/v2/fluid/tests/test_while_op.py
similarity index 94%
rename from python/paddle/v2/framework/tests/test_while_op.py
rename to python/paddle/v2/fluid/tests/test_while_op.py
index 1c344eae49705ecce586154c30c4d4f770022e7e..0f01acb3b94dc55a3536e751108e785ddc6e47bb 100644
--- a/python/paddle/v2/framework/tests/test_while_op.py
+++ b/python/paddle/v2/fluid/tests/test_while_op.py
@@ -1,7 +1,7 @@
 import unittest
-import paddle.v2.framework.layers as layers
-from paddle.v2.framework.executor import Executor
-import paddle.v2.framework.core as core
+import paddle.v2.fluid.layers as layers
+from paddle.v2.fluid.executor import Executor
+import paddle.v2.fluid.core as core
 import numpy
 
 
diff --git a/python/setup.py.in b/python/setup.py.in
index 5348c2d8d7e9b5adc5fe93e2943bef149ba047cc..fe91df10daf303bb14d1e5f28817984d261e0880 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -13,8 +13,8 @@ packages=['paddle',
           'paddle.v2.reader',
           'paddle.v2.master',
           'paddle.v2.plot',
-          'paddle.v2.framework',
-          'paddle.v2.framework.proto',
+          'paddle.v2.fluid',
+          'paddle.v2.fluid.proto',
           'py_paddle']
 
 with open('@PADDLE_SOURCE_DIR@/python/requirements.txt') as f:
@@ -44,14 +44,14 @@ setup(name='paddlepaddle',
       ext_modules=[Extension('_foo', ['stub.cc'])],
       package_data={
         'paddle.v2.master': ['libpaddle_master.so'],
-        'paddle.v2.framework': ['core.so'],
+        'paddle.v2.fluid': ['core.so'],
         'py_paddle':['*.py','_swig_paddle.so']
       },
       package_dir={
           '': '${CMAKE_CURRENT_SOURCE_DIR}',
-          # The paddle.v2.framework.proto will be generated while compiling.
+          # The paddle.v2.fluid.proto will be generated while compiling.
           # So that package points to other directory.
-          'paddle.v2.framework.proto': '${PADDLE_BINARY_DIR}/paddle/framework',
+          'paddle.v2.fluid.proto': '${PADDLE_BINARY_DIR}/paddle/framework',
           'py_paddle': '${PADDLE_SOURCE_DIR}/paddle/py_paddle'
       },
       scripts=paddle_bins,