From d6c00065e0597d199d8f86291ad492aee47e2085 Mon Sep 17 00:00:00 2001
From: liufengwei0103 <2472937968@qq.com>
Date: Wed, 21 Jul 2021 05:13:29 +0800
Subject: [PATCH] replace underline to dot in single client (#5547)

Co-authored-by: oneflow-ci-bot <69100618+oneflow-ci-bot@users.noreply.github.com>
---
 cmake/oneflow.cmake                           |  3 +-
 .../advanced/distribute_ops.py                | 12 +++---
 .../autograd/autograd.py                      |  6 +--
 .../contrib/tensorrt/tensorrt_api.py          |  2 +-
 .../deprecated/init_cluster_env.py            |  4 +-
 .../deprecated/initializer_util.py            |  2 +-
 .../eager/boxing_hob.py                       |  6 +--
 .../eager/boxing_middle.py                    |  2 +-
 .../eager/boxing_util.py                      | 20 +++++-----
 .../eager/eager_blob_util.py                  |  8 ++--
 .../eager/gradient_util.py                    |  2 +-
 .../eager/interpreter_callback.py             |  8 ++--
 .../eager/op_executor.py                      | 22 +++++-----
 .../eager/op_infer_util.py                    |  2 +-
 .../eager/symbol.py                           |  2 +-
 .../experimental/enable_typing_check.py       |  6 +--
 .../experimental/indexed_slices_ops.py        | 12 +++---
 .../interface_op_read_and_write.py            | 18 ++++-----
 .../experimental/load_mnist.py                |  2 +-
 .../experimental/name_scope.py                |  6 +--
 .../experimental/square_sum_op.py             | 12 +++---
 .../experimental/ssp_variable_proxy_op.py     |  6 +--
 .../experimental/unique_op.py                 | 12 +++---
 .../framework/c_api_util.py                   |  2 +-
 .../framework/check_point.py                  | 16 ++++----
 .../framework/check_point_v2.py               | 26 ++++++------
 .../framework/compile_context.py              | 16 ++++----
 .../framework/compiler.py                     | 32 +++++++--------
 .../framework/config_util.py                  |  8 ++--
 .../framework/distribute.py                   |  4 +-
 .../framework/distribute_context.py           |  4 +-
 .../framework/dtype.py                        |  2 +-
 .../framework/env_util.py                     | 14 +++----
 .../framework/function_desc.py                | 10 ++---
 .../framework/function_util.py                | 26 ++++++------
 .../framework/generator.py                    |  2 +-
 .../framework/hob.py                          |  6 +--
 .../framework/id_util.py                      |  2 +-
 .../framework/input_blob_def.py               | 14 +++----
 .../framework/interpret_util.py               | 10 ++---
 .../framework/job_instance.py                 |  2 +-
 .../framework/job_set_util.py                 |  2 +-
 .../framework/local_blob.py                   |  2 +-
 .../framework/model.py                        | 24 +++++------
 .../framework/module.py                       |  4 +-
 .../framework/ofblob.py                       |  4 +-
 .../framework/op_expr_util.py                 |  2 +-
 .../framework/ops.py                          | 14 +++----
 .../framework/placement_context.py            |  6 +--
 .../framework/placement_util.py               | 12 +++---
 .../framework/profiler.py                     |  2 +-
 .../framework/pull_util.py                    |  4 +-
 .../framework/push_util.py                    | 14 +++----
 .../framework/python_callback.py              |  2 +-
 .../framework/register_class_method_util.py   | 12 +++---
 .../framework/register_python_callback.py     |  4 +-
 .../framework/remote_blob.py                  | 20 +++++-----
 .../framework/scope_symbol.py                 |  4 +-
 .../framework/scope_util.py                   |  6 +--
 .../framework/session_util.py                 | 40 +++++++++----------
 .../framework/sysconfig.py                    |  2 +-
 .../framework/tensor.py                       | 22 +++++-----
 .../framework/tensor_tuple_util.py            |  2 +-
 .../framework/typing.py                       |  4 +-
 .../framework/typing_util.py                  | 10 ++---
 .../framework/unittest.py                     |  4 +-
 .../framework/watcher.py                      | 10 ++---
 .../lib/core/box.py                           |  2 +-
 .../lib/core/enable_if.py                     |  2 +-
 .../nn/init.py                                |  4 +-
 .../nn/module.py                              | 10 ++---
 .../nn/modules/abs.py                         |  6 +--
 .../nn/modules/acos.py                        |  6 +--
 .../nn/modules/acosh.py                       |  6 +--
 .../nn/modules/activation.py                  |  6 +--
 .../nn/modules/adaptive_pool.py               |  4 +-
 .../nn/modules/arange.py                      |  6 +--
 .../nn/modules/argmax.py                      |  8 ++--
 .../nn/modules/argsort.py                     |  8 ++--
 .../nn/modules/argwhere.py                    |  6 +--
 .../nn/modules/atan2.py                       |  6 +--
 .../nn/modules/atanh.py                       |  6 +--
 .../nn/modules/batchnorm.py                   |  4 +-
 .../nn/modules/bmm.py                         |  6 +--
 .../nn/modules/broadcast_like.py              |  4 +-
 .../nn/modules/cast.py                        |  6 +--
 .../nn/modules/chunk.py                       | 10 ++---
 .../nn/modules/concat.py                      |  8 ++--
 .../nn/modules/constant.py                    | 10 ++---
 .../nn/modules/constantpad2d.py               |  4 +-
 .../nn/modules/container.py                   |  8 ++--
 .../nn/modules/conv.py                        | 10 ++---
 .../nn/modules/dataset.py                     |  8 ++--
 .../nn/modules/deconv.py                      | 10 ++---
 .../nn/modules/dropout.py                     |  6 +--
 .../nn/modules/eq.py                          |  6 +--
 .../nn/modules/exp.py                         |  6 +--
 .../nn/modules/expand.py                      |  6 +--
 .../nn/modules/flatten.py                     |  6 +--
 .../nn/modules/floor.py                       |  8 ++--
 .../nn/modules/gather.py                      |  8 ++--
 .../nn/modules/greater.py                     |  6 +--
 .../nn/modules/greater_equal.py               |  6 +--
 .../nn/modules/instancenorm.py                |  4 +-
 .../nn/modules/less.py                        |  6 +--
 .../nn/modules/less_equal.py                  |  6 +--
 .../nn/modules/linear.py                      |  8 ++--
 .../nn/modules/log1p.py                       |  6 +--
 .../nn/modules/loss.py                        |  8 ++--
 .../nn/modules/masked_fill.py                 |  6 +--
 .../nn/modules/masked_select.py               |  8 ++--
 .../nn/modules/math_ops.py                    | 10 ++---
 .../nn/modules/matmul.py                      |  8 ++--
 .../nn/modules/meshgrid.py                    |  4 +-
 .../nn/modules/ne.py                          |  6 +--
 .../nn/modules/negative.py                    |  6 +--
 .../nn/modules/norm.py                        |  6 +--
 .../nn/modules/normalization.py               |  8 ++--
 .../nn/modules/padding.py                     |  4 +-
 .../nn/modules/permute.py                     |  6 +--
 .../nn/modules/pixelshuffle.py                |  6 +--
 .../nn/modules/pooling.py                     | 10 ++---
 .../nn/modules/reduce_ops.py                  |  8 ++--
 .../nn/modules/repeat.py                      |  6 +--
 .../nn/modules/reshape.py                     |  6 +--
 .../nn/modules/round.py                       |  6 +--
 .../nn/modules/sign.py                        |  6 +--
 .../nn/modules/sinh.py                        |  6 +--
 .../nn/modules/slice.py                       |  6 +--
 .../nn/modules/softplus.py                    |  6 +--
 .../nn/modules/sort.py                        |  8 ++--
 .../nn/modules/sparse.py                      |  6 +--
 .../nn/modules/squeeze.py                     |  8 ++--
 .../nn/modules/stack.py                       |  8 ++--
 .../nn/modules/tan.py                         |  6 +--
 .../nn/modules/tensor_buffer.py               |  4 +-
 .../nn/modules/tensor_ops.py                  |  6 +--
 .../nn/modules/tile.py                        |  6 +--
 .../nn/modules/to.py                          |  6 +--
 .../nn/modules/transpose.py                   |  6 +--
 .../nn/modules/triu.py                        |  6 +--
 .../nn/modules/unsqueeze.py                   |  6 +--
 .../nn/modules/upsampling.py                  |  6 +--
 .../nn/modules/where.py                       |  6 +--
 .../nn/modules/zeropad2d.py                   |  4 +-
 .../nn/optimizer/adam.py                      |  6 +--
 .../nn/optimizer/adamw.py                     |  6 +--
 .../nn/optimizer/cosine_annealing_lr.py       |  2 +-
 .../nn/optimizer/lambda_lr.py                 |  2 +-
 .../nn/optimizer/lr_scheduler.py              |  2 +-
 .../nn/optimizer/optimizer.py                 |  6 +--
 .../nn/optimizer/rmsprop.py                   |  6 +--
 .../nn/optimizer/sgd.py                       |  4 +-
 .../nn/optimizer/step_lr.py                   |  2 +-
 .../nn/parameter.py                           |  4 +-
 .../oneflow_export.py                         |  6 +--
 .../ops/__init__.py                           | 22 +++++-----
 .../ops/array_ops.py                          |  8 ++--
 .../ops/assign_op.py                          | 20 +++++-----
 .../ops/builtin_ops.py                        |  6 +--
 .../ops/categorical_ordinal_encode_op.py      |  6 +--
 .../ops/combined_margin_loss.py               | 12 +++---
 .../ops/constant_op.py                        |  8 ++--
 .../ops/count_not_finite.py                   |  8 ++--
 .../ops/data_ops.py                           |  8 ++--
 .../ops/diag_ops.py                           |  6 +--
 .../ops/domain_ops.py                         |  4 +-
 .../ops/eager_nccl_ops.py                     |  6 +--
 .../ops/get_variable.py                       | 24 +++++------
 .../ops/initializer_util.py                   |  2 +-
 .../ops/layers.py                             |  6 +--
 .../ops/linalg.py                             |  8 ++--
 .../ops/loss_ops.py                           |  6 +--
 .../ops/losses/add_loss.py                    | 12 +++---
 .../ops/math_binary_elementwise_ops.py        |  6 +--
 .../ops/math_ops.py                           | 16 ++++----
 .../ops/math_unary_elementwise_ops.py         | 10 ++---
 .../ops/nn_ops.py                             | 12 +++---
 .../ops/one_hot.py                            |  8 ++--
 .../ops/optimizer.py                          |  8 ++--
 .../ops/pad.py                                |  6 +--
 .../ops/partial_fc_sample.py                  |  8 ++--
 .../ops/prelu.py                              |  6 +--
 .../ops/quantize_ops.py                       |  6 +--
 .../ops/random_ops.py                         |  8 ++--
 .../ops/random_util.py                        |  6 +--
 .../ops/reduce_mean.py                        |  6 +--
 .../ops/reduce_ops.py                         |  8 ++--
 .../ops/regularizer_util.py                   |  2 +-
 .../ops/sort_ops.py                           | 10 ++---
 .../ops/summary_ops.py                        |  6 +--
 .../ops/tensor_buffer_ops.py                  |  4 +-
 .../ops/two_stage_reduce.py                   | 14 +++----
 .../ops/user_data_ops.py                      |  8 ++--
 .../ops/user_op_builder.py                    | 28 ++++++-------
 .../ops/util/custom_op_module.py              |  4 +-
 .../ops/watch.py                              | 26 ++++++------
 .../serving/inference_session.py              | 20 +++++-----
 .../serving/saved_model_builder.py            |  6 +--
 .../summary/summary_graph.py                  |  2 +-
 .../summary/summary_hparams.py                |  2 +-
 .../summary/summary_projector.py              |  2 +-
 tools/conver_single_client_name_space.py      | 30 --------------
 203 files changed, 784 insertions(+), 815 deletions(-)
 delete mode 100644 tools/conver_single_client_name_space.py

diff --git a/cmake/oneflow.cmake b/cmake/oneflow.cmake
index 8989a2d7e..7497afa50 100644
--- a/cmake/oneflow.cmake
+++ b/cmake/oneflow.cmake
@@ -298,10 +298,9 @@ add_custom_target(of_pyscript_copy ALL
     COMMAND rm -rf ${of_pyscript_dir}/oneflow/python
     COMMAND rm -rf ${of_pyscript_dir}/oneflow/compatible
     COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/oneflow/python" "${of_pyscript_dir}/oneflow/python"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/oneflow/compatible_single_client_python" "${of_pyscript_dir}/oneflow/compatible/single_client/python"
     COMMAND "${CMAKE_COMMAND}" -E copy
         "${PROJECT_SOURCE_DIR}/oneflow/single_client_init.py" "${of_pyscript_dir}/oneflow/compatible/single_client/__init__.py"
-    COMMAND ${Python_EXECUTABLE} "${PROJECT_SOURCE_DIR}/tools/conver_single_client_name_space.py" "${of_pyscript_dir}/oneflow/compatible"
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/oneflow/compatible_single_client_python" "${of_pyscript_dir}/oneflow/compatible/single_client/python"
     COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/compatible/__init__.py"
     COMMAND "${CMAKE_COMMAND}" -E copy
         "${PROJECT_SOURCE_DIR}/oneflow/single_client_main.py" "${of_pyscript_dir}/oneflow/compatible/single_client/__main__.py"
diff --git a/oneflow/compatible_single_client_python/advanced/distribute_ops.py b/oneflow/compatible_single_client_python/advanced/distribute_ops.py
index 09d61c6a7..526282934 100644
--- a/oneflow/compatible_single_client_python/advanced/distribute_ops.py
+++ b/oneflow/compatible_single_client_python/advanced/distribute_ops.py
@@ -20,16 +20,16 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Union, Tuple, List, Optional, Sequence, Callable
 import oneflow._oneflow_internal
 
diff --git a/oneflow/compatible_single_client_python/autograd/autograd.py b/oneflow/compatible_single_client_python/autograd/autograd.py
index c095a9e80..df06e6a1c 100644
--- a/oneflow/compatible_single_client_python/autograd/autograd.py
+++ b/oneflow/compatible_single_client_python/autograd/autograd.py
@@ -16,9 +16,9 @@ limitations under the License.
 
 from typing import Union, Sequence, Tuple
 
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework.tensor_tuple_util import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework.tensor_tuple_util import (
     convert_to_tensor_tuple,
 )
 from oneflow._oneflow_internal import TensorTuple
diff --git a/oneflow/compatible_single_client_python/contrib/tensorrt/tensorrt_api.py b/oneflow/compatible_single_client_python/contrib/tensorrt/tensorrt_api.py
index 2394aeadf..e354f5305 100644
--- a/oneflow/compatible_single_client_python/contrib/tensorrt/tensorrt_api.py
+++ b/oneflow/compatible_single_client_python/contrib/tensorrt/tensorrt_api.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import
 
 import traceback
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py b/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
index c668eadb8..8367579a5 100644
--- a/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
+++ b/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
@@ -22,12 +22,12 @@ import uuid
 from tempfile import NamedTemporaryFile
 
 from google.protobuf import text_format as pbtxt
-from oneflow.compatible_single_client_python.framework import env_util as env_util
+from oneflow.compatible.single_client.python.framework import env_util as env_util
 from oneflow.compatible.single_client.core.job.env_pb2 import EnvProto
 from oneflow.compatible.single_client.core.control.ctrl_bootstrap_pb2 import (
     BootstrapConf,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import subprocess
 
 
diff --git a/oneflow/compatible_single_client_python/deprecated/initializer_util.py b/oneflow/compatible_single_client_python/deprecated/initializer_util.py
index 33b434f2c..9b1bc362a 100644
--- a/oneflow/compatible_single_client_python/deprecated/initializer_util.py
+++ b/oneflow/compatible_single_client_python/deprecated/initializer_util.py
@@ -22,7 +22,7 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.job import (
     initializer_conf_pb2 as initializer_conf_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("truncated_normal")
diff --git a/oneflow/compatible_single_client_python/eager/boxing_hob.py b/oneflow/compatible_single_client_python/eager/boxing_hob.py
index f56534880..9e8bf5d7c 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_hob.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_hob.py
@@ -15,13 +15,13 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.lib.core.high_order_bool import (
+from oneflow.compatible.single_client.python.lib.core.high_order_bool import (
     bool_functor,
 )
-from oneflow.compatible_single_client_python.lib.core.high_order_bool import (
+from oneflow.compatible.single_client.python.lib.core.high_order_bool import (
     hob_context_attr,
 )
-from oneflow.compatible_single_client_python.lib.core.high_order_bool import BoolFunctor
+from oneflow.compatible.single_client.python.lib.core.high_order_bool import BoolFunctor
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/eager/boxing_middle.py b/oneflow/compatible_single_client_python/eager/boxing_middle.py
index a4586bd13..3ba66fab9 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_middle.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_middle.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.eager import symbol as symbol_util
+from oneflow.compatible.single_client.python.eager import symbol as symbol_util
 from oneflow.compatible.single_client.core.job import (
     sbp_parallel_pb2 as sbp_parallel_pb,
 )
diff --git a/oneflow/compatible_single_client_python/eager/boxing_util.py b/oneflow/compatible_single_client_python/eager/boxing_util.py
index 0f5e5dc62..ba8026cd7 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_util.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_util.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import
 
 from contextlib import contextmanager
-from oneflow.compatible_single_client_python.eager import symbol as symbol_util
+from oneflow.compatible.single_client.python.eager import symbol as symbol_util
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_pb
 from oneflow.compatible.single_client.core.operator import (
     op_attribute_pb2 as op_attribute_pb,
@@ -24,22 +24,22 @@ from oneflow.compatible.single_client.core.operator import (
 from oneflow.compatible.single_client.core.job import (
     sbp_parallel_pb2 as sbp_parallel_pb,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     balanced_splitter as balanced_splitter,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.lib.core import (
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.lib.core import (
     high_order_bool as high_order_bool,
 )
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.eager import boxing_hob as boxing_hob
-from oneflow.compatible_single_client_python.eager import op_infer_util as op_infer_util
-from oneflow.compatible_single_client_python.eager.boxing_hob import BoxingHobContext
-from oneflow.compatible_single_client_python.eager import boxing_middle as boxing_middle
+from oneflow.compatible.single_client.python.eager import boxing_hob as boxing_hob
+from oneflow.compatible.single_client.python.eager import op_infer_util as op_infer_util
+from oneflow.compatible.single_client.python.eager.boxing_hob import BoxingHobContext
+from oneflow.compatible.single_client.python.eager import boxing_middle as boxing_middle
 import random
 from oneflow.compatible import single_client as flow
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
diff --git a/oneflow/compatible_single_client_python/eager/eager_blob_util.py b/oneflow/compatible_single_client_python/eager/eager_blob_util.py
index 400d6e881..313109625 100644
--- a/oneflow/compatible_single_client_python/eager/eager_blob_util.py
+++ b/oneflow/compatible_single_client_python/eager/eager_blob_util.py
@@ -15,14 +15,14 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework.dtype import (
+from oneflow.compatible.single_client.python.framework.dtype import (
     convert_proto_dtype_to_oneflow_dtype,
 )
-from oneflow.compatible_single_client_python.framework import blob_trait as blob_trait
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import blob_trait as blob_trait
+from oneflow.compatible.single_client.python.framework import (
     python_callback as python_callback,
 )
-from oneflow.compatible_single_client_python.lib.core import async_util as async_util
+from oneflow.compatible.single_client.python.lib.core import async_util as async_util
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/eager/gradient_util.py b/oneflow/compatible_single_client_python/eager/gradient_util.py
index dcd40eaef..cd83e9edd 100644
--- a/oneflow/compatible_single_client_python/eager/gradient_util.py
+++ b/oneflow/compatible_single_client_python/eager/gradient_util.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
 
diff --git a/oneflow/compatible_single_client_python/eager/interpreter_callback.py b/oneflow/compatible_single_client_python/eager/interpreter_callback.py
index d387c7449..4295829ee 100644
--- a/oneflow/compatible_single_client_python/eager/interpreter_callback.py
+++ b/oneflow/compatible_single_client_python/eager/interpreter_callback.py
@@ -15,16 +15,16 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
-from oneflow.compatible_single_client_python.eager import op_executor as op_executor
+from oneflow.compatible.single_client.python.eager import gradient_util as gradient_util
+from oneflow.compatible.single_client.python.eager import op_executor as op_executor
 from oneflow.compatible.single_client.core.operator import (
     op_attribute_pb2 as op_attribute_pb,
 )
 from oneflow.compatible.single_client.core.job import scope_pb2 as scope_pb
 from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
 from google.protobuf import text_format
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.eager import (
     symbol_storage as symbol_storage,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/eager/op_executor.py b/oneflow/compatible_single_client_python/eager/op_executor.py
index 2dd4045cf..98ad05a16 100644
--- a/oneflow/compatible_single_client_python/eager/op_executor.py
+++ b/oneflow/compatible_single_client_python/eager/op_executor.py
@@ -25,29 +25,29 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.operator import (
     interface_blob_conf_pb2 as inter_face_blob_conf_util,
 )
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.eager import (
     blob_register as blob_register_util,
 )
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.eager import (
     symbol_storage as symbol_storage,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     python_callback as python_callback,
 )
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.experimental import (
     name_scope as name_scope,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.eager import op_infer_util as op_infer_util
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.eager import op_infer_util as op_infer_util
+from oneflow.compatible.single_client.python.eager import (
     blob_register as blob_register_util,
 )
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
diff --git a/oneflow/compatible_single_client_python/eager/op_infer_util.py b/oneflow/compatible_single_client_python/eager/op_infer_util.py
index 880a1fdf0..cbdbcdbcf 100644
--- a/oneflow/compatible_single_client_python/eager/op_infer_util.py
+++ b/oneflow/compatible_single_client_python/eager/op_infer_util.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
 from oneflow.compatible.single_client.core.operator import (
     op_node_signature_pb2 as op_node_signature_pb,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
 from oneflow._oneflow_internal.oneflow.core.operator import (
     op_node_signature as op_node_signature_cfg,
 )
diff --git a/oneflow/compatible_single_client_python/eager/symbol.py b/oneflow/compatible_single_client_python/eager/symbol.py
index 72a380c43..85118667c 100644
--- a/oneflow/compatible_single_client_python/eager/symbol.py
+++ b/oneflow/compatible_single_client_python/eager/symbol.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
 from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
 import functools
 
diff --git a/oneflow/compatible_single_client_python/experimental/enable_typing_check.py b/oneflow/compatible_single_client_python/experimental/enable_typing_check.py
index 062c8846c..c59de5ffe 100644
--- a/oneflow/compatible_single_client_python/experimental/enable_typing_check.py
+++ b/oneflow/compatible_single_client_python/experimental/enable_typing_check.py
@@ -15,9 +15,9 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
 
 
 @oneflow_export("experimental.enable_typing_check")
diff --git a/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py b/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
index b13eb57da..7e9dd4c28 100644
--- a/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
+++ b/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
@@ -21,21 +21,21 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Optional, Tuple
 
 
diff --git a/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py b/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py
index 95ac989f3..bf0fb08b0 100644
--- a/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py
+++ b/oneflow/compatible_single_client_python/experimental/interface_op_read_and_write.py
@@ -17,21 +17,21 @@ from oneflow.compatible import single_client as flow
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.lib.core import async_util as async_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.lib.core import async_util as async_util
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_def_util,
 )
-from oneflow.compatible_single_client_python.framework import dtype as dtype_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import dtype as dtype_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import push_util as push_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import push_util as push_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.eager import op_executor as op_executor
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.eager import op_executor as op_executor
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
 from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
 from oneflow._oneflow_internal.oneflow.core.common import shape as shape_proto_cfg
diff --git a/oneflow/compatible_single_client_python/experimental/load_mnist.py b/oneflow/compatible_single_client_python/experimental/load_mnist.py
index 9bd14a3ab..f23b5a052 100644
--- a/oneflow/compatible_single_client_python/experimental/load_mnist.py
+++ b/oneflow/compatible_single_client_python/experimental/load_mnist.py
@@ -19,7 +19,7 @@ import numpy as np
 from tqdm import tqdm
 import requests
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 def get_sha256hash(file_path, Bytes=1024):
diff --git a/oneflow/compatible_single_client_python/experimental/name_scope.py b/oneflow/compatible_single_client_python/experimental/name_scope.py
index 29ced6abe..00ca5a732 100644
--- a/oneflow/compatible_single_client_python/experimental/name_scope.py
+++ b/oneflow/compatible_single_client_python/experimental/name_scope.py
@@ -17,11 +17,11 @@ from __future__ import absolute_import
 
 from contextlib import contextmanager
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_context,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
diff --git a/oneflow/compatible_single_client_python/experimental/square_sum_op.py b/oneflow/compatible_single_client_python/experimental/square_sum_op.py
index 8daaa44e5..90e9484e5 100644
--- a/oneflow/compatible_single_client_python/experimental/square_sum_op.py
+++ b/oneflow/compatible_single_client_python/experimental/square_sum_op.py
@@ -23,21 +23,21 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Optional
 
 
diff --git a/oneflow/compatible_single_client_python/experimental/ssp_variable_proxy_op.py b/oneflow/compatible_single_client_python/experimental/ssp_variable_proxy_op.py
index 5f7f14b61..17e22f87a 100644
--- a/oneflow/compatible_single_client_python/experimental/ssp_variable_proxy_op.py
+++ b/oneflow/compatible_single_client_python/experimental/ssp_variable_proxy_op.py
@@ -15,11 +15,11 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 from typing import Tuple
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import id_util as id_util
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/experimental/unique_op.py b/oneflow/compatible_single_client_python/experimental/unique_op.py
index 0f166dcfb..29320b3cf 100644
--- a/oneflow/compatible_single_client_python/experimental/unique_op.py
+++ b/oneflow/compatible_single_client_python/experimental/unique_op.py
@@ -22,20 +22,20 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/c_api_util.py b/oneflow/compatible_single_client_python/framework/c_api_util.py
index 6000c53a0..67ed135b7 100644
--- a/oneflow/compatible_single_client_python/framework/c_api_util.py
+++ b/oneflow/compatible_single_client_python/framework/c_api_util.py
@@ -39,7 +39,7 @@ from oneflow.compatible.single_client.core.job.inter_user_job_info_pb2 import (
 
 # import oneflow.compatible.single_client as flow
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/check_point.py b/oneflow/compatible_single_client_python/framework/check_point.py
index bd359d401..1e689de22 100644
--- a/oneflow/compatible_single_client_python/framework/check_point.py
+++ b/oneflow/compatible_single_client_python/framework/check_point.py
@@ -18,22 +18,22 @@ import os
 import shutil
 
 import numpy as np
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import (
     job_instance as job_instance,
 )
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     check_point_v2 as check_point_v2,
 )
-from oneflow.compatible_single_client_python.framework import config_util as config_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import config_util as config_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.eager import op_executor as op_executor
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.eager import op_executor as op_executor
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import List, Union
 
 
diff --git a/oneflow/compatible_single_client_python/framework/check_point_v2.py b/oneflow/compatible_single_client_python/framework/check_point_v2.py
index 0b855c031..01105421b 100644
--- a/oneflow/compatible_single_client_python/framework/check_point_v2.py
+++ b/oneflow/compatible_single_client_python/framework/check_point_v2.py
@@ -21,40 +21,40 @@ from google.protobuf import text_format
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_pb
-from oneflow.compatible_single_client_python.framework import config_util as config_util
-from oneflow.compatible_single_client_python.framework import dtype as dtype_util
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.framework import config_util as config_util
+from oneflow.compatible.single_client.python.framework import dtype as dtype_util
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.ops import (
     initializer_util as initializer_util,
 )
 from oneflow.compatible.single_client.core.job import (
     initializer_conf_pb2 as initializer_conf_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.lib.core import async_util as async_util
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
-from oneflow.compatible_single_client_python.eager import op_infer_util as op_infer_util
+from oneflow.compatible.single_client.python.lib.core import async_util as async_util
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.eager import op_infer_util as op_infer_util
 from oneflow.compatible.single_client.core.framework import (
     variable_meta_info_pb2 as variable_meta_info_pb,
 )
 from oneflow.compatible.single_client.core.framework import (
     user_op_attr_pb2 as attr_value_pb,
 )
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.experimental import (
     interface_op_read_and_write,
 )
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.ops import get_variable as get_variable
+from oneflow.compatible.single_client.python.ops import get_variable as get_variable
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
 import oneflow._oneflow_internal
 from oneflow._oneflow_internal import EagerBlobTrait
diff --git a/oneflow/compatible_single_client_python/framework/compile_context.py b/oneflow/compatible_single_client_python/framework/compile_context.py
index 012b9d1e2..cb7caf0fe 100644
--- a/oneflow/compatible_single_client_python/framework/compile_context.py
+++ b/oneflow/compatible_single_client_python/framework/compile_context.py
@@ -18,22 +18,22 @@ from __future__ import absolute_import
 from contextlib import contextmanager
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.experimental import (
     name_scope as name_scope,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     distribute_context as distribute_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_context,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.experimental import (
     name_scope as name_scope,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/compiler.py b/oneflow/compatible_single_client_python/framework/compiler.py
index 283a95f8a..2508ec6f9 100644
--- a/oneflow/compatible_single_client_python/framework/compiler.py
+++ b/oneflow/compatible_single_client_python/framework/compiler.py
@@ -18,38 +18,38 @@ from __future__ import absolute_import
 from contextlib import contextmanager
 
 import inspect
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import (
     placement_util as placement_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     runtime_mode as runtime_mode,
 )
-from oneflow.compatible_single_client_python.framework import push_util as push_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import push_util as push_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.framework import typing as oft
-from oneflow.compatible_single_client_python.framework import typing_util as oft_util
-from oneflow.compatible_single_client_python.lib.core import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.framework import typing as oft
+from oneflow.compatible.single_client.python.framework import typing_util as oft_util
+from oneflow.compatible.single_client.python.lib.core import (
     func_inspect_util as func_inspect_util,
 )
-from oneflow.compatible_single_client_python import ops as ops
+from oneflow.compatible.single_client.python import ops as ops
 import typing
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/config_util.py b/oneflow/compatible_single_client_python/framework/config_util.py
index a64d3e802..f3b0163fc 100644
--- a/oneflow/compatible_single_client_python/framework/config_util.py
+++ b/oneflow/compatible_single_client_python/framework/config_util.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 from __future__ import absolute_import, print_function
 
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 import traceback
 
diff --git a/oneflow/compatible_single_client_python/framework/distribute.py b/oneflow/compatible_single_client_python/framework/distribute.py
index 87105ed17..549ac7ad9 100644
--- a/oneflow/compatible_single_client_python/framework/distribute.py
+++ b/oneflow/compatible_single_client_python/framework/distribute.py
@@ -17,10 +17,10 @@ from __future__ import absolute_import
 
 from contextlib import contextmanager
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute_context as distribute_ctx,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
     oneflow_export_value,
diff --git a/oneflow/compatible_single_client_python/framework/distribute_context.py b/oneflow/compatible_single_client_python/framework/distribute_context.py
index 038f6dece..b1c5f4972 100644
--- a/oneflow/compatible_single_client_python/framework/distribute_context.py
+++ b/oneflow/compatible_single_client_python/framework/distribute_context.py
@@ -15,10 +15,10 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
 
 
 class DistributeStrategy(object):
diff --git a/oneflow/compatible_single_client_python/framework/dtype.py b/oneflow/compatible_single_client_python/framework/dtype.py
index 6228e9775..a1eeacac8 100644
--- a/oneflow/compatible_single_client_python/framework/dtype.py
+++ b/oneflow/compatible_single_client_python/framework/dtype.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
 
 import numpy as np
 from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_pb2
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
 
diff --git a/oneflow/compatible_single_client_python/framework/env_util.py b/oneflow/compatible_single_client_python/framework/env_util.py
index 44f81e7ac..c868ed03f 100644
--- a/oneflow/compatible_single_client_python/framework/env_util.py
+++ b/oneflow/compatible_single_client_python/framework/env_util.py
@@ -23,18 +23,18 @@ from oneflow.compatible.single_client.core.control import (
     ctrl_bootstrap_pb2 as ctrl_bootstrap_pb,
 )
 from oneflow.compatible.single_client.core.job import env_pb2 as env_pb
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
 from oneflow.compatible.single_client.core.job import resource_pb2 as resource_util
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
diff --git a/oneflow/compatible_single_client_python/framework/function_desc.py b/oneflow/compatible_single_client_python/framework/function_desc.py
index b37cbcf86..2d5787db4 100644
--- a/oneflow/compatible_single_client_python/framework/function_desc.py
+++ b/oneflow/compatible_single_client_python/framework/function_desc.py
@@ -15,16 +15,16 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
 from oneflow._oneflow_internal.oneflow.core.job import job_conf as job_conf_cfg
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/function_util.py b/oneflow/compatible_single_client_python/framework/function_util.py
index 8d55780f5..29563603a 100644
--- a/oneflow/compatible_single_client_python/framework/function_util.py
+++ b/oneflow/compatible_single_client_python/framework/function_util.py
@@ -22,30 +22,30 @@ import inspect
 import traceback
 from typing import Any, Callable, Optional, Union
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
-from oneflow.compatible_single_client_python.framework.function_desc import FunctionDesc
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework.function_desc import FunctionDesc
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute_context as distribute_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import typing_util as oft_util
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.lib.core import pb_util as pb_util
-from oneflow.compatible_single_client_python.framework.function_desc import FunctionDesc
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import typing_util as oft_util
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.lib.core import pb_util as pb_util
+from oneflow.compatible.single_client.python.framework.function_desc import FunctionDesc
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from oneflow._oneflow_internal.oneflow.core.common import data_type as data_type_cfg
 import oneflow._oneflow_internal
 import traceback
diff --git a/oneflow/compatible_single_client_python/framework/generator.py b/oneflow/compatible_single_client_python/framework/generator.py
index 945525fe8..de7e4ddc5 100644
--- a/oneflow/compatible_single_client_python/framework/generator.py
+++ b/oneflow/compatible_single_client_python/framework/generator.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("Generator")
diff --git a/oneflow/compatible_single_client_python/framework/hob.py b/oneflow/compatible_single_client_python/framework/hob.py
index 5b312a81e..b128beb44 100644
--- a/oneflow/compatible_single_client_python/framework/hob.py
+++ b/oneflow/compatible_single_client_python/framework/hob.py
@@ -13,12 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.lib.core.high_order_bool import (
+from oneflow.compatible.single_client.python.lib.core.high_order_bool import (
     bool_functor,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/id_util.py b/oneflow/compatible_single_client_python/framework/id_util.py
index 87082cb3d..4adf93353 100644
--- a/oneflow/compatible_single_client_python/framework/id_util.py
+++ b/oneflow/compatible_single_client_python/framework/id_util.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/input_blob_def.py b/oneflow/compatible_single_client_python/framework/input_blob_def.py
index 55c4dd60c..e3834cc57 100644
--- a/oneflow/compatible_single_client_python/framework/input_blob_def.py
+++ b/oneflow/compatible_single_client_python/framework/input_blob_def.py
@@ -29,21 +29,21 @@ from oneflow.compatible.single_client.core.operator import (
 from oneflow.compatible.single_client.core.job import (
     sbp_parallel_pb2 as sbp_parallel_pb,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_context,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
 import oneflow._oneflow_internal
 from functools import reduce
diff --git a/oneflow/compatible_single_client_python/framework/interpret_util.py b/oneflow/compatible_single_client_python/framework/interpret_util.py
index e9e7632e5..f17035edb 100644
--- a/oneflow/compatible_single_client_python/framework/interpret_util.py
+++ b/oneflow/compatible_single_client_python/framework/interpret_util.py
@@ -15,13 +15,13 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_ctx,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.eager import op_executor as op_executor
-from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.eager import op_executor as op_executor
+from oneflow.compatible.single_client.python.eager import gradient_util as gradient_util
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
 
diff --git a/oneflow/compatible_single_client_python/framework/job_instance.py b/oneflow/compatible_single_client_python/framework/job_instance.py
index 63c9da2ea..4ec08a514 100644
--- a/oneflow/compatible_single_client_python/framework/job_instance.py
+++ b/oneflow/compatible_single_client_python/framework/job_instance.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 import sys
 import traceback
 
-from oneflow.compatible_single_client_python.framework import ofblob as ofblob
+from oneflow.compatible.single_client.python.framework import ofblob as ofblob
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/job_set_util.py b/oneflow/compatible_single_client_python/framework/job_set_util.py
index 2ff851bfb..0a916b526 100644
--- a/oneflow/compatible_single_client_python/framework/job_set_util.py
+++ b/oneflow/compatible_single_client_python/framework/job_set_util.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from typing import Optional, TypeVar
 
 from oneflow.compatible.single_client.core.job.job_set_pb2 import JobSet
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 _VT = TypeVar("_VT")
 
diff --git a/oneflow/compatible_single_client_python/framework/local_blob.py b/oneflow/compatible_single_client_python/framework/local_blob.py
index 8983fd0ce..8bac97f77 100644
--- a/oneflow/compatible_single_client_python/framework/local_blob.py
+++ b/oneflow/compatible_single_client_python/framework/local_blob.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import
 
 import numpy as np
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/model.py b/oneflow/compatible_single_client_python/framework/model.py
index eba5a9b1f..06e6fc074 100644
--- a/oneflow/compatible_single_client_python/framework/model.py
+++ b/oneflow/compatible_single_client_python/framework/model.py
@@ -32,30 +32,30 @@ import inspect
 import numpy as np
 
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.framework.check_point_v2 import (
+from oneflow.compatible.single_client.python.framework.check_point_v2 import (
     LoadVariables,
     SaveVarDict,
     GetCheckpoint,
 )
-from oneflow.compatible_single_client_python.framework.function_util import (
+from oneflow.compatible.single_client.python.framework.function_util import (
     api_oneflow_function,
 )
-from oneflow.compatible_single_client_python.framework.function_util import (
+from oneflow.compatible.single_client.python.framework.function_util import (
     FunctionConfig as ExecutionConfig,
 )
-from oneflow.compatible_single_client_python.framework.local_blob import LocalBlob
-from oneflow.compatible_single_client_python.framework.session_util import (
+from oneflow.compatible.single_client.python.framework.local_blob import LocalBlob
+from oneflow.compatible.single_client.python.framework.session_util import (
     api_clear_default_session,
 )
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.ops.optimizer import Optimizer
-from oneflow.compatible_single_client_python.nn.optimizer.optimizer import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.ops.optimizer import Optimizer
+from oneflow.compatible.single_client.python.nn.optimizer.optimizer import (
     Optimizer as OOPOptimizer,
 )
-from oneflow.compatible_single_client_python.framework import typing as oneflow_typing
-from oneflow.compatible_single_client_python.framework import dtype as dtype_util
+from oneflow.compatible.single_client.python.framework import typing as oneflow_typing
+from oneflow.compatible.single_client.python.framework import dtype as dtype_util
 
 
 @oneflow_export("model.DataModule")
diff --git a/oneflow/compatible_single_client_python/framework/module.py b/oneflow/compatible_single_client_python/framework/module.py
index 6e6fc9080..c6c947480 100644
--- a/oneflow/compatible_single_client_python/framework/module.py
+++ b/oneflow/compatible_single_client_python/framework/module.py
@@ -15,8 +15,8 @@ limitations under the License.
 """
 
 from __future__ import absolute_import
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import id_util as id_util
 
 
 @oneflow_export("deprecated.nn.Module")
diff --git a/oneflow/compatible_single_client_python/framework/ofblob.py b/oneflow/compatible_single_client_python/framework/ofblob.py
index 093d64433..710dfa723 100644
--- a/oneflow/compatible_single_client_python/framework/ofblob.py
+++ b/oneflow/compatible_single_client_python/framework/ofblob.py
@@ -22,10 +22,10 @@ import numpy as np
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
 from google.protobuf import text_format
-from oneflow.compatible_single_client_python.framework.dtype import (
+from oneflow.compatible.single_client.python.framework.dtype import (
     convert_proto_dtype_to_oneflow_dtype,
 )
-from oneflow.compatible_single_client_python.lib.core.box import Box
+from oneflow.compatible.single_client.python.lib.core.box import Box
 
 
 class OfBlob(object):
diff --git a/oneflow/compatible_single_client_python/framework/op_expr_util.py b/oneflow/compatible_single_client_python/framework/op_expr_util.py
index 799676544..a6ba21f3b 100644
--- a/oneflow/compatible_single_client_python/framework/op_expr_util.py
+++ b/oneflow/compatible_single_client_python/framework/op_expr_util.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.framework.attr_util import (
+from oneflow.compatible.single_client.python.framework.attr_util import (
     convert_to_user_attr_value,
 )
 
diff --git a/oneflow/compatible_single_client_python/framework/ops.py b/oneflow/compatible_single_client_python/framework/ops.py
index 842d17be6..a3b9a3ad0 100644
--- a/oneflow/compatible_single_client_python/framework/ops.py
+++ b/oneflow/compatible_single_client_python/framework/ops.py
@@ -20,19 +20,19 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_context,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
diff --git a/oneflow/compatible_single_client_python/framework/placement_context.py b/oneflow/compatible_single_client_python/framework/placement_context.py
index 4a16e81a5..06aeefa6a 100644
--- a/oneflow/compatible_single_client_python/framework/placement_context.py
+++ b/oneflow/compatible_single_client_python/framework/placement_context.py
@@ -19,9 +19,9 @@ import collections
 import re
 
 from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import op_util as op_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import op_util as op_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
 from oneflow.compatible import single_client as flow
diff --git a/oneflow/compatible_single_client_python/framework/placement_util.py b/oneflow/compatible_single_client_python/framework/placement_util.py
index 76743e41f..5004eb16a 100644
--- a/oneflow/compatible_single_client_python/framework/placement_util.py
+++ b/oneflow/compatible_single_client_python/framework/placement_util.py
@@ -15,19 +15,19 @@ limitations under the License.
 """
 from __future__ import absolute_import
 import re
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
 from oneflow.compatible import single_client as flow
 import traceback
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/profiler.py b/oneflow/compatible_single_client_python/framework/profiler.py
index cc6303579..9a8b92f0c 100644
--- a/oneflow/compatible_single_client_python/framework/profiler.py
+++ b/oneflow/compatible_single_client_python/framework/profiler.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/pull_util.py b/oneflow/compatible_single_client_python/framework/pull_util.py
index 32aff237c..733f40230 100644
--- a/oneflow/compatible_single_client_python/framework/pull_util.py
+++ b/oneflow/compatible_single_client_python/framework/pull_util.py
@@ -16,10 +16,10 @@ limitations under the License.
 from __future__ import absolute_import
 
 import threading
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     local_blob as local_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/push_util.py b/oneflow/compatible_single_client_python/framework/push_util.py
index a088b1e40..af6eff70c 100644
--- a/oneflow/compatible_single_client_python/framework/push_util.py
+++ b/oneflow/compatible_single_client_python/framework/push_util.py
@@ -16,21 +16,21 @@ limitations under the License.
 from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_def,
 )
-from oneflow.compatible_single_client_python.framework import dtype as dtype_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import dtype as dtype_util
+from oneflow.compatible.single_client.python.framework import (
     python_callback as python_callback,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     balanced_splitter as balanced_splitter,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
diff --git a/oneflow/compatible_single_client_python/framework/python_callback.py b/oneflow/compatible_single_client_python/framework/python_callback.py
index fb04c91fb..1ded41f17 100644
--- a/oneflow/compatible_single_client_python/framework/python_callback.py
+++ b/oneflow/compatible_single_client_python/framework/python_callback.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
 
 import traceback
 
-from oneflow.compatible_single_client_python.framework import ofblob as ofblob
+from oneflow.compatible.single_client.python.framework import ofblob as ofblob
 from oneflow._oneflow_internal.oneflow.core.operator import (
     op_attribute as op_attribute_cfg,
 )
diff --git a/oneflow/compatible_single_client_python/framework/register_class_method_util.py b/oneflow/compatible_single_client_python/framework/register_class_method_util.py
index 72a8ee072..7343c6064 100644
--- a/oneflow/compatible_single_client_python/framework/register_class_method_util.py
+++ b/oneflow/compatible_single_client_python/framework/register_class_method_util.py
@@ -13,18 +13,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.eager import (
     eager_blob_util as eager_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     op_expr_util as op_expr_util,
 )
-from oneflow.compatible_single_client_python.framework import functional as functional
-from oneflow.compatible_single_client_python.framework import generator as generator
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import functional as functional
+from oneflow.compatible.single_client.python.framework import generator as generator
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import blob_trait as blob_trait
+from oneflow.compatible.single_client.python.framework import blob_trait as blob_trait
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/register_python_callback.py b/oneflow/compatible_single_client_python/framework/register_python_callback.py
index fcd325286..00ef6039d 100644
--- a/oneflow/compatible_single_client_python/framework/register_python_callback.py
+++ b/oneflow/compatible_single_client_python/framework/register_python_callback.py
@@ -15,10 +15,10 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     python_callback as python_callback,
 )
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.eager import (
     interpreter_callback as interpreter_callback,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/remote_blob.py b/oneflow/compatible_single_client_python/framework/remote_blob.py
index 5795f5163..068bcf70b 100644
--- a/oneflow/compatible_single_client_python/framework/remote_blob.py
+++ b/oneflow/compatible_single_client_python/framework/remote_blob.py
@@ -19,22 +19,22 @@ from oneflow.compatible import single_client as flow
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import blob_trait as blob_trait
-from oneflow.compatible_single_client_python.framework.dtype import (
+from oneflow.compatible.single_client.python.framework import blob_trait as blob_trait
+from oneflow.compatible.single_client.python.framework.dtype import (
     convert_proto_dtype_to_oneflow_dtype,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.eager import (
     eager_blob_util as eager_blob_util,
 )
-from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.eager import gradient_util as gradient_util
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
 from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/scope_symbol.py b/oneflow/compatible_single_client_python/framework/scope_symbol.py
index 1cf976910..ddc56d07a 100644
--- a/oneflow/compatible_single_client_python/framework/scope_symbol.py
+++ b/oneflow/compatible_single_client_python/framework/scope_symbol.py
@@ -15,8 +15,8 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.eager.symbol import Symbol
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.eager.symbol import Symbol
+from oneflow.compatible.single_client.python.eager import (
     symbol_storage as symbol_storage,
 )
 from oneflow._oneflow_internal.oneflow.core.job import scope as scope_cfg
diff --git a/oneflow/compatible_single_client_python/framework/scope_util.py b/oneflow/compatible_single_client_python/framework/scope_util.py
index 61141b6a1..60ef1d7a7 100644
--- a/oneflow/compatible_single_client_python/framework/scope_util.py
+++ b/oneflow/compatible_single_client_python/framework/scope_util.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 import traceback
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import attr_util as attr_util
+from oneflow.compatible.single_client.python.framework import attr_util as attr_util
 from oneflow._oneflow_internal.oneflow.core.job import job_conf as job_conf_cfg
 from contextlib import contextmanager
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
diff --git a/oneflow/compatible_single_client_python/framework/session_util.py b/oneflow/compatible_single_client_python/framework/session_util.py
index 9e21cee90..6673d54ef 100644
--- a/oneflow/compatible_single_client_python/framework/session_util.py
+++ b/oneflow/compatible_single_client_python/framework/session_util.py
@@ -18,43 +18,43 @@ from __future__ import absolute_import
 import threading
 from oneflow.compatible.single_client.core.job.job_set_pb2 import ConfigProto
 from oneflow.compatible.single_client.core.job import job_set_pb2 as job_set_util
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import compiler as compiler
-from oneflow.compatible_single_client_python.framework import config_util as config_util
-from oneflow.compatible_single_client_python.framework import env_util as env_util
-from oneflow.compatible_single_client_python.framework import typing_util as oft_util
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import compiler as compiler
+from oneflow.compatible.single_client.python.framework import config_util as config_util
+from oneflow.compatible.single_client.python.framework import env_util as env_util
+from oneflow.compatible.single_client.python.framework import typing_util as oft_util
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import (
     job_instance as job_instance_util,
 )
-from oneflow.compatible_single_client_python.framework import push_util as push_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import push_util as push_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.eager import op_executor as op_executor
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.eager import op_executor as op_executor
+from oneflow.compatible.single_client.python.experimental import (
     interface_op_read_and_write,
 )
 from oneflow.compatible.single_client.core.job.job_set_pb2 import ConfigProto
-from oneflow.compatible_single_client_python.framework.function_desc import FunctionDesc
-from oneflow.compatible_single_client_python.framework import module as module_util
-from oneflow.compatible_single_client_python.framework.pull_util import (
+from oneflow.compatible.single_client.python.framework.function_desc import FunctionDesc
+from oneflow.compatible.single_client.python.framework import module as module_util
+from oneflow.compatible.single_client.python.framework.pull_util import (
     LazyFutureRemoteBlobs,
     EagerFutureRemoteBlobs,
 )
-from oneflow.compatible_single_client_python.framework.session_context import (
+from oneflow.compatible.single_client.python.framework.session_context import (
     SessionStatus,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
-from oneflow.compatible_single_client_python.framework.function_desc import FunctionDesc
-from oneflow.compatible_single_client_python.framework.check_point import (
+from oneflow.compatible.single_client.python.framework.function_desc import FunctionDesc
+from oneflow.compatible.single_client.python.framework.check_point import (
     SnapshotManager,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     check_point_v2 as check_point_v2,
 )
 from contextlib import contextmanager
diff --git a/oneflow/compatible_single_client_python/framework/sysconfig.py b/oneflow/compatible_single_client_python/framework/sysconfig.py
index c93189119..3039e70d0 100644
--- a/oneflow/compatible_single_client_python/framework/sysconfig.py
+++ b/oneflow/compatible_single_client_python/framework/sysconfig.py
@@ -20,7 +20,7 @@ import imp
 import importlib.util
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import List
 import oneflow._oneflow_internal
 
diff --git a/oneflow/compatible_single_client_python/framework/tensor.py b/oneflow/compatible_single_client_python/framework/tensor.py
index e18381355..a3dbb8b6a 100644
--- a/oneflow/compatible_single_client_python/framework/tensor.py
+++ b/oneflow/compatible_single_client_python/framework/tensor.py
@@ -16,8 +16,8 @@ limitations under the License.
 from oneflow.compatible.single_client.core.job import (
     initializer_conf_pb2 as initializer_conf_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
@@ -25,21 +25,21 @@ import numpy as np
 import inspect
 from typing import Union
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     check_point_v2 as check_point_v2,
 )
-from oneflow.compatible_single_client_python.framework.function_util import (
+from oneflow.compatible.single_client.python.framework.function_util import (
     global_function_or_identity,
 )
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.framework import ofblob as ofblob_util
-from oneflow.compatible_single_client_python.lib.core import async_util as async_util
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.framework import ofblob as ofblob_util
+from oneflow.compatible.single_client.python.lib.core import async_util as async_util
+from oneflow.compatible.single_client.python.ops import (
     initializer_util as initializer_util,
 )
-from oneflow.compatible_single_client_python.framework import dtype as dtype_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import dtype as dtype_util
+from oneflow.compatible.single_client.python.framework import (
     tensor_str as tensor_str_util,
 )
 from oneflow.compatible import single_client as flow
diff --git a/oneflow/compatible_single_client_python/framework/tensor_tuple_util.py b/oneflow/compatible_single_client_python/framework/tensor_tuple_util.py
index 4c7deb582..d19d5f620 100644
--- a/oneflow/compatible_single_client_python/framework/tensor_tuple_util.py
+++ b/oneflow/compatible_single_client_python/framework/tensor_tuple_util.py
@@ -17,7 +17,7 @@ limitations under the License.
 import collections
 from typing import Union, Sequence, Tuple, Optional
 
-from oneflow.compatible_single_client_python.framework.tensor import Tensor as PyTensor
+from oneflow.compatible.single_client.python.framework.tensor import Tensor as PyTensor
 from oneflow._oneflow_internal import TensorTuple, Tensor
 
 
diff --git a/oneflow/compatible_single_client_python/framework/typing.py b/oneflow/compatible_single_client_python/framework/typing.py
index 26dda4dbe..caa0fa5e4 100644
--- a/oneflow/compatible_single_client_python/framework/typing.py
+++ b/oneflow/compatible_single_client_python/framework/typing.py
@@ -17,8 +17,8 @@ from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
 from typing import Sequence, Optional
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_def,
 )
 import typing
diff --git a/oneflow/compatible_single_client_python/framework/typing_util.py b/oneflow/compatible_single_client_python/framework/typing_util.py
index 5f5f8fa61..a65181971 100644
--- a/oneflow/compatible_single_client_python/framework/typing_util.py
+++ b/oneflow/compatible_single_client_python/framework/typing_util.py
@@ -17,15 +17,15 @@ from __future__ import absolute_import
 
 import typing
 import inspect
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     local_blob as local_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import pull_util as pull_util
-from oneflow.compatible_single_client_python.framework import typing as oft
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.framework import pull_util as pull_util
+from oneflow.compatible.single_client.python.framework import typing as oft
+from oneflow.compatible.single_client.python.experimental import (
     enable_typing_check as enable_typing_check,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/framework/unittest.py b/oneflow/compatible_single_client_python/framework/unittest.py
index d478c0449..5327dbcd8 100644
--- a/oneflow/compatible_single_client_python/framework/unittest.py
+++ b/oneflow/compatible_single_client_python/framework/unittest.py
@@ -26,9 +26,9 @@ import atexit
 from tempfile import NamedTemporaryFile
 from google.protobuf import text_format as pbtxt
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import env_util as env_util
+from oneflow.compatible.single_client.python.framework import env_util as env_util
 from oneflow.compatible.single_client.core.job.env_pb2 import EnvProto
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Any, Dict, Callable
 import subprocess
 
diff --git a/oneflow/compatible_single_client_python/framework/watcher.py b/oneflow/compatible_single_client_python/framework/watcher.py
index 52841516d..b3ba33dcd 100644
--- a/oneflow/compatible_single_client_python/framework/watcher.py
+++ b/oneflow/compatible_single_client_python/framework/watcher.py
@@ -18,17 +18,17 @@ from __future__ import absolute_import
 import traceback
 
 from oneflow.compatible.single_client.core.record import record_pb2 as record_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     local_blob as local_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import ofblob as ofblob
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import ofblob as ofblob
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import typing_util as oft_util
+from oneflow.compatible.single_client.python.framework import typing_util as oft_util
 import oneflow._oneflow_internal
 from google.protobuf import text_format
 
diff --git a/oneflow/compatible_single_client_python/lib/core/box.py b/oneflow/compatible_single_client_python/lib/core/box.py
index 92c3cc986..6b3ef9cf3 100644
--- a/oneflow/compatible_single_client_python/lib/core/box.py
+++ b/oneflow/compatible_single_client_python/lib/core/box.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 class Box(object):
diff --git a/oneflow/compatible_single_client_python/lib/core/enable_if.py b/oneflow/compatible_single_client_python/lib/core/enable_if.py
index b86e92925..441299a8e 100644
--- a/oneflow/compatible_single_client_python/lib/core/enable_if.py
+++ b/oneflow/compatible_single_client_python/lib/core/enable_if.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 import inspect
 
-from oneflow.compatible_single_client_python.lib.core import traceinfo as traceinfo
+from oneflow.compatible.single_client.python.lib.core import traceinfo as traceinfo
 
 
 def condition(hob_expr):
diff --git a/oneflow/compatible_single_client_python/nn/init.py b/oneflow/compatible_single_client_python/nn/init.py
index 7f4ccc83b..5ad3ae652 100644
--- a/oneflow/compatible_single_client_python/nn/init.py
+++ b/oneflow/compatible_single_client_python/nn/init.py
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.ops.initializer_util import CalcGain
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.ops.initializer_util import CalcGain
 
 
 @oneflow_export("nn.init.calculate_gain")
diff --git a/oneflow/compatible_single_client_python/nn/module.py b/oneflow/compatible_single_client_python/nn/module.py
index a8d580b5c..26c6b945b 100644
--- a/oneflow/compatible_single_client_python/nn/module.py
+++ b/oneflow/compatible_single_client_python/nn/module.py
@@ -22,15 +22,15 @@ import itertools
 import numpy as np
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework.check_point_v2 import (
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework.check_point_v2 import (
     FeedValueToVariable,
 )
-from oneflow.compatible_single_client_python.framework.function_util import (
+from oneflow.compatible.single_client.python.framework.function_util import (
     global_function_or_identity,
 )
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.nn.parameter import Parameter
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.nn.parameter import Parameter
 
 
 class _IncompatibleKeys(
diff --git a/oneflow/compatible_single_client_python/nn/modules/abs.py b/oneflow/compatible_single_client_python/nn/modules/abs.py
index 19c141e1d..bd550f504 100644
--- a/oneflow/compatible_single_client_python/nn/modules/abs.py
+++ b/oneflow/compatible_single_client_python/nn/modules/abs.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Abs(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/acos.py b/oneflow/compatible_single_client_python/nn/modules/acos.py
index 0e8701cbd..ba7390d15 100644
--- a/oneflow/compatible_single_client_python/nn/modules/acos.py
+++ b/oneflow/compatible_single_client_python/nn/modules/acos.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Acos(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/acosh.py b/oneflow/compatible_single_client_python/nn/modules/acosh.py
index d86420e6b..ffec5db18 100644
--- a/oneflow/compatible_single_client_python/nn/modules/acosh.py
+++ b/oneflow/compatible_single_client_python/nn/modules/acosh.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 class Acosh(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/activation.py b/oneflow/compatible_single_client_python/nn/modules/activation.py
index 9375be4eb..104657424 100644
--- a/oneflow/compatible_single_client_python/nn/modules/activation.py
+++ b/oneflow/compatible_single_client_python/nn/modules/activation.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Optional
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/adaptive_pool.py b/oneflow/compatible_single_client_python/nn/modules/adaptive_pool.py
index 425e72a79..49666b92e 100644
--- a/oneflow/compatible_single_client_python/nn/modules/adaptive_pool.py
+++ b/oneflow/compatible_single_client_python/nn/modules/adaptive_pool.py
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/arange.py b/oneflow/compatible_single_client_python/nn/modules/arange.py
index 21ccd4742..1b9f9e0aa 100644
--- a/oneflow/compatible_single_client_python/nn/modules/arange.py
+++ b/oneflow/compatible_single_client_python/nn/modules/arange.py
@@ -16,12 +16,12 @@ limitations under the License.
 from typing import Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Arange(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/argmax.py b/oneflow/compatible_single_client_python/nn/modules/argmax.py
index d2ca40f52..8e944c397 100644
--- a/oneflow/compatible_single_client_python/nn/modules/argmax.py
+++ b/oneflow/compatible_single_client_python/nn/modules/argmax.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.ops.transpose_util import (
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.ops.transpose_util import (
     get_perm_when_transpose_axis_to_last_dim,
     get_inversed_perm,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/argsort.py b/oneflow/compatible_single_client_python/nn/modules/argsort.py
index e4c3cad43..cd78efb6c 100644
--- a/oneflow/compatible_single_client_python/nn/modules/argsort.py
+++ b/oneflow/compatible_single_client_python/nn/modules/argsort.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.ops.transpose_util import (
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.ops.transpose_util import (
     get_perm_when_transpose_axis_to_last_dim,
     get_inversed_perm,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/argwhere.py b/oneflow/compatible_single_client_python/nn/modules/argwhere.py
index 72167a45f..647148b19 100644
--- a/oneflow/compatible_single_client_python/nn/modules/argwhere.py
+++ b/oneflow/compatible_single_client_python/nn/modules/argwhere.py
@@ -17,12 +17,12 @@ from typing import Optional
 
 from oneflow.compatible import single_client as flow
 import numpy as np
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Argwhere(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/atan2.py b/oneflow/compatible_single_client_python/nn/modules/atan2.py
index 7870612fa..d55d9bca3 100644
--- a/oneflow/compatible_single_client_python/nn/modules/atan2.py
+++ b/oneflow/compatible_single_client_python/nn/modules/atan2.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 class Atan2(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/atanh.py b/oneflow/compatible_single_client_python/nn/modules/atanh.py
index 141b39c50..eb64f436e 100644
--- a/oneflow/compatible_single_client_python/nn/modules/atanh.py
+++ b/oneflow/compatible_single_client_python/nn/modules/atanh.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Atanh(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/batchnorm.py b/oneflow/compatible_single_client_python/nn/modules/batchnorm.py
index a860108b4..bbd653bd0 100644
--- a/oneflow/compatible_single_client_python/nn/modules/batchnorm.py
+++ b/oneflow/compatible_single_client_python/nn/modules/batchnorm.py
@@ -16,11 +16,11 @@ limitations under the License.
 from typing import Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 class _NormBase(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/bmm.py b/oneflow/compatible_single_client_python/nn/modules/bmm.py
index b552e73c8..99b971908 100644
--- a/oneflow/compatible_single_client_python/nn/modules/bmm.py
+++ b/oneflow/compatible_single_client_python/nn/modules/bmm.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class BMM(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/broadcast_like.py b/oneflow/compatible_single_client_python/nn/modules/broadcast_like.py
index e386112e8..51ed58420 100644
--- a/oneflow/compatible_single_client_python/nn/modules/broadcast_like.py
+++ b/oneflow/compatible_single_client_python/nn/modules/broadcast_like.py
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/cast.py b/oneflow/compatible_single_client_python/nn/modules/cast.py
index b6ea4bf63..c5b12c3d5 100644
--- a/oneflow/compatible_single_client_python/nn/modules/cast.py
+++ b/oneflow/compatible_single_client_python/nn/modules/cast.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Cast(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/chunk.py b/oneflow/compatible_single_client_python/nn/modules/chunk.py
index eed0e2b6d..3ad466a6a 100644
--- a/oneflow/compatible_single_client_python/nn/modules/chunk.py
+++ b/oneflow/compatible_single_client_python/nn/modules/chunk.py
@@ -16,14 +16,14 @@ limitations under the License.
 from typing import Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.ops.array_ops import check_slice_tup_list
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.ops.array_ops import check_slice_tup_list
 
 
 class Chunk(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/concat.py b/oneflow/compatible_single_client_python/nn/modules/concat.py
index 2e17e5cf3..73cbbe50b 100644
--- a/oneflow/compatible_single_client_python/nn/modules/concat.py
+++ b/oneflow/compatible_single_client_python/nn/modules/concat.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Optional, Sequence
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/constant.py b/oneflow/compatible_single_client_python/nn/modules/constant.py
index 51e8126e4..40040dedc 100644
--- a/oneflow/compatible_single_client_python/nn/modules/constant.py
+++ b/oneflow/compatible_single_client_python/nn/modules/constant.py
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.common_types import _size_any_t
-from oneflow.compatible_single_client_python.nn.modules.utils import _single
+from oneflow.compatible.single_client.python.nn.common_types import _size_any_t
+from oneflow.compatible.single_client.python.nn.modules.utils import _single
 
 from typing import Optional, Union
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/constantpad2d.py b/oneflow/compatible_single_client_python/nn/modules/constantpad2d.py
index afb992267..a1ce3a101 100644
--- a/oneflow/compatible_single_client_python/nn/modules/constantpad2d.py
+++ b/oneflow/compatible_single_client_python/nn/modules/constantpad2d.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 from typing import Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 @oneflow_export("nn.ConstantPad2d")
diff --git a/oneflow/compatible_single_client_python/nn/modules/container.py b/oneflow/compatible_single_client_python/nn/modules/container.py
index 6e342abb4..d0ac55069 100644
--- a/oneflow/compatible_single_client_python/nn/modules/container.py
+++ b/oneflow/compatible_single_client_python/nn/modules/container.py
@@ -20,11 +20,11 @@ from itertools import islice
 import operator
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.module import Module
 
 from typing import (
     Any,
@@ -55,14 +55,14 @@ class Sequential(Module):
 
         >>> import oneflow.compatible.single_client.experimental.nn as nn
         >>> nn.Sequential(nn.Conv2d(1,20,5), nn.ReLU(), nn.Conv2d(20,64,5), nn.ReLU()) #doctest: +ELLIPSIS
-        <oneflow.compatible_single_client_python.nn.modules.container.Sequential object at 0x...>
+        <oneflow.compatible.single_client.python.nn.modules.container.Sequential object at 0x...>
         >>> nn.Sequential(OrderedDict([
         ...    ('conv1', nn.Conv2d(1,20,5)),
         ...    ('relu1', nn.ReLU()),
         ...    ('conv2', nn.Conv2d(20,64,5)),
         ...    ('relu2', nn.ReLU())
         ... ])) #doctest: +ELLIPSIS
-        <oneflow.compatible_single_client_python.nn.modules.container.Sequential object at 0x...>
+        <oneflow.compatible.single_client.python.nn.modules.container.Sequential object at 0x...>
 
     """
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/conv.py b/oneflow/compatible_single_client_python/nn/modules/conv.py
index e27e77ab7..aeaf504c7 100644
--- a/oneflow/compatible_single_client_python/nn/modules/conv.py
+++ b/oneflow/compatible_single_client_python/nn/modules/conv.py
@@ -15,14 +15,14 @@ limitations under the License.
 """
 import math
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.nn.modules.utils import _single, _pair
-from oneflow.compatible_single_client_python.nn.common_types import _size_1_t, _size_2_t
-from oneflow.compatible_single_client_python.nn import init
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.modules.utils import _single, _pair
+from oneflow.compatible.single_client.python.nn.common_types import _size_1_t, _size_2_t
+from oneflow.compatible.single_client.python.nn import init
 
 
 def slice(x, begin, size):
diff --git a/oneflow/compatible_single_client_python/nn/modules/dataset.py b/oneflow/compatible_single_client_python/nn/modules/dataset.py
index f7ac2d387..d4badef51 100644
--- a/oneflow/compatible_single_client_python/nn/modules/dataset.py
+++ b/oneflow/compatible_single_client_python/nn/modules/dataset.py
@@ -15,18 +15,18 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.nn.modules.utils import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.modules.utils import (
     _single,
     _pair,
     _triple,
     _reverse_repeat_tuple,
 )
-from oneflow.compatible_single_client_python.nn.common_types import (
+from oneflow.compatible.single_client.python.nn.common_types import (
     _size_1_t,
     _size_2_t,
     _size_3_t,
diff --git a/oneflow/compatible_single_client_python/nn/modules/deconv.py b/oneflow/compatible_single_client_python/nn/modules/deconv.py
index f12a4a7f9..69dccb42c 100644
--- a/oneflow/compatible_single_client_python/nn/modules/deconv.py
+++ b/oneflow/compatible_single_client_python/nn/modules/deconv.py
@@ -15,14 +15,14 @@ limitations under the License.
 """
 import math
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.modules.utils import _pair
-from oneflow.compatible_single_client_python.nn.common_types import _size_2_t
-from oneflow.compatible_single_client_python.nn import init
+from oneflow.compatible.single_client.python.nn.modules.utils import _pair
+from oneflow.compatible.single_client.python.nn.common_types import _size_2_t
+from oneflow.compatible.single_client.python.nn import init
 
 
 def slice(x, begin, size):
diff --git a/oneflow/compatible_single_client_python/nn/modules/dropout.py b/oneflow/compatible_single_client_python/nn/modules/dropout.py
index 4de6cd8dc..d9d4337ac 100644
--- a/oneflow/compatible_single_client_python/nn/modules/dropout.py
+++ b/oneflow/compatible_single_client_python/nn/modules/dropout.py
@@ -16,12 +16,12 @@ limitations under the License.
 import sys
 import random
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import id_util as id_util
 
 
 class _DropoutNd(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/eq.py b/oneflow/compatible_single_client_python/nn/modules/eq.py
index d2045b851..0381c4640 100644
--- a/oneflow/compatible_single_client_python/nn/modules/eq.py
+++ b/oneflow/compatible_single_client_python/nn/modules/eq.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Eq(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/exp.py b/oneflow/compatible_single_client_python/nn/modules/exp.py
index b80a4bebf..9226ff181 100644
--- a/oneflow/compatible_single_client_python/nn/modules/exp.py
+++ b/oneflow/compatible_single_client_python/nn/modules/exp.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Exp(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/expand.py b/oneflow/compatible_single_client_python/nn/modules/expand.py
index c4ad53187..90579bb8f 100644
--- a/oneflow/compatible_single_client_python/nn/modules/expand.py
+++ b/oneflow/compatible_single_client_python/nn/modules/expand.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Optional
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/flatten.py b/oneflow/compatible_single_client_python/nn/modules/flatten.py
index 94d8c7e38..dc92b4a84 100644
--- a/oneflow/compatible_single_client_python/nn/modules/flatten.py
+++ b/oneflow/compatible_single_client_python/nn/modules/flatten.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 @oneflow_export("nn.Flatten")
diff --git a/oneflow/compatible_single_client_python/nn/modules/floor.py b/oneflow/compatible_single_client_python/nn/modules/floor.py
index a6c6670a2..d3b86910e 100644
--- a/oneflow/compatible_single_client_python/nn/modules/floor.py
+++ b/oneflow/compatible_single_client_python/nn/modules/floor.py
@@ -18,13 +18,13 @@ import collections
 from typing import Optional, Sequence, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.modules.utils import _check_axis
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.modules.utils import _check_axis
 
 
 class Floor(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/gather.py b/oneflow/compatible_single_client_python/nn/modules/gather.py
index a7f020a12..1d59836ce 100644
--- a/oneflow/compatible_single_client_python/nn/modules/gather.py
+++ b/oneflow/compatible_single_client_python/nn/modules/gather.py
@@ -15,13 +15,13 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
 
 from typing import Optional, List, Tuple
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/greater.py b/oneflow/compatible_single_client_python/nn/modules/greater.py
index b2896eb8b..5405b9446 100644
--- a/oneflow/compatible_single_client_python/nn/modules/greater.py
+++ b/oneflow/compatible_single_client_python/nn/modules/greater.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Greater(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/greater_equal.py b/oneflow/compatible_single_client_python/nn/modules/greater_equal.py
index 780faf307..72a36d203 100644
--- a/oneflow/compatible_single_client_python/nn/modules/greater_equal.py
+++ b/oneflow/compatible_single_client_python/nn/modules/greater_equal.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class GreaterEqual(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/instancenorm.py b/oneflow/compatible_single_client_python/nn/modules/instancenorm.py
index 30ddf0a9e..ac42dd99f 100644
--- a/oneflow/compatible_single_client_python/nn/modules/instancenorm.py
+++ b/oneflow/compatible_single_client_python/nn/modules/instancenorm.py
@@ -15,8 +15,8 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.nn.modules.batchnorm import _NormBase
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.modules.batchnorm import _NormBase
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/less.py b/oneflow/compatible_single_client_python/nn/modules/less.py
index 5e0ef753b..795b2751c 100644
--- a/oneflow/compatible_single_client_python/nn/modules/less.py
+++ b/oneflow/compatible_single_client_python/nn/modules/less.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Less(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/less_equal.py b/oneflow/compatible_single_client_python/nn/modules/less_equal.py
index 57287dbf3..f080db753 100644
--- a/oneflow/compatible_single_client_python/nn/modules/less_equal.py
+++ b/oneflow/compatible_single_client_python/nn/modules/less_equal.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class LessEqual(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/linear.py b/oneflow/compatible_single_client_python/nn/modules/linear.py
index 28994db23..839fb8adc 100644
--- a/oneflow/compatible_single_client_python/nn/modules/linear.py
+++ b/oneflow/compatible_single_client_python/nn/modules/linear.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.nn.init import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.init import (
     _calculate_fan_in_and_fan_out,
 )
 from typing import Optional, List, Tuple
diff --git a/oneflow/compatible_single_client_python/nn/modules/log1p.py b/oneflow/compatible_single_client_python/nn/modules/log1p.py
index 76e024868..ef65641a3 100644
--- a/oneflow/compatible_single_client_python/nn/modules/log1p.py
+++ b/oneflow/compatible_single_client_python/nn/modules/log1p.py
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Log1p(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/loss.py b/oneflow/compatible_single_client_python/nn/modules/loss.py
index 0ba45f3cc..c6a53fbd9 100644
--- a/oneflow/compatible_single_client_python/nn/modules/loss.py
+++ b/oneflow/compatible_single_client_python/nn/modules/loss.py
@@ -16,13 +16,13 @@ limitations under the License.
 from typing import Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.nn.modules.constant import _ConstantBase
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.modules.constant import _ConstantBase
 
 
 @oneflow_export("nn.L1Loss")
diff --git a/oneflow/compatible_single_client_python/nn/modules/masked_fill.py b/oneflow/compatible_single_client_python/nn/modules/masked_fill.py
index 155d69ef0..0b5968328 100644
--- a/oneflow/compatible_single_client_python/nn/modules/masked_fill.py
+++ b/oneflow/compatible_single_client_python/nn/modules/masked_fill.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class MaskedFill(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/masked_select.py b/oneflow/compatible_single_client_python/nn/modules/masked_select.py
index 98c856f38..64f4d2f46 100644
--- a/oneflow/compatible_single_client_python/nn/modules/masked_select.py
+++ b/oneflow/compatible_single_client_python/nn/modules/masked_select.py
@@ -15,13 +15,13 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.ops.array_ops import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.ops.array_ops import (
     argwhere,
     gather,
     gather_nd,
diff --git a/oneflow/compatible_single_client_python/nn/modules/math_ops.py b/oneflow/compatible_single_client_python/nn/modules/math_ops.py
index a65a18ca3..bdeb4d732 100644
--- a/oneflow/compatible_single_client_python/nn/modules/math_ops.py
+++ b/oneflow/compatible_single_client_python/nn/modules/math_ops.py
@@ -18,14 +18,14 @@ import collections
 from typing import Optional, Sequence, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.modules.utils import _check_axis
-from oneflow.compatible_single_client_python.ops.transpose_util import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.modules.utils import _check_axis
+from oneflow.compatible.single_client.python.ops.transpose_util import (
     get_perm_when_transpose_axis_to_last_dim,
     get_inversed_perm,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/matmul.py b/oneflow/compatible_single_client_python/nn/modules/matmul.py
index c9815f894..f997fc30b 100644
--- a/oneflow/compatible_single_client_python/nn/modules/matmul.py
+++ b/oneflow/compatible_single_client_python/nn/modules/matmul.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework import id_util as id_util
 from typing import Optional, Sequence
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/meshgrid.py b/oneflow/compatible_single_client_python/nn/modules/meshgrid.py
index 66c98fc37..f010d492f 100644
--- a/oneflow/compatible_single_client_python/nn/modules/meshgrid.py
+++ b/oneflow/compatible_single_client_python/nn/modules/meshgrid.py
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/ne.py b/oneflow/compatible_single_client_python/nn/modules/ne.py
index a79c8be3c..477f555a0 100644
--- a/oneflow/compatible_single_client_python/nn/modules/ne.py
+++ b/oneflow/compatible_single_client_python/nn/modules/ne.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Ne(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/negative.py b/oneflow/compatible_single_client_python/nn/modules/negative.py
index 55f0d0700..f7bbdc3f2 100644
--- a/oneflow/compatible_single_client_python/nn/modules/negative.py
+++ b/oneflow/compatible_single_client_python/nn/modules/negative.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Negative(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/norm.py b/oneflow/compatible_single_client_python/nn/modules/norm.py
index dacdf9fc4..2cddb46af 100644
--- a/oneflow/compatible_single_client_python/nn/modules/norm.py
+++ b/oneflow/compatible_single_client_python/nn/modules/norm.py
@@ -16,12 +16,12 @@ limitations under the License.
 
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Norm(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/normalization.py b/oneflow/compatible_single_client_python/nn/modules/normalization.py
index 7ffa7cb8e..4aa8d69f8 100644
--- a/oneflow/compatible_single_client_python/nn/modules/normalization.py
+++ b/oneflow/compatible_single_client_python/nn/modules/normalization.py
@@ -15,13 +15,13 @@ limitations under the License.
 """
 import oneflow
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn import init
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn import init
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
 from typing import Tuple, Union
 
 _shape_t = Union[int, Tuple[int], oneflow._oneflow_internal.Size]
diff --git a/oneflow/compatible_single_client_python/nn/modules/padding.py b/oneflow/compatible_single_client_python/nn/modules/padding.py
index ae2a7b420..d359604c9 100644
--- a/oneflow/compatible_single_client_python/nn/modules/padding.py
+++ b/oneflow/compatible_single_client_python/nn/modules/padding.py
@@ -16,11 +16,11 @@ limitations under the License.
 from typing import Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 @oneflow_export("nn.ReplicationPad2d")
diff --git a/oneflow/compatible_single_client_python/nn/modules/permute.py b/oneflow/compatible_single_client_python/nn/modules/permute.py
index 4373398eb..f440dd591 100644
--- a/oneflow/compatible_single_client_python/nn/modules/permute.py
+++ b/oneflow/compatible_single_client_python/nn/modules/permute.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Optional, Sequence
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/pixelshuffle.py b/oneflow/compatible_single_client_python/nn/modules/pixelshuffle.py
index 55b501cd6..99889b323 100644
--- a/oneflow/compatible_single_client_python/nn/modules/pixelshuffle.py
+++ b/oneflow/compatible_single_client_python/nn/modules/pixelshuffle.py
@@ -13,12 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 @oneflow_export("nn.PixelShuffle")
diff --git a/oneflow/compatible_single_client_python/nn/modules/pooling.py b/oneflow/compatible_single_client_python/nn/modules/pooling.py
index e6ed5091a..6f9866d7c 100644
--- a/oneflow/compatible_single_client_python/nn/modules/pooling.py
+++ b/oneflow/compatible_single_client_python/nn/modules/pooling.py
@@ -16,22 +16,22 @@ limitations under the License.
 from typing import Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.nn.modules.utils import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.modules.utils import (
     _single,
     _pair,
     _triple,
 )
-from oneflow.compatible_single_client_python.nn.common_types import (
+from oneflow.compatible.single_client.python.nn.common_types import (
     _size_1_t,
     _size_2_t,
     _size_3_t,
 )
-from oneflow.compatible_single_client_python.ops.nn_ops import (
+from oneflow.compatible.single_client.python.ops.nn_ops import (
     calc_pool_padding,
     get_dhw_offset,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/reduce_ops.py b/oneflow/compatible_single_client_python/nn/modules/reduce_ops.py
index ee76a364f..829921019 100644
--- a/oneflow/compatible_single_client_python/nn/modules/reduce_ops.py
+++ b/oneflow/compatible_single_client_python/nn/modules/reduce_ops.py
@@ -18,13 +18,13 @@ import collections
 from typing import Optional, Sequence, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.modules.utils import _check_axis
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.modules.utils import _check_axis
 
 
 def _build_reduce_op(op_type_name, keepdims):
diff --git a/oneflow/compatible_single_client_python/nn/modules/repeat.py b/oneflow/compatible_single_client_python/nn/modules/repeat.py
index eccee128c..6d2946d7e 100644
--- a/oneflow/compatible_single_client_python/nn/modules/repeat.py
+++ b/oneflow/compatible_single_client_python/nn/modules/repeat.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Repeat(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/reshape.py b/oneflow/compatible_single_client_python/nn/modules/reshape.py
index 6f4015aa4..7d7b41cf2 100644
--- a/oneflow/compatible_single_client_python/nn/modules/reshape.py
+++ b/oneflow/compatible_single_client_python/nn/modules/reshape.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Sequence
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/round.py b/oneflow/compatible_single_client_python/nn/modules/round.py
index 9327e391d..eb70cccd5 100644
--- a/oneflow/compatible_single_client_python/nn/modules/round.py
+++ b/oneflow/compatible_single_client_python/nn/modules/round.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Round(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/sign.py b/oneflow/compatible_single_client_python/nn/modules/sign.py
index d87cd6efe..2242c967a 100644
--- a/oneflow/compatible_single_client_python/nn/modules/sign.py
+++ b/oneflow/compatible_single_client_python/nn/modules/sign.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 class Sign(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/sinh.py b/oneflow/compatible_single_client_python/nn/modules/sinh.py
index 0cbc18422..1ab491402 100644
--- a/oneflow/compatible_single_client_python/nn/modules/sinh.py
+++ b/oneflow/compatible_single_client_python/nn/modules/sinh.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Sinh(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/slice.py b/oneflow/compatible_single_client_python/nn/modules/slice.py
index 9322e213e..c286a23c7 100644
--- a/oneflow/compatible_single_client_python/nn/modules/slice.py
+++ b/oneflow/compatible_single_client_python/nn/modules/slice.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 import numpy as np
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.ops.array_ops import (
+from oneflow.compatible.single_client.python.ops.array_ops import (
     check_slice_tup_list,
     GetSliceAttrs,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/softplus.py b/oneflow/compatible_single_client_python/nn/modules/softplus.py
index 18979ba8d..dfd8383e3 100644
--- a/oneflow/compatible_single_client_python/nn/modules/softplus.py
+++ b/oneflow/compatible_single_client_python/nn/modules/softplus.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Softplus(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/sort.py b/oneflow/compatible_single_client_python/nn/modules/sort.py
index a09232821..158887a63 100644
--- a/oneflow/compatible_single_client_python/nn/modules/sort.py
+++ b/oneflow/compatible_single_client_python/nn/modules/sort.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.ops.transpose_util import (
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.ops.transpose_util import (
     get_perm_when_transpose_axis_to_last_dim,
     get_inversed_perm,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/sparse.py b/oneflow/compatible_single_client_python/nn/modules/sparse.py
index 35d46be55..79787adc9 100644
--- a/oneflow/compatible_single_client_python/nn/modules/sparse.py
+++ b/oneflow/compatible_single_client_python/nn/modules/sparse.py
@@ -15,9 +15,9 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.nn.module import Module
 
 from typing import Optional, List, Tuple
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/squeeze.py b/oneflow/compatible_single_client_python/nn/modules/squeeze.py
index b70501ffb..40801a05b 100644
--- a/oneflow/compatible_single_client_python/nn/modules/squeeze.py
+++ b/oneflow/compatible_single_client_python/nn/modules/squeeze.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework import id_util as id_util
 from typing import Optional, Sequence
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/stack.py b/oneflow/compatible_single_client_python/nn/modules/stack.py
index 4a3b51087..39fb7e3e2 100644
--- a/oneflow/compatible_single_client_python/nn/modules/stack.py
+++ b/oneflow/compatible_single_client_python/nn/modules/stack.py
@@ -15,13 +15,13 @@ limitations under the License.
 """
 from oneflow.compatible import single_client as flow
 from typing import List, Tuple
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
 
 
 class Stack(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/tan.py b/oneflow/compatible_single_client_python/nn/modules/tan.py
index 5c74bbb63..946b1f7a6 100644
--- a/oneflow/compatible_single_client_python/nn/modules/tan.py
+++ b/oneflow/compatible_single_client_python/nn/modules/tan.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Tan(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/tensor_buffer.py b/oneflow/compatible_single_client_python/nn/modules/tensor_buffer.py
index d2624864d..44caac5c4 100644
--- a/oneflow/compatible_single_client_python/nn/modules/tensor_buffer.py
+++ b/oneflow/compatible_single_client_python/nn/modules/tensor_buffer.py
@@ -16,8 +16,8 @@ limitations under the License.
 from typing import Sequence, Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/tensor_ops.py b/oneflow/compatible_single_client_python/nn/modules/tensor_ops.py
index 8add93391..f577c04a6 100644
--- a/oneflow/compatible_single_client_python/nn/modules/tensor_ops.py
+++ b/oneflow/compatible_single_client_python/nn/modules/tensor_ops.py
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import experimental_api
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.oneflow_export import experimental_api
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class TypeAs(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/tile.py b/oneflow/compatible_single_client_python/nn/modules/tile.py
index ad32b121d..7dd33ddcc 100644
--- a/oneflow/compatible_single_client_python/nn/modules/tile.py
+++ b/oneflow/compatible_single_client_python/nn/modules/tile.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 from typing import Union
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import (
+from oneflow.compatible.single_client.python.framework.tensor import (
     Tensor,
     register_tensor_op,
 )
diff --git a/oneflow/compatible_single_client_python/nn/modules/to.py b/oneflow/compatible_single_client_python/nn/modules/to.py
index 326670df4..ed0d1078a 100644
--- a/oneflow/compatible_single_client_python/nn/modules/to.py
+++ b/oneflow/compatible_single_client_python/nn/modules/to.py
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Optional, Union
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/transpose.py b/oneflow/compatible_single_client_python/nn/modules/transpose.py
index e7387a9f9..1c52304e3 100644
--- a/oneflow/compatible_single_client_python/nn/modules/transpose.py
+++ b/oneflow/compatible_single_client_python/nn/modules/transpose.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Optional, Sequence
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/triu.py b/oneflow/compatible_single_client_python/nn/modules/triu.py
index ebff3e931..9c477f649 100644
--- a/oneflow/compatible_single_client_python/nn/modules/triu.py
+++ b/oneflow/compatible_single_client_python/nn/modules/triu.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Triu(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/unsqueeze.py b/oneflow/compatible_single_client_python/nn/modules/unsqueeze.py
index 0bae797a9..67606d678 100644
--- a/oneflow/compatible_single_client_python/nn/modules/unsqueeze.py
+++ b/oneflow/compatible_single_client_python/nn/modules/unsqueeze.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Unsqueeze(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/upsampling.py b/oneflow/compatible_single_client_python/nn/modules/upsampling.py
index b13ab8b2d..2bc313856 100644
--- a/oneflow/compatible_single_client_python/nn/modules/upsampling.py
+++ b/oneflow/compatible_single_client_python/nn/modules/upsampling.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 from typing import Optional, Union, Tuple
 
 
diff --git a/oneflow/compatible_single_client_python/nn/modules/where.py b/oneflow/compatible_single_client_python/nn/modules/where.py
index dcf5ed9e4..1db5655a0 100644
--- a/oneflow/compatible_single_client_python/nn/modules/where.py
+++ b/oneflow/compatible_single_client_python/nn/modules/where.py
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.nn.module import Module
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.nn.module import Module
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.framework.tensor import register_tensor_op
+from oneflow.compatible.single_client.python.framework.tensor import register_tensor_op
 
 
 class Where(Module):
diff --git a/oneflow/compatible_single_client_python/nn/modules/zeropad2d.py b/oneflow/compatible_single_client_python/nn/modules/zeropad2d.py
index 4e43dfc31..385b3c9a2 100644
--- a/oneflow/compatible_single_client_python/nn/modules/zeropad2d.py
+++ b/oneflow/compatible_single_client_python/nn/modules/zeropad2d.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 from typing import Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.module import Module
+from oneflow.compatible.single_client.python.nn.module import Module
 
 
 @oneflow_export("nn.ZeroPad2d")
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/adam.py b/oneflow/compatible_single_client_python/nn/optimizer/adam.py
index 8bb6132fd..a0caa9b8d 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/adam.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/adam.py
@@ -19,12 +19,12 @@ import collections
 
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.parameter import Parameter
-from oneflow.compatible_single_client_python.nn.optimizer.optimizer import (
+from oneflow.compatible.single_client.python.nn.parameter import Parameter
+from oneflow.compatible.single_client.python.nn.optimizer.optimizer import (
     Optimizer,
     ParamGroup,
 )
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/adamw.py b/oneflow/compatible_single_client_python/nn/optimizer/adamw.py
index 2d95d835d..a4f8cddbc 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/adamw.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/adamw.py
@@ -19,12 +19,12 @@ import collections
 
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.parameter import Parameter
-from oneflow.compatible_single_client_python.nn.optimizer.optimizer import (
+from oneflow.compatible.single_client.python.nn.parameter import Parameter
+from oneflow.compatible.single_client.python.nn.optimizer.optimizer import (
     ParamGroup,
     Optimizer,
 )
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/cosine_annealing_lr.py b/oneflow/compatible_single_client_python/nn/optimizer/cosine_annealing_lr.py
index 4f759146e..aaa120e89 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/cosine_annealing_lr.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/cosine_annealing_lr.py
@@ -16,7 +16,7 @@ limitations under the License.
 
 import math
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     experimental_api,
     oneflow_export,
 )
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/lambda_lr.py b/oneflow/compatible_single_client_python/nn/optimizer/lambda_lr.py
index d9f51505c..691f9ba9e 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/lambda_lr.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/lambda_lr.py
@@ -16,7 +16,7 @@ limitations under the License.
 
 import types
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     experimental_api,
     oneflow_export,
 )
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/lr_scheduler.py b/oneflow/compatible_single_client_python/nn/optimizer/lr_scheduler.py
index 1b69f0ffd..f3e3fb13c 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/lr_scheduler.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/lr_scheduler.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/optimizer.py b/oneflow/compatible_single_client_python/nn/optimizer/optimizer.py
index 38a1f91d8..37004df24 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/optimizer.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/optimizer.py
@@ -18,12 +18,12 @@ import warnings
 from typing import Dict, Callable, Union, Any, Iterator
 import collections
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.parameter import Parameter
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.nn.parameter import Parameter
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
 
 
 class ParamGroup(object):
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/rmsprop.py b/oneflow/compatible_single_client_python/nn/optimizer/rmsprop.py
index 00303222c..baf6d55aa 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/rmsprop.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/rmsprop.py
@@ -19,12 +19,12 @@ import collections
 
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.parameter import Parameter
-from oneflow.compatible_single_client_python.nn.optimizer.optimizer import (
+from oneflow.compatible.single_client.python.nn.parameter import Parameter
+from oneflow.compatible.single_client.python.nn.optimizer.optimizer import (
     ParamGroup,
     Optimizer,
 )
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/sgd.py b/oneflow/compatible_single_client_python/nn/optimizer/sgd.py
index b66db77c2..8401ae40f 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/sgd.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/sgd.py
@@ -19,11 +19,11 @@ import collections
 
 from oneflow.compatible import single_client as flow
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     experimental_api,
 )
-from oneflow.compatible_single_client_python.nn.parameter import Parameter
+from oneflow.compatible.single_client.python.nn.parameter import Parameter
 from .optimizer import Optimizer, ParamGroup
 
 
diff --git a/oneflow/compatible_single_client_python/nn/optimizer/step_lr.py b/oneflow/compatible_single_client_python/nn/optimizer/step_lr.py
index 3ebb647a6..42de67f66 100644
--- a/oneflow/compatible_single_client_python/nn/optimizer/step_lr.py
+++ b/oneflow/compatible_single_client_python/nn/optimizer/step_lr.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     experimental_api,
     oneflow_export,
 )
diff --git a/oneflow/compatible_single_client_python/nn/parameter.py b/oneflow/compatible_single_client_python/nn/parameter.py
index c32fff57b..5168018e4 100644
--- a/oneflow/compatible_single_client_python/nn/parameter.py
+++ b/oneflow/compatible_single_client_python/nn/parameter.py
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework.tensor import Tensor
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework.tensor import Tensor
 
 
 @oneflow_export("nn.Parameter")
diff --git a/oneflow/compatible_single_client_python/oneflow_export.py b/oneflow/compatible_single_client_python/oneflow_export.py
index ce5427d0f..deb32270c 100644
--- a/oneflow/compatible_single_client_python/oneflow_export.py
+++ b/oneflow/compatible_single_client_python/oneflow_export.py
@@ -17,9 +17,9 @@ import inspect
 import re
 import collections
 
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if_util
-from oneflow.compatible_single_client_python.lib.core import traceinfo as traceinfo
-from oneflow.compatible_single_client_python.lib.core.high_order_bool import always_true
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if_util
+from oneflow.compatible.single_client.python.lib.core import traceinfo as traceinfo
+from oneflow.compatible.single_client.python.lib.core.high_order_bool import always_true
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/__init__.py b/oneflow/compatible_single_client_python/ops/__init__.py
index a9917a263..2b69a218e 100644
--- a/oneflow/compatible_single_client_python/ops/__init__.py
+++ b/oneflow/compatible_single_client_python/ops/__init__.py
@@ -21,25 +21,25 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_context,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.eager import (
     blob_register as blob_register_util,
 )
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
diff --git a/oneflow/compatible_single_client_python/ops/array_ops.py b/oneflow/compatible_single_client_python/ops/array_ops.py
index e7f9805ae..df283e8d1 100644
--- a/oneflow/compatible_single_client_python/ops/array_ops.py
+++ b/oneflow/compatible_single_client_python/ops/array_ops.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import
 from functools import reduce
 from typing import Iterable, List, Optional, Sequence, Union, Tuple
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
@@ -28,11 +28,11 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/assign_op.py b/oneflow/compatible_single_client_python/ops/assign_op.py
index e60bf3352..cdb7680cc 100644
--- a/oneflow/compatible_single_client_python/ops/assign_op.py
+++ b/oneflow/compatible_single_client_python/ops/assign_op.py
@@ -22,24 +22,24 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     placement_context as placement_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from oneflow.compatible import single_client as flow
 
 
diff --git a/oneflow/compatible_single_client_python/ops/builtin_ops.py b/oneflow/compatible_single_client_python/ops/builtin_ops.py
index 5b0849e47..51ddc7b77 100644
--- a/oneflow/compatible_single_client_python/ops/builtin_ops.py
+++ b/oneflow/compatible_single_client_python/ops/builtin_ops.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework.attr_util import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework.attr_util import (
     convert_to_user_attr_value,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("builtin_op")
diff --git a/oneflow/compatible_single_client_python/ops/categorical_ordinal_encode_op.py b/oneflow/compatible_single_client_python/ops/categorical_ordinal_encode_op.py
index d0040684e..87b49c5c8 100644
--- a/oneflow/compatible_single_client_python/ops/categorical_ordinal_encode_op.py
+++ b/oneflow/compatible_single_client_python/ops/categorical_ordinal_encode_op.py
@@ -15,11 +15,11 @@ limitations under the License.
 """
 from __future__ import absolute_import
 from typing import Optional
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/combined_margin_loss.py b/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
index 58586fddf..edafc73a4 100644
--- a/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
+++ b/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
@@ -24,18 +24,18 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import module as module_util
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.framework import module as module_util
+from oneflow.compatible.single_client.python.ops import (
     math_unary_elementwise_ops as math_unary_elementwise_ops,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/constant_op.py b/oneflow/compatible_single_client_python/ops/constant_op.py
index 81ded7d15..9a52a05fa 100644
--- a/oneflow/compatible_single_client_python/ops/constant_op.py
+++ b/oneflow/compatible_single_client_python/ops/constant_op.py
@@ -23,14 +23,14 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
diff --git a/oneflow/compatible_single_client_python/ops/count_not_finite.py b/oneflow/compatible_single_client_python/ops/count_not_finite.py
index 81ff5beab..24c952c26 100644
--- a/oneflow/compatible_single_client_python/ops/count_not_finite.py
+++ b/oneflow/compatible_single_client_python/ops/count_not_finite.py
@@ -22,14 +22,14 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 from typing import Optional, Union, Sequence
 
diff --git a/oneflow/compatible_single_client_python/ops/data_ops.py b/oneflow/compatible_single_client_python/ops/data_ops.py
index 013ca86a3..e4bd9cacd 100644
--- a/oneflow/compatible_single_client_python/ops/data_ops.py
+++ b/oneflow/compatible_single_client_python/ops/data_ops.py
@@ -25,14 +25,14 @@ from oneflow.compatible.single_client.core.job import (
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
diff --git a/oneflow/compatible_single_client_python/ops/diag_ops.py b/oneflow/compatible_single_client_python/ops/diag_ops.py
index a076e0dc5..03f4099ee 100644
--- a/oneflow/compatible_single_client_python/ops/diag_ops.py
+++ b/oneflow/compatible_single_client_python/ops/diag_ops.py
@@ -15,9 +15,9 @@ limitations under the License.
 """
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 from typing import Optional
diff --git a/oneflow/compatible_single_client_python/ops/domain_ops.py b/oneflow/compatible_single_client_python/ops/domain_ops.py
index 91b429f6b..f2ce5bffc 100644
--- a/oneflow/compatible_single_client_python/ops/domain_ops.py
+++ b/oneflow/compatible_single_client_python/ops/domain_ops.py
@@ -17,9 +17,9 @@ limitations under the License.
 import typing
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import id_util as id_util
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("nn.fused_self_attention_query_mul_key_and_value")
diff --git a/oneflow/compatible_single_client_python/ops/eager_nccl_ops.py b/oneflow/compatible_single_client_python/ops/eager_nccl_ops.py
index f9d516aef..f33e44b7d 100644
--- a/oneflow/compatible_single_client_python/ops/eager_nccl_ops.py
+++ b/oneflow/compatible_single_client_python/ops/eager_nccl_ops.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 from typing import Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/get_variable.py b/oneflow/compatible_single_client_python/ops/get_variable.py
index 039db439e..2beb04b50 100644
--- a/oneflow/compatible_single_client_python/ops/get_variable.py
+++ b/oneflow/compatible_single_client_python/ops/get_variable.py
@@ -15,22 +15,22 @@ limitations under the License.
 """
 from __future__ import absolute_import
 from typing import Optional, Sequence, Union
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_context,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.experimental import (
     name_scope as name_scope,
 )
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
@@ -43,11 +43,11 @@ from oneflow.compatible.single_client.core.job import (
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.eager import boxing_util as boxing_util
-from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
-from oneflow.compatible_single_client_python.eager import op_executor as op_executor
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.eager import boxing_util as boxing_util
+from oneflow.compatible.single_client.python.eager import gradient_util as gradient_util
+from oneflow.compatible.single_client.python.eager import op_executor as op_executor
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
 from oneflow.compatible import single_client as flow
 from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/initializer_util.py b/oneflow/compatible_single_client_python/ops/initializer_util.py
index 7061b76af..89033d42e 100644
--- a/oneflow/compatible_single_client_python/ops/initializer_util.py
+++ b/oneflow/compatible_single_client_python/ops/initializer_util.py
@@ -25,7 +25,7 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.job import (
     initializer_conf_pb2 as initializer_conf_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Optional, Sequence, Union
 
 
diff --git a/oneflow/compatible_single_client_python/ops/layers.py b/oneflow/compatible_single_client_python/ops/layers.py
index 0ae6c4e16..01c3cec1e 100644
--- a/oneflow/compatible_single_client_python/ops/layers.py
+++ b/oneflow/compatible_single_client_python/ops/layers.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 from typing import Callable, Optional, Union, Tuple, Sequence
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
@@ -25,10 +25,10 @@ from oneflow.compatible.single_client.core.job import (
 from oneflow.compatible.single_client.core.job import (
     regularizer_conf_pb2 as regularizer_conf_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/linalg.py b/oneflow/compatible_single_client_python/ops/linalg.py
index 97719ef63..c15e71a1d 100644
--- a/oneflow/compatible_single_client_python/ops/linalg.py
+++ b/oneflow/compatible_single_client_python/ops/linalg.py
@@ -22,14 +22,14 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
diff --git a/oneflow/compatible_single_client_python/ops/loss_ops.py b/oneflow/compatible_single_client_python/ops/loss_ops.py
index d791100bd..d87e20334 100644
--- a/oneflow/compatible_single_client_python/ops/loss_ops.py
+++ b/oneflow/compatible_single_client_python/ops/loss_ops.py
@@ -16,9 +16,9 @@ limitations under the License.
 from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/losses/add_loss.py b/oneflow/compatible_single_client_python/ops/losses/add_loss.py
index d3a4a789a..610df435b 100644
--- a/oneflow/compatible_single_client_python/ops/losses/add_loss.py
+++ b/oneflow/compatible_single_client_python/ops/losses/add_loss.py
@@ -15,12 +15,12 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.eager import gradient_util as gradient_util
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/math_binary_elementwise_ops.py b/oneflow/compatible_single_client_python/ops/math_binary_elementwise_ops.py
index ee6898a0d..21fb0d389 100644
--- a/oneflow/compatible_single_client_python/ops/math_binary_elementwise_ops.py
+++ b/oneflow/compatible_single_client_python/ops/math_binary_elementwise_ops.py
@@ -19,11 +19,11 @@ import os
 from typing import Optional, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/math_ops.py b/oneflow/compatible_single_client_python/ops/math_ops.py
index 9f1bb6e24..d86c19909 100644
--- a/oneflow/compatible_single_client_python/ops/math_ops.py
+++ b/oneflow/compatible_single_client_python/ops/math_ops.py
@@ -23,25 +23,25 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import module as module_util
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.framework import module as module_util
+from oneflow.compatible.single_client.python.ops import (
     math_unary_elementwise_ops as math_unary_elementwise_ops,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
-from oneflow.compatible_single_client_python.ops.transpose_util import (
+from oneflow.compatible.single_client.python.ops.transpose_util import (
     get_perm_when_transpose_axis_to_last_dim,
 )
-from oneflow.compatible_single_client_python.ops.transpose_util import get_inversed_perm
+from oneflow.compatible.single_client.python.ops.transpose_util import get_inversed_perm
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py b/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py
index 0682e1c12..c5a1b2db4 100644
--- a/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py
+++ b/oneflow/compatible_single_client_python/ops/math_unary_elementwise_ops.py
@@ -24,17 +24,17 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.ops import (
     user_op_builder as user_op_builder,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/nn_ops.py b/oneflow/compatible_single_client_python/ops/nn_ops.py
index 111fbb9e3..5066f7b8d 100644
--- a/oneflow/compatible_single_client_python/ops/nn_ops.py
+++ b/oneflow/compatible_single_client_python/ops/nn_ops.py
@@ -25,18 +25,18 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import module as module_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import module as module_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
diff --git a/oneflow/compatible_single_client_python/ops/one_hot.py b/oneflow/compatible_single_client_python/ops/one_hot.py
index 3fa6a0b1c..716aa5bf9 100644
--- a/oneflow/compatible_single_client_python/ops/one_hot.py
+++ b/oneflow/compatible_single_client_python/ops/one_hot.py
@@ -22,14 +22,14 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 from typing import Optional, Union
 
diff --git a/oneflow/compatible_single_client_python/ops/optimizer.py b/oneflow/compatible_single_client_python/ops/optimizer.py
index 38b729e3a..874f1a32e 100644
--- a/oneflow/compatible_single_client_python/ops/optimizer.py
+++ b/oneflow/compatible_single_client_python/ops/optimizer.py
@@ -20,12 +20,12 @@ import traceback
 from typing import Optional, Union, Sequence, List, Text, Callable
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import runtime_mode as rt_mode
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import runtime_mode as rt_mode
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     oneflow_deprecate,
 )
diff --git a/oneflow/compatible_single_client_python/ops/pad.py b/oneflow/compatible_single_client_python/ops/pad.py
index 120a8f0b0..20aa13d26 100644
--- a/oneflow/compatible_single_client_python/ops/pad.py
+++ b/oneflow/compatible_single_client_python/ops/pad.py
@@ -18,11 +18,11 @@ from __future__ import absolute_import
 from typing import Optional, Sequence, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
diff --git a/oneflow/compatible_single_client_python/ops/partial_fc_sample.py b/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
index 269321c71..2edc2add7 100644
--- a/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
+++ b/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
@@ -22,14 +22,14 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Optional, Union
 import oneflow._oneflow_internal
 
diff --git a/oneflow/compatible_single_client_python/ops/prelu.py b/oneflow/compatible_single_client_python/ops/prelu.py
index 9963d0a97..0e6012222 100644
--- a/oneflow/compatible_single_client_python/ops/prelu.py
+++ b/oneflow/compatible_single_client_python/ops/prelu.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 from typing import Optional, Sequence
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
@@ -25,10 +25,10 @@ from oneflow.compatible.single_client.core.job import (
 from oneflow.compatible.single_client.core.job import (
     regularizer_conf_pb2 as regularizer_conf_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/quantize_ops.py b/oneflow/compatible_single_client_python/ops/quantize_ops.py
index e12e3f90a..58c4bdb15 100644
--- a/oneflow/compatible_single_client_python/ops/quantize_ops.py
+++ b/oneflow/compatible_single_client_python/ops/quantize_ops.py
@@ -15,11 +15,11 @@ limitations under the License.
 """
 from __future__ import absolute_import
 from typing import Tuple, Optional
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/ops/random_ops.py b/oneflow/compatible_single_client_python/ops/random_ops.py
index 0d16a2b3e..2cb1bf150 100644
--- a/oneflow/compatible_single_client_python/ops/random_ops.py
+++ b/oneflow/compatible_single_client_python/ops/random_ops.py
@@ -15,14 +15,14 @@ limitations under the License.
 """
 from __future__ import absolute_import
 from typing import Optional
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import module as module_util
+from oneflow.compatible.single_client.python.framework import module as module_util
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/random_util.py b/oneflow/compatible_single_client_python/ops/random_util.py
index 96c2c6808..174217073 100644
--- a/oneflow/compatible_single_client_python/ops/random_util.py
+++ b/oneflow/compatible_single_client_python/ops/random_util.py
@@ -13,13 +13,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
 import typing
 import random
 import sys
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("random.gen_seed")
diff --git a/oneflow/compatible_single_client_python/ops/reduce_mean.py b/oneflow/compatible_single_client_python/ops/reduce_mean.py
index d37b4bbbe..e2e44fbcd 100644
--- a/oneflow/compatible_single_client_python/ops/reduce_mean.py
+++ b/oneflow/compatible_single_client_python/ops/reduce_mean.py
@@ -23,11 +23,11 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/reduce_ops.py b/oneflow/compatible_single_client_python/ops/reduce_ops.py
index 7956c4811..ebdd80c81 100644
--- a/oneflow/compatible_single_client_python/ops/reduce_ops.py
+++ b/oneflow/compatible_single_client_python/ops/reduce_ops.py
@@ -21,14 +21,14 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.register import (
     logical_blob_id_pb2 as logical_blob_id_util,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/regularizer_util.py b/oneflow/compatible_single_client_python/ops/regularizer_util.py
index 5043db3e3..1d50aa693 100644
--- a/oneflow/compatible_single_client_python/ops/regularizer_util.py
+++ b/oneflow/compatible_single_client_python/ops/regularizer_util.py
@@ -19,7 +19,7 @@ from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_con
 from oneflow.compatible.single_client.core.job import (
     regularizer_conf_pb2 as regularizer_conf_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("regularizers.l1_l2")
diff --git a/oneflow/compatible_single_client_python/ops/sort_ops.py b/oneflow/compatible_single_client_python/ops/sort_ops.py
index 654bc8bc5..a9dbf349e 100644
--- a/oneflow/compatible_single_client_python/ops/sort_ops.py
+++ b/oneflow/compatible_single_client_python/ops/sort_ops.py
@@ -18,18 +18,18 @@ from __future__ import absolute_import
 from typing import Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
-from oneflow.compatible_single_client_python.ops.transpose_util import (
+from oneflow.compatible.single_client.python.ops.transpose_util import (
     get_perm_when_transpose_axis_to_last_dim,
 )
-from oneflow.compatible_single_client_python.ops.transpose_util import get_inversed_perm
+from oneflow.compatible.single_client.python.ops.transpose_util import get_inversed_perm
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/summary_ops.py b/oneflow/compatible_single_client_python/ops/summary_ops.py
index 2c8018326..515a284d2 100644
--- a/oneflow/compatible_single_client_python/ops/summary_ops.py
+++ b/oneflow/compatible_single_client_python/ops/summary_ops.py
@@ -15,9 +15,9 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.ops import (
     user_op_builder as user_op_builder,
 )
 
diff --git a/oneflow/compatible_single_client_python/ops/tensor_buffer_ops.py b/oneflow/compatible_single_client_python/ops/tensor_buffer_ops.py
index 5839c7686..791bd3f88 100644
--- a/oneflow/compatible_single_client_python/ops/tensor_buffer_ops.py
+++ b/oneflow/compatible_single_client_python/ops/tensor_buffer_ops.py
@@ -20,8 +20,8 @@ import operator
 
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.oneflow_export import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.oneflow_export import (
     oneflow_export,
     stable_api,
 )
diff --git a/oneflow/compatible_single_client_python/ops/two_stage_reduce.py b/oneflow/compatible_single_client_python/ops/two_stage_reduce.py
index 85940cf71..fe6efeee8 100644
--- a/oneflow/compatible_single_client_python/ops/two_stage_reduce.py
+++ b/oneflow/compatible_single_client_python/ops/two_stage_reduce.py
@@ -18,19 +18,19 @@ from __future__ import absolute_import
 from typing import Optional, Sequence, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     distribute as distribute_util,
 )
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.ops import (
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.ops import (
     user_op_builder as user_op_builder,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/ops/user_data_ops.py b/oneflow/compatible_single_client_python/ops/user_data_ops.py
index afcd548cc..59c822be0 100644
--- a/oneflow/compatible_single_client_python/ops/user_data_ops.py
+++ b/oneflow/compatible_single_client_python/ops/user_data_ops.py
@@ -16,13 +16,13 @@ limitations under the License.
 from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import module as module_util
+from oneflow.compatible.single_client.python.framework import module as module_util
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 from typing import Optional, Sequence, Union
 import random
 import sys
diff --git a/oneflow/compatible_single_client_python/ops/user_op_builder.py b/oneflow/compatible_single_client_python/ops/user_op_builder.py
index 9c4433a6f..0470afe5f 100644
--- a/oneflow/compatible_single_client_python/ops/user_op_builder.py
+++ b/oneflow/compatible_single_client_python/ops/user_op_builder.py
@@ -13,22 +13,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     interpret_util as interpret_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_context,
 )
-from oneflow.compatible_single_client_python.framework import distribute as distribute
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import distribute as distribute
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 from oneflow.compatible.single_client.core.framework import (
     user_op_attr_pb2 as attr_value_pb,
@@ -42,20 +42,20 @@ from oneflow.compatible.single_client.core.register import (
 from oneflow._oneflow_internal.oneflow.core.common import shape as shape_cfg
 from oneflow._oneflow_internal.oneflow.core.common import data_type as data_type_cfg
 from oneflow.compatible import single_client as flow
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import hob as hob
-from oneflow.compatible_single_client_python.experimental import (
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import hob as hob
+from oneflow.compatible.single_client.python.experimental import (
     name_scope as name_scope,
 )
 from oneflow.compatible.single_client.core.eager import (
     eager_symbol_pb2 as eager_symbol_util,
 )
-from oneflow.compatible_single_client_python.eager import (
+from oneflow.compatible.single_client.python.eager import (
     eager_blob_util as eager_blob_util,
 )
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
 import random
-from oneflow.compatible_single_client_python.eager import gradient_util as gradient_util
+from oneflow.compatible.single_client.python.eager import gradient_util as gradient_util
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
 import traceback
diff --git a/oneflow/compatible_single_client_python/ops/util/custom_op_module.py b/oneflow/compatible_single_client_python/ops/util/custom_op_module.py
index 0c43b1802..f8b4e15b7 100644
--- a/oneflow/compatible_single_client_python/ops/util/custom_op_module.py
+++ b/oneflow/compatible_single_client_python/ops/util/custom_op_module.py
@@ -24,8 +24,8 @@ import sys
 import sysconfig
 import numpy
 
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import (
     sysconfig as oneflow_sysconfig,
 )
 from oneflow.compatible import single_client as flow
diff --git a/oneflow/compatible_single_client_python/ops/watch.py b/oneflow/compatible_single_client_python/ops/watch.py
index 8476b7c3a..06d84bb61 100644
--- a/oneflow/compatible_single_client_python/ops/watch.py
+++ b/oneflow/compatible_single_client_python/ops/watch.py
@@ -19,30 +19,30 @@ import uuid
 from typing import Callable, Optional, Union
 
 from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_context,
 )
-from oneflow.compatible_single_client_python.framework import id_util as id_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import id_util as id_util
+from oneflow.compatible.single_client.python.framework import (
     local_blob as local_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     remote_blob as remote_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import watcher as watcher_util
-from oneflow.compatible_single_client_python.framework import typing as oft
-from oneflow.compatible_single_client_python.framework import typing_util as oft_util
-from oneflow.compatible_single_client_python.lib.core import enable_if as enable_if
-from oneflow.compatible_single_client_python.framework import hob as hob
+from oneflow.compatible.single_client.python.framework import watcher as watcher_util
+from oneflow.compatible.single_client.python.framework import typing as oft
+from oneflow.compatible.single_client.python.framework import typing_util as oft_util
+from oneflow.compatible.single_client.python.lib.core import enable_if as enable_if
+from oneflow.compatible.single_client.python.framework import hob as hob
 from oneflow.compatible.single_client.core.job.lbi_diff_watcher_info_pb2 import (
     LbiAndDiffWatcherUuidPair,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
-from oneflow.compatible_single_client_python import eager as eager_util
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python import eager as eager_util
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
 from oneflow._oneflow_internal import ConsistentBlob, MirroredBlob
diff --git a/oneflow/compatible_single_client_python/serving/inference_session.py b/oneflow/compatible_single_client_python/serving/inference_session.py
index d902fabfa..e7dc4789e 100644
--- a/oneflow/compatible_single_client_python/serving/inference_session.py
+++ b/oneflow/compatible_single_client_python/serving/inference_session.py
@@ -38,28 +38,28 @@ from oneflow.compatible.single_client.core.operator import (
 from oneflow.compatible.single_client.core.serving import (
     saved_model_pb2 as saved_model_pb,
 )
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     compile_context as compile_ctx,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     session_util as session_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     placement_util as placement_util,
 )
-from oneflow.compatible_single_client_python.framework import scope_util as scope_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import scope_util as scope_util
+from oneflow.compatible.single_client.python.framework import (
     runtime_mode as runtime_mode,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     job_instance as job_instance_util,
 )
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import (
     input_blob_def as input_blob_util,
 )
-from oneflow.compatible_single_client_python.framework import dtype as dtype_util
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.framework import dtype as dtype_util
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 def _is_int(val):
diff --git a/oneflow/compatible_single_client_python/serving/saved_model_builder.py b/oneflow/compatible_single_client_python/serving/saved_model_builder.py
index aeb82f062..1f1a2c581 100644
--- a/oneflow/compatible_single_client_python/serving/saved_model_builder.py
+++ b/oneflow/compatible_single_client_python/serving/saved_model_builder.py
@@ -20,8 +20,8 @@ from google.protobuf import text_format
 
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.compatible_single_client_python.framework import c_api_util as c_api_util
-from oneflow.compatible_single_client_python.framework import (
+from oneflow.compatible.single_client.python.framework import c_api_util as c_api_util
+from oneflow.compatible.single_client.python.framework import (
     session_context as session_ctx,
 )
 from oneflow.compatible.single_client.core.serving import (
@@ -37,7 +37,7 @@ from oneflow.compatible.single_client.core.operator import (
 from oneflow.compatible.single_client.core.job import (
     sbp_parallel_pb2 as sbp_parallel_pb,
 )
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 @oneflow_export("saved_model.ModelBuilder")
diff --git a/oneflow/compatible_single_client_python/summary/summary_graph.py b/oneflow/compatible_single_client_python/summary/summary_graph.py
index 93b83c130..b1944dc55 100644
--- a/oneflow/compatible_single_client_python/summary/summary_graph.py
+++ b/oneflow/compatible_single_client_python/summary/summary_graph.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 import os
 from oneflow.compatible.single_client.core.summary import projector_pb2 as projector_pb2
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import oneflow._oneflow_internal
 import time
 import logging
diff --git a/oneflow/compatible_single_client_python/summary/summary_hparams.py b/oneflow/compatible_single_client_python/summary/summary_hparams.py
index 1d6355645..0f4f3117f 100644
--- a/oneflow/compatible_single_client_python/summary/summary_hparams.py
+++ b/oneflow/compatible_single_client_python/summary/summary_hparams.py
@@ -30,7 +30,7 @@ from oneflow.compatible.single_client.core.summary import summary_pb2 as summary
 from oneflow.compatible.single_client.core.summary import event_pb2 as event_pb2
 from oneflow.compatible.single_client.core.summary import tensor_pb2 as tensor_pb2
 from oneflow.compatible.single_client.core.summary import projector_pb2 as projector_pb2
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 
 
 from oneflow.compatible import single_client as flow
diff --git a/oneflow/compatible_single_client_python/summary/summary_projector.py b/oneflow/compatible_single_client_python/summary/summary_projector.py
index 0cbcfbf72..1a491f9ff 100644
--- a/oneflow/compatible_single_client_python/summary/summary_projector.py
+++ b/oneflow/compatible_single_client_python/summary/summary_projector.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 import os
 from oneflow.compatible.single_client.core.summary import projector_pb2 as projector_pb2
-from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
+from oneflow.compatible.single_client.python.oneflow_export import oneflow_export
 import time
 
 from oneflow.compatible import single_client as flow
diff --git a/tools/conver_single_client_name_space.py b/tools/conver_single_client_name_space.py
deleted file mode 100644
index 9755c913e..000000000
--- a/tools/conver_single_client_name_space.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import sys
-import os
-import multiprocessing
-
-project_source_dir = sys.argv[1]
-single_client_python_dir = project_source_dir + "/compatible"
-
-
-single_client_python_files = []
-for root, dirs, files in os.walk(project_source_dir):
-    for file in files:
-        file_path = os.path.join(root, file)
-        if file_path.endswith(".py"):
-            single_client_python_files.append(file_path)
-
-assert len(single_client_python_files) > 0
-
-
-def convert_name_sapce(python_file):
-    os.system(
-        "sed 's/compatible_single_client_python/compatible\.single_client\.python/g' -i "
-        + python_file
-    )
-
-
-if __name__ == "__main__":
-    with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as pool:
-        pool.map(convert_name_sapce, single_client_python_files)
-        pool.close()
-        pool.join()
-- 
GitLab