diff --git a/cmake/oneflow.cmake b/cmake/oneflow.cmake
index 15bc67304fffb753f2335739644f7c4136504736..8989a2d7e59c5d03afe1a42a7b49e68625d26128 100644
--- a/cmake/oneflow.cmake
+++ b/cmake/oneflow.cmake
@@ -309,6 +309,8 @@ add_custom_target(of_pyscript_copy ALL
     COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/oneflow/python/distributed/launch.py" "${of_pyscript_dir}/oneflow/distributed/launch.py"
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${of_proto_python_dir}/oneflow/core" "${of_pyscript_dir}/oneflow/core"
     COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/core/__init__.py"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${of_proto_python_dir}/oneflow/core" "${of_pyscript_dir}/oneflow/compatible/single_client/core"
+    COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/compatible/single_client/core/__init__.py"
     COMMAND ${CMAKE_COMMAND} -E make_directory "${of_pyscript_dir}/oneflow/F"
     COMMAND ${CMAKE_COMMAND} -E touch "${of_pyscript_dir}/oneflow/F/__init__.py"
     COMMAND ${CMAKE_COMMAND} -E make_directory "${of_pyscript_dir}/oneflow/compatible/single_client/F"
diff --git a/oneflow/compatible_single_client_python/advanced/distribute_ops.py b/oneflow/compatible_single_client_python/advanced/distribute_ops.py
index 0c2e7fcd3509c82670748d66d70b35e6a7f62ad5..09d61c6a76e9b31f52830c12be7ab2b000adb6b8 100644
--- a/oneflow/compatible_single_client_python/advanced/distribute_ops.py
+++ b/oneflow/compatible_single_client_python/advanced/distribute_ops.py
@@ -16,8 +16,10 @@ limitations under the License.
 from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
diff --git a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py
index 5b7503f6b2586e9188b6e730e2cfb3a92011e419..951fcdf8fb9cb0c0daf45529f5379af730f78375 100755
--- a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py
+++ b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/bert.py
@@ -16,8 +16,8 @@ limitations under the License.
 import math
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.common import data_type_pb2 as data_type_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 
 class BertBackbone(object):
diff --git a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py
index 235e4d55393bcfd61e11983c92342fdc4d8715fd..0befc1686684840c46b0ca1e17a2615b4f51d119 100755
--- a/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py
+++ b/oneflow/compatible_single_client_python/benchmarks/bert_benchmark/pretrain.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 import bert as bert_util
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 
 def PreTrain(
diff --git a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py
index 8ba267c6c0cce6cc67fb82433111620dd9dc4651..df8bc97746023afde0cb120af3ccffc3a9d76d69 100644
--- a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py
+++ b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/inceptionv3_model.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import, division, print_function
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 
 def _conv2d_layer(
diff --git a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py
index 257c30ad5555d01fed1215f72a5f20aca4b1a636..a5fb81847dd8b34ba5079f4072590f5d6a776040 100755
--- a/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py
+++ b/oneflow/compatible_single_client_python/benchmarks/cnn_benchmark/vgg_model.py
@@ -16,8 +16,10 @@ limitations under the License.
 from __future__ import absolute_import, division, print_function
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
 from model_util import conv2d_layer
 
 
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 9bcb94e217d39534a12fe526daa314e246bae300..c668eadb86fc277cb8318b2b0681a099ce5e90a1 100644
--- a/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
+++ b/oneflow/compatible_single_client_python/deprecated/init_cluster_env.py
@@ -23,8 +23,10 @@ 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.core.job.env_pb2 import EnvProto
-from oneflow.core.control.ctrl_bootstrap_pb2 import BootstrapConf
+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
 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 e33384f1b3832b830fd531bb31a83b991f434bee..33b434f2c7d7b52ad7617a411b0ac3e02cced50f 100644
--- a/oneflow/compatible_single_client_python/deprecated/initializer_util.py
+++ b/oneflow/compatible_single_client_python/deprecated/initializer_util.py
@@ -15,9 +15,13 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.core.common import data_type_pb2 as data_type_conf_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.common import (
+    data_type_pb2 as data_type_conf_util,
+)
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+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
 
 
diff --git a/oneflow/compatible_single_client_python/eager/boxing_middle.py b/oneflow/compatible_single_client_python/eager/boxing_middle.py
index 2ddf5c82387d8f213e0758a1ff2be8556705e58b..a4586bd13dfd2b3507654aefac4e8c095bfeac53 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_middle.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_middle.py
@@ -16,7 +16,9 @@ limitations under the License.
 from __future__ import absolute_import
 
 from oneflow.compatible_single_client_python.eager import symbol as symbol_util
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.job import (
+    sbp_parallel_pb2 as sbp_parallel_pb,
+)
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
 from oneflow._oneflow_internal.oneflow.core.common import shape as shape_proto_cfg
 import oneflow._oneflow_internal
diff --git a/oneflow/compatible_single_client_python/eager/boxing_util.py b/oneflow/compatible_single_client_python/eager/boxing_util.py
index a62e020ee922ab9faba98c07b68d89f717d22a14..0f5e5dc62ec087ffe09cf53487d8e3dc1acd4bed 100644
--- a/oneflow/compatible_single_client_python/eager/boxing_util.py
+++ b/oneflow/compatible_single_client_python/eager/boxing_util.py
@@ -17,9 +17,13 @@ from __future__ import absolute_import
 
 from contextlib import contextmanager
 from oneflow.compatible_single_client_python.eager import symbol as symbol_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_pb
-from oneflow.core.operator import op_attribute_pb2 as op_attribute_pb
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+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,
+)
+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 (
@@ -29,7 +33,9 @@ from oneflow.compatible_single_client_python.lib.core import enable_if as enable
 from oneflow.compatible_single_client_python.lib.core import (
     high_order_bool as high_order_bool,
 )
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+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
diff --git a/oneflow/compatible_single_client_python/eager/interpreter_callback.py b/oneflow/compatible_single_client_python/eager/interpreter_callback.py
index a5e3d115baacc5c3c1c00cb39ca954ff7dc7f20e..d387c7449243fb1234658d06fbaa70f9adc1d65d 100644
--- a/oneflow/compatible_single_client_python/eager/interpreter_callback.py
+++ b/oneflow/compatible_single_client_python/eager/interpreter_callback.py
@@ -17,9 +17,11 @@ 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.core.operator import op_attribute_pb2 as op_attribute_pb
-from oneflow.core.job import scope_pb2 as scope_pb
-from oneflow.core.job import placement_pb2 as placement_pb
+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 (
diff --git a/oneflow/compatible_single_client_python/eager/op_executor.py b/oneflow/compatible_single_client_python/eager/op_executor.py
index b775ed1d0e1cacb282cdcbf5d49967da1927749c..2dd4045cf6d8ed5c1e034743c87e4a6a05db78bf 100644
--- a/oneflow/compatible_single_client_python/eager/op_executor.py
+++ b/oneflow/compatible_single_client_python/eager/op_executor.py
@@ -15,10 +15,16 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.core.operator import op_node_signature_pb2 as op_node_signature_pb
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.operator import interface_blob_conf_pb2 as inter_face_blob_conf_util
+from oneflow.compatible.single_client.core.operator import (
+    op_node_signature_pb2 as op_node_signature_pb,
+)
+from oneflow.compatible.single_client.core.register import (
+    logical_blob_id_pb2 as logical_blob_id_util,
+)
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+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 (
     blob_register as blob_register_util,
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 061825fc88706fd6fa538fedff47ca444d0670f3..880a1fdf0c3d10ff022b806529fad0990649135e 100644
--- a/oneflow/compatible_single_client_python/eager/op_infer_util.py
+++ b/oneflow/compatible_single_client_python/eager/op_infer_util.py
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from __future__ import absolute_import
-from oneflow.core.operator import op_node_signature_pb2 as op_node_signature_pb
+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._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 0083b65a168d5b296f6f4f22ef809890108c548e..72a380c431da6ae22190afbbd323fdb9efaa2cc7 100644
--- a/oneflow/compatible_single_client_python/eager/symbol.py
+++ b/oneflow/compatible_single_client_python/eager/symbol.py
@@ -16,7 +16,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.core.job import placement_pb2 as placement_pb
+from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
 import functools
 
 
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 02120b23811447852f792398e3d7971fefc9be68..b13eb57da87afe83e5649447978bb8b5aa0d69fe 100644
--- a/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
+++ b/oneflow/compatible_single_client_python/experimental/indexed_slices_ops.py
@@ -17,8 +17,10 @@ from __future__ import absolute_import
 
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
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 7875c691c261ff9451b5c42cc2c9f6c625daa4dd..95ac989f3d4a2eea4131a856ee3e18673e6b9136 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
@@ -14,7 +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.core.register import logical_blob_id_pb2 as logical_blob_id_util
+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 (
     input_blob_def as input_blob_def_util,
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 47c7bc9c664f3c100db6fab83e447ed60bc75a86..8daaa44e5e6a0514ac5e05ec5b7a2149fa86f8b1 100644
--- a/oneflow/compatible_single_client_python/experimental/square_sum_op.py
+++ b/oneflow/compatible_single_client_python/experimental/square_sum_op.py
@@ -19,8 +19,10 @@ import operator
 from functools import reduce
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
diff --git a/oneflow/compatible_single_client_python/experimental/unique_op.py b/oneflow/compatible_single_client_python/experimental/unique_op.py
index 30975b3c3f7707d8414e002f0dcefc25eb517c3e..0f166dcfb5620de8ba278929b808a89a59f72fba 100644
--- a/oneflow/compatible_single_client_python/experimental/unique_op.py
+++ b/oneflow/compatible_single_client_python/experimental/unique_op.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
 from typing import Optional, Tuple
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
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 d03da5a9822e8a237eb27304d57a3fdf9365a30d..6000c53a0234a6381799240fba452b7164dc959b 100644
--- a/oneflow/compatible_single_client_python/framework/c_api_util.py
+++ b/oneflow/compatible_single_client_python/framework/c_api_util.py
@@ -17,19 +17,25 @@ from __future__ import absolute_import
 
 from google.protobuf import text_format
 
-from oneflow.core.common import data_type_pb2 as dtype_util
-from oneflow.core.common import error_pb2 as error_util
-from oneflow.core.job import env_pb2 as env_pb2
-from oneflow.core.job import job_set_pb2 as job_set_pb
-from oneflow.core.job import job_pb2 as job_pb
-from oneflow.core.job import placement_pb2 as placement_pb
-from oneflow.core.job import resource_pb2 as resource_util
-from oneflow.core.operator import op_attribute_pb2 as op_attribute_pb
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.record import record_pb2 as record_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
-from oneflow.core.framework.config_def_pb2 import ConfigDef
-from oneflow.core.job.inter_user_job_info_pb2 import InterUserJobInfo
+from oneflow.compatible.single_client.core.common import data_type_pb2 as dtype_util
+from oneflow.compatible.single_client.core.common import error_pb2 as error_util
+from oneflow.compatible.single_client.core.job import env_pb2 as env_pb2
+from oneflow.compatible.single_client.core.job import job_set_pb2 as job_set_pb
+from oneflow.compatible.single_client.core.job import job_pb2 as job_pb
+from oneflow.compatible.single_client.core.job import placement_pb2 as placement_pb
+from oneflow.compatible.single_client.core.job import resource_pb2 as resource_util
+from oneflow.compatible.single_client.core.operator import (
+    op_attribute_pb2 as op_attribute_pb,
+)
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.record import record_pb2 as record_util
+from oneflow.compatible.single_client.core.register import (
+    logical_blob_id_pb2 as logical_blob_id_util,
+)
+from oneflow.compatible.single_client.core.framework.config_def_pb2 import ConfigDef
+from oneflow.compatible.single_client.core.job.inter_user_job_info_pb2 import (
+    InterUserJobInfo,
+)
 
 # import oneflow.compatible.single_client as flow
 from oneflow._oneflow_internal.oneflow.core.job import placement as placement_cfg
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 4070286c1b4a5bc1c4c240040964e1932c02a5e6..0b855c031984b839115f4671176b7a7ee6bf707b 100644
--- a/oneflow/compatible_single_client_python/framework/check_point_v2.py
+++ b/oneflow/compatible_single_client_python/framework/check_point_v2.py
@@ -20,14 +20,16 @@ from google.protobuf import text_format
 
 from oneflow.compatible import single_client as flow
 import oneflow._oneflow_internal
-from oneflow.core.operator import op_conf_pb2 as op_conf_pb
+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 (
     initializer_util as initializer_util,
 )
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_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 (
     session_context as session_ctx,
@@ -38,12 +40,18 @@ 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.eager import boxing_util as boxing_util
 from oneflow.compatible_single_client_python.eager import op_infer_util as op_infer_util
-from oneflow.core.framework import variable_meta_info_pb2 as variable_meta_info_pb
-from oneflow.core.framework import user_op_attr_pb2 as attr_value_pb
+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 (
     interface_op_read_and_write,
 )
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+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.oneflow_export import oneflow_export
diff --git a/oneflow/compatible_single_client_python/framework/dtype.py b/oneflow/compatible_single_client_python/framework/dtype.py
index 9c973ba7130b0223c808a5c5a8db713e5ba28843..6228e97759ff698fe9a94558dbff7ed3b472d112 100644
--- a/oneflow/compatible_single_client_python/framework/dtype.py
+++ b/oneflow/compatible_single_client_python/framework/dtype.py
@@ -16,7 +16,7 @@ limitations under the License.
 from __future__ import absolute_import
 
 import numpy as np
-from oneflow.core.common import data_type_pb2 as data_type_pb2
+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 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 71923f37887316872070ec1d24e7dfca2948a710..44f81e7acb1d3ce88a253bd19d80a26ab1be2e6e 100644
--- a/oneflow/compatible_single_client_python/framework/env_util.py
+++ b/oneflow/compatible_single_client_python/framework/env_util.py
@@ -19,8 +19,10 @@ import socket
 import os
 from contextlib import closing
 
-from oneflow.core.control import ctrl_bootstrap_pb2 as ctrl_bootstrap_pb
-from oneflow.core.job import env_pb2 as env_pb
+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 (
     placement_context as placement_ctx,
@@ -29,7 +31,7 @@ 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.core.job import resource_pb2 as resource_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 (
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 8137b9a4c1f5e00a2b421b604d63f41e59c7c935..55c4dd60c8a952d850832b64b892e83349c6a39d 100644
--- a/oneflow/compatible_single_client_python/framework/input_blob_def.py
+++ b/oneflow/compatible_single_client_python/framework/input_blob_def.py
@@ -22,9 +22,13 @@ from typing import Any, Optional, Sequence, Union
 import numpy as np
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.operator import interface_blob_conf_pb2 as inter_face_blob_conf_util
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import (
+    interface_blob_conf_pb2 as inter_face_blob_conf_util,
+)
+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 (
     compile_context as compile_context,
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 1606d2d104de5b80483a1aab107ee7dcc57c6610..2ff851bfb5a163098c3eb68e081a4dff7b0a523c 100644
--- a/oneflow/compatible_single_client_python/framework/job_set_util.py
+++ b/oneflow/compatible_single_client_python/framework/job_set_util.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
 
 from typing import Optional, TypeVar
 
-from oneflow.core.job.job_set_pb2 import JobSet
+from oneflow.compatible.single_client.core.job.job_set_pb2 import JobSet
 from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
 
 _VT = TypeVar("_VT")
diff --git a/oneflow/compatible_single_client_python/framework/op_util.py b/oneflow/compatible_single_client_python/framework/op_util.py
index 8e17b9026038dba1b8ec6a4857831ed457c08f4f..4a1a33ae3f513aa8294abc01a7290186b1ce15c9 100644
--- a/oneflow/compatible_single_client_python/framework/op_util.py
+++ b/oneflow/compatible_single_client_python/framework/op_util.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.core.operator.op_conf_pb2 import OperatorConf
+from oneflow.compatible.single_client.core.operator.op_conf_pb2 import OperatorConf
 import oneflow._oneflow_internal
 
 
diff --git a/oneflow/compatible_single_client_python/framework/ops.py b/oneflow/compatible_single_client_python/framework/ops.py
index e6eff14ecb80d6ea414d2340a60ebf5b19561f3c..842d17be6ca61299e41e92007067f25034697e04 100644
--- a/oneflow/compatible_single_client_python/framework/ops.py
+++ b/oneflow/compatible_single_client_python/framework/ops.py
@@ -15,9 +15,11 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.core.common import data_type_pb2 as data_type_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     compile_context as compile_context,
 )
diff --git a/oneflow/compatible_single_client_python/framework/placement_context.py b/oneflow/compatible_single_client_python/framework/placement_context.py
index 5e2ea7fd36111fd04e084a117ad955a796b120bb..4a16e81a5defca972b8034c5a08debaaf32be647 100644
--- a/oneflow/compatible_single_client_python/framework/placement_context.py
+++ b/oneflow/compatible_single_client_python/framework/placement_context.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 import collections
 import re
 
-from oneflow.core.job import placement_pb2 as placement_pb
+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 (
diff --git a/oneflow/compatible_single_client_python/framework/push_util.py b/oneflow/compatible_single_client_python/framework/push_util.py
index 445ba0bb61cd524705cc1bc126eda0364ad41a2d..a088b1e40e92f3716dc096a22e30f17152449cb2 100644
--- a/oneflow/compatible_single_client_python/framework/push_util.py
+++ b/oneflow/compatible_single_client_python/framework/push_util.py
@@ -31,8 +31,10 @@ 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.eager import boxing_util as boxing_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow._oneflow_internal.oneflow.core.register import logical_blob_id as lbi_util
 import oneflow._oneflow_internal
 import numpy
diff --git a/oneflow/compatible_single_client_python/framework/remote_blob.py b/oneflow/compatible_single_client_python/framework/remote_blob.py
index b78a1b6117b499e9b081f88d0c4c156dba7b3297..5795f51630d7b8a8b9d9c420047550804b9ad119 100644
--- a/oneflow/compatible_single_client_python/framework/remote_blob.py
+++ b/oneflow/compatible_single_client_python/framework/remote_blob.py
@@ -16,7 +16,9 @@ limitations under the License.
 from __future__ import absolute_import
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+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 (
diff --git a/oneflow/compatible_single_client_python/framework/session_util.py b/oneflow/compatible_single_client_python/framework/session_util.py
index 7d928ba66cb86f24418e3999816c4db2b4500d11..9e21cee90733ac12517fe5566426be10357d456d 100644
--- a/oneflow/compatible_single_client_python/framework/session_util.py
+++ b/oneflow/compatible_single_client_python/framework/session_util.py
@@ -16,8 +16,8 @@ limitations under the License.
 from __future__ import absolute_import
 
 import threading
-from oneflow.core.job.job_set_pb2 import ConfigProto
-from oneflow.core.job import job_set_pb2 as job_set_util
+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
@@ -36,7 +36,7 @@ from oneflow.compatible_single_client_python.eager import op_executor as op_exec
 from oneflow.compatible_single_client_python.experimental import (
     interface_op_read_and_write,
 )
-from oneflow.core.job.job_set_pb2 import ConfigProto
+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 (
diff --git a/oneflow/compatible_single_client_python/framework/tensor.py b/oneflow/compatible_single_client_python/framework/tensor.py
index 405e27a0872a8b84e0e860d7d6f3677ea28508dc..e18381355571398ddc75369c0714d44b087b1b2f 100644
--- a/oneflow/compatible_single_client_python/framework/tensor.py
+++ b/oneflow/compatible_single_client_python/framework/tensor.py
@@ -13,7 +13,9 @@ 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.core.job import initializer_conf_pb2 as initializer_conf_util
+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 (
     remote_blob as remote_blob_util,
diff --git a/oneflow/compatible_single_client_python/framework/unittest.py b/oneflow/compatible_single_client_python/framework/unittest.py
index b77398e97ca1656af51256765f4a3bfc6cc1ed36..d478c04494e0d103c32196ae3a5a596ae54a4092 100644
--- a/oneflow/compatible_single_client_python/framework/unittest.py
+++ b/oneflow/compatible_single_client_python/framework/unittest.py
@@ -27,7 +27,7 @@ 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.core.job.env_pb2 import EnvProto
+from oneflow.compatible.single_client.core.job.env_pb2 import EnvProto
 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 20a1a779c6f7f8a41be8026eb0327369e023e875..52841516d718e8d09c882ad8fc8c02ebc548643a 100644
--- a/oneflow/compatible_single_client_python/framework/watcher.py
+++ b/oneflow/compatible_single_client_python/framework/watcher.py
@@ -17,7 +17,7 @@ from __future__ import absolute_import
 
 import traceback
 
-from oneflow.core.record import record_pb2 as record_util
+from oneflow.compatible.single_client.core.record import record_pb2 as record_util
 from oneflow.compatible_single_client_python.framework import (
     local_blob as local_blob_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/__init__.py b/oneflow/compatible_single_client_python/ops/__init__.py
index 71766feff029e632e5ba519af6ffa41985b341f6..a9917a263e9a1f2c66dce781b177458f3d55f91d 100644
--- a/oneflow/compatible_single_client_python/ops/__init__.py
+++ b/oneflow/compatible_single_client_python/ops/__init__.py
@@ -17,8 +17,10 @@ from __future__ import absolute_import
 
 import re
 
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 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,
diff --git a/oneflow/compatible_single_client_python/ops/array_ops.py b/oneflow/compatible_single_client_python/ops/array_ops.py
index d8e00ab7c47915b969b88ec978ee3cb9a197c878..e7f9805ae2d79f10d8c884bb317bf60796ddc3e6 100644
--- a/oneflow/compatible_single_client_python/ops/array_ops.py
+++ b/oneflow/compatible_single_client_python/ops/array_ops.py
@@ -24,8 +24,10 @@ from oneflow.compatible_single_client_python.oneflow_export import (
 import numpy as np
 import operator
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/assign_op.py b/oneflow/compatible_single_client_python/ops/assign_op.py
index 81897d93e8c3d8bc8a89ad07a55d75e243f9c287..e60bf33523a901115d106d65dd8bea095fb0852b 100644
--- a/oneflow/compatible_single_client_python/ops/assign_op.py
+++ b/oneflow/compatible_single_client_python/ops/assign_op.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
 import os
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 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,
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 57aa99a0e5f49fad6dd30cd2df558c1dd936bb9f..58586fddf5fc5d74f68c757ac394f481f70bdebd 100644
--- a/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
+++ b/oneflow/compatible_single_client_python/ops/combined_margin_loss.py
@@ -20,8 +20,10 @@ import os
 from typing import Union, Optional, Sequence
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/constant_op.py b/oneflow/compatible_single_client_python/ops/constant_op.py
index 17a5e003912d750282489490976af17fd960defd..81ded7d150ee9e8503f5df5a4f43fc59a3029102 100644
--- a/oneflow/compatible_single_client_python/ops/constant_op.py
+++ b/oneflow/compatible_single_client_python/ops/constant_op.py
@@ -19,8 +19,10 @@ import os
 from typing import Optional, Sequence, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
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 042c5ff39db92a5b2b884eb0e5ce66f10ab87fe3..81ff5beab64f34acddfa975ffe97073bc211ebda 100644
--- a/oneflow/compatible_single_client_python/ops/count_not_finite.py
+++ b/oneflow/compatible_single_client_python/ops/count_not_finite.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
 import os
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     distribute as distribute_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/data_ops.py b/oneflow/compatible_single_client_python/ops/data_ops.py
index 527d585676ea3812124dd667997363c4cd0adc87..013ca86a326cbcd736f5b4c8ec3756edf899825d 100644
--- a/oneflow/compatible_single_client_python/ops/data_ops.py
+++ b/oneflow/compatible_single_client_python/ops/data_ops.py
@@ -18,9 +18,13 @@ from __future__ import absolute_import
 from typing import Optional, Sequence, Tuple, Union, List
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
+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 (
     interpret_util as interpret_util,
diff --git a/oneflow/compatible_single_client_python/ops/get_variable.py b/oneflow/compatible_single_client_python/ops/get_variable.py
index 099afd31a4f13c3381178b2427c7633a83b4d3e7..039db439e637529bf8f7183b1b3a0c0bf8804a7d 100644
--- a/oneflow/compatible_single_client_python/ops/get_variable.py
+++ b/oneflow/compatible_single_client_python/ops/get_variable.py
@@ -33,10 +33,16 @@ from oneflow.compatible_single_client_python.framework import (
 from oneflow.compatible_single_client_python.experimental import (
     name_scope as name_scope,
 )
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+    regularizer_conf_pb2 as regularizer_conf_util,
+)
+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
diff --git a/oneflow/compatible_single_client_python/ops/initializer_util.py b/oneflow/compatible_single_client_python/ops/initializer_util.py
index 1e8b9c972874fad5ca375d4119f04b4f968e88b5..7061b76af9c4eb5f0d86a283c1b81de79728de92 100644
--- a/oneflow/compatible_single_client_python/ops/initializer_util.py
+++ b/oneflow/compatible_single_client_python/ops/initializer_util.py
@@ -21,8 +21,10 @@ import math
 import numpy as np
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+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 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 1b42ce272b5db3636d67633b277673154c003033..0ae6c4e160ae2d481069bca2be2822dc063f3cc3 100644
--- a/oneflow/compatible_single_client_python/ops/layers.py
+++ b/oneflow/compatible_single_client_python/ops/layers.py
@@ -18,9 +18,13 @@ from typing import Callable, Optional, Union, Tuple, Sequence
 from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+    regularizer_conf_pb2 as regularizer_conf_util,
+)
 from oneflow.compatible_single_client_python.framework import (
     distribute as distribute_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/linalg.py b/oneflow/compatible_single_client_python/ops/linalg.py
index 92ec74c3d61462c7bcd334654fbc7d05cd3a54fb..97719ef63362e962aadae59f368b07c2604fb15a 100644
--- a/oneflow/compatible_single_client_python/ops/linalg.py
+++ b/oneflow/compatible_single_client_python/ops/linalg.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
 import os
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/math_ops.py b/oneflow/compatible_single_client_python/ops/math_ops.py
index d6f350064fa9aabf68d96214ff9faccffb4917fe..9f1bb6e24e0bb0222e7b2ce08469b585f6a7eba4 100644
--- a/oneflow/compatible_single_client_python/ops/math_ops.py
+++ b/oneflow/compatible_single_client_python/ops/math_ops.py
@@ -19,8 +19,10 @@ import os
 from typing import Union, Optional, Sequence, List, Tuple
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
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 b44d299c12066f663aadb1cf4ad03640e623cdb0..0682e1c126036db2be5abd0f29d571a120f923a2 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
@@ -20,8 +20,10 @@ import traceback
 from typing import Optional
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 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,
diff --git a/oneflow/compatible_single_client_python/ops/nn_ops.py b/oneflow/compatible_single_client_python/ops/nn_ops.py
index 68657ddb48ca341f45032d140fc1a74b1be7283b..111fbb9e3252dbd53b177fb1634f811d2692d627 100644
--- a/oneflow/compatible_single_client_python/ops/nn_ops.py
+++ b/oneflow/compatible_single_client_python/ops/nn_ops.py
@@ -21,8 +21,10 @@ import sys
 import random
 from typing import Union, Optional, Sequence, Tuple, List
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     interpret_util as interpret_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/one_hot.py b/oneflow/compatible_single_client_python/ops/one_hot.py
index 0a8ecc919b01003172046ad3922c064759b73eea..3fa6a0b1c8888a5425db973d86f0b21e4b64926c 100644
--- a/oneflow/compatible_single_client_python/ops/one_hot.py
+++ b/oneflow/compatible_single_client_python/ops/one_hot.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
 import os
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     distribute as distribute_util,
 )
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 510f77b748aafbbf23ccc48bb8bd1d22f658fa94..269321c718380bebd9cca897c7f014237ddceb8f 100644
--- a/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
+++ b/oneflow/compatible_single_client_python/ops/partial_fc_sample.py
@@ -18,8 +18,10 @@ from __future__ import absolute_import
 import os
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 from oneflow.compatible_single_client_python.framework import (
     distribute as distribute_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/prelu.py b/oneflow/compatible_single_client_python/ops/prelu.py
index 0916c1267141070ab3d219fe00ea551b287aeaa8..9963d0a974788c8d0e27631675a0318a5cc05ce0 100644
--- a/oneflow/compatible_single_client_python/ops/prelu.py
+++ b/oneflow/compatible_single_client_python/ops/prelu.py
@@ -18,9 +18,13 @@ from typing import Optional, Sequence
 from oneflow.compatible_single_client_python.oneflow_export import oneflow_export
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
+from oneflow.compatible.single_client.core.job import (
+    regularizer_conf_pb2 as regularizer_conf_util,
+)
 from oneflow.compatible_single_client_python.framework import (
     distribute as distribute_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/reduce_mean.py b/oneflow/compatible_single_client_python/ops/reduce_mean.py
index d44107646b108e580c91a1d1366a38e98dd776b4..d37b4bbbeedc62a01440ee126bd44043077d61d9 100644
--- a/oneflow/compatible_single_client_python/ops/reduce_mean.py
+++ b/oneflow/compatible_single_client_python/ops/reduce_mean.py
@@ -19,8 +19,10 @@ import collections
 from typing import Optional, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 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,
diff --git a/oneflow/compatible_single_client_python/ops/reduce_ops.py b/oneflow/compatible_single_client_python/ops/reduce_ops.py
index 49204c4eb9f9046baf523bb2868098022b31817c..7956c481104527b0064d6a4d644d92b2c5a6ffc9 100644
--- a/oneflow/compatible_single_client_python/ops/reduce_ops.py
+++ b/oneflow/compatible_single_client_python/ops/reduce_ops.py
@@ -17,8 +17,10 @@ import os
 from typing import Optional, Sequence, Sized, Union
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_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,
+)
 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,
diff --git a/oneflow/compatible_single_client_python/ops/regularizer_util.py b/oneflow/compatible_single_client_python/ops/regularizer_util.py
index fe36aed18ef74b184e4c3dbda6d0abb91e14b3ba..5043db3e3322673baeb99741541632372474aff6 100644
--- a/oneflow/compatible_single_client_python/ops/regularizer_util.py
+++ b/oneflow/compatible_single_client_python/ops/regularizer_util.py
@@ -15,8 +15,10 @@ limitations under the License.
 """
 from __future__ import absolute_import
 
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import regularizer_conf_pb2 as regularizer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+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
 
 
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 94c38b6edca5a8d7e5cd8a4181287bfa8945735e..9c4433a6f57a9302468b06f5604d4c6ffc12b34f 100644
--- a/oneflow/compatible_single_client_python/ops/user_op_builder.py
+++ b/oneflow/compatible_single_client_python/ops/user_op_builder.py
@@ -29,12 +29,16 @@ 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.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.framework import user_op_attr_pb2 as attr_value_pb
+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,
+)
 from oneflow._oneflow_internal.oneflow.core.framework import (
     user_op_attr as user_op_attr_cfg,
 )
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_util
+from oneflow.compatible.single_client.core.register import (
+    logical_blob_id_pb2 as logical_blob_id_util,
+)
 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
@@ -43,7 +47,9 @@ 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.core.eager import eager_symbol_pb2 as eager_symbol_util
+from oneflow.compatible.single_client.core.eager import (
+    eager_symbol_pb2 as eager_symbol_util,
+)
 from oneflow.compatible_single_client_python.eager import (
     eager_blob_util as eager_blob_util,
 )
diff --git a/oneflow/compatible_single_client_python/ops/watch.py b/oneflow/compatible_single_client_python/ops/watch.py
index 2c9a47d06f05d759f5137da1a0529ec75b200977..8476b7c3a5cc083c62b733def5143e9c79ba32ea 100644
--- a/oneflow/compatible_single_client_python/ops/watch.py
+++ b/oneflow/compatible_single_client_python/ops/watch.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 import uuid
 from typing import Callable, Optional, Union
 
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+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 (
     session_context as session_ctx,
@@ -38,7 +38,9 @@ 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.core.job.lbi_diff_watcher_info_pb2 import LbiAndDiffWatcherUuidPair
+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 import single_client as flow
diff --git a/oneflow/compatible_single_client_python/serving/inference_session.py b/oneflow/compatible_single_client_python/serving/inference_session.py
index 14e8a5ab72d735ecbf044eb54a7339ddaf087a8a..d902fabfab6c7d4ec6103d30ed52991215f0448b 100644
--- a/oneflow/compatible_single_client_python/serving/inference_session.py
+++ b/oneflow/compatible_single_client_python/serving/inference_session.py
@@ -31,9 +31,13 @@ from oneflow._oneflow_internal.oneflow.core.operator import (
 from oneflow._oneflow_internal.oneflow.core.common import shape as shape_proto_cfg
 from oneflow._oneflow_internal.oneflow.core.common import data_type as dtype_proto_cfg
 from oneflow._oneflow_internal.oneflow.core.job import sbp_parallel as sbp_parallel_cfg
-from oneflow.core.job import job_conf_pb2 as job_conf_proto
-from oneflow.core.operator import interface_blob_conf_pb2 as interface_blob_conf_proto
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
+from oneflow.compatible.single_client.core.job import job_conf_pb2 as job_conf_proto
+from oneflow.compatible.single_client.core.operator import (
+    interface_blob_conf_pb2 as interface_blob_conf_proto,
+)
+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 (
     compile_context as compile_ctx,
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 e615732ae04996f1280a98714d4dbd4a808da697..aeb82f0627b0beeb3c784d9b967744227a873cd8 100644
--- a/oneflow/compatible_single_client_python/serving/saved_model_builder.py
+++ b/oneflow/compatible_single_client_python/serving/saved_model_builder.py
@@ -24,11 +24,19 @@ from oneflow.compatible_single_client_python.framework import c_api_util as c_ap
 from oneflow.compatible_single_client_python.framework import (
     session_context as session_ctx,
 )
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
-from oneflow.core.job import job_conf_pb2 as job_conf_pb
-from oneflow.core.register import logical_blob_id_pb2 as logical_blob_id_pb
-from oneflow.core.operator import interface_blob_conf_pb2 as interface_blob_conf_pb
-from oneflow.core.job import sbp_parallel_pb2 as sbp_parallel_pb
+from oneflow.compatible.single_client.core.serving import (
+    saved_model_pb2 as saved_model_pb,
+)
+from oneflow.compatible.single_client.core.job import job_conf_pb2 as job_conf_pb
+from oneflow.compatible.single_client.core.register import (
+    logical_blob_id_pb2 as logical_blob_id_pb,
+)
+from oneflow.compatible.single_client.core.operator import (
+    interface_blob_conf_pb2 as interface_blob_conf_pb,
+)
+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
 
 
diff --git a/oneflow/compatible_single_client_python/summary/summary_graph.py b/oneflow/compatible_single_client_python/summary/summary_graph.py
index 507619dae81d7573bec6f43b596ead5992b05766..93b83c1307017976c3d3fdd0b933ccfb282a8f63 100644
--- a/oneflow/compatible_single_client_python/summary/summary_graph.py
+++ b/oneflow/compatible_single_client_python/summary/summary_graph.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 import os
-from oneflow.core.summary import projector_pb2 as projector_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
 import oneflow._oneflow_internal
 import time
diff --git a/oneflow/compatible_single_client_python/summary/summary_hparams.py b/oneflow/compatible_single_client_python/summary/summary_hparams.py
index 23b9b7a194b1cb2e25ac3373efd13625f40b12e9..1d63556450c543b2d202c38e0f90d7f28678d244 100644
--- a/oneflow/compatible_single_client_python/summary/summary_hparams.py
+++ b/oneflow/compatible_single_client_python/summary/summary_hparams.py
@@ -23,11 +23,13 @@ import hashlib
 import json
 import time
 
-from oneflow.core.summary import plugin_data_pb2 as plugin_data_pb2
-from oneflow.core.summary import summary_pb2 as summary_pb2
-from oneflow.core.summary import event_pb2 as event_pb2
-from oneflow.core.summary import tensor_pb2 as tensor_pb2
-from oneflow.core.summary import projector_pb2 as projector_pb2
+from oneflow.compatible.single_client.core.summary import (
+    plugin_data_pb2 as plugin_data_pb2,
+)
+from oneflow.compatible.single_client.core.summary import summary_pb2 as summary_pb2
+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
 
 
diff --git a/oneflow/compatible_single_client_python/summary/summary_projector.py b/oneflow/compatible_single_client_python/summary/summary_projector.py
index 1ce6b9bed90c1836bbba2bf96afa139a4991d6b8..0cbcfbf726aaf083d9a34a979e7353ea3d0cf3fb 100644
--- a/oneflow/compatible_single_client_python/summary/summary_projector.py
+++ b/oneflow/compatible_single_client_python/summary/summary_projector.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 import os
-from oneflow.core.summary import projector_pb2 as projector_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
 import time
 
diff --git a/oneflow/compatible_single_client_python/test/models/alexnet.py b/oneflow/compatible_single_client_python/test/models/alexnet.py
index f83d952dabdab7db964b052de7be7ff293580147..b3ca0f9fee58c5dde0317cf100ce22e5d57dd23c 100644
--- a/oneflow/compatible_single_client_python/test/models/alexnet.py
+++ b/oneflow/compatible_single_client_python/test/models/alexnet.py
@@ -19,8 +19,10 @@ from datetime import datetime
 
 import numpy
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
 
 # _DATA_DIR = "/dataset/imagenet_227/train/32"
 _DATA_DIR = "/dataset/PNGS/PNG227/of_record_repeated"
diff --git a/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py b/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py
index a7b81e29a92a9022b8d57b74889fedf7989c995b..a0f0eedf150430b0afe03f9f513a35125a256d47 100644
--- a/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py
+++ b/oneflow/compatible_single_client_python/test/models/alexnet_with_unpack.py
@@ -19,8 +19,10 @@ from datetime import datetime
 
 import numpy
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
 
 # _DATA_DIR = "/dataset/imagenet_227/train/32"
 _DATA_DIR = "/dataset/PNGS/PNG227/of_record_repeated"
diff --git a/oneflow/compatible_single_client_python/test/models/bert.py b/oneflow/compatible_single_client_python/test/models/bert.py
index 0b88309d44f702ba1edb53e804daa1ceaedc9fb7..2616bb1b1e1cb04b71bb45961e70a5be875196ea 100644
--- a/oneflow/compatible_single_client_python/test/models/bert.py
+++ b/oneflow/compatible_single_client_python/test/models/bert.py
@@ -16,8 +16,8 @@ limitations under the License.
 import math
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.common import data_type_pb2 as data_type_util
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.common import data_type_pb2 as data_type_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 
 class BertBackbone(object):
diff --git a/oneflow/compatible_single_client_python/test/models/inceptionv3.py b/oneflow/compatible_single_client_python/test/models/inceptionv3.py
index 47cfebe60c6c2d6592c9eb6d56a0819c00ab7964..8d988c79b80d53bdac4a4e94627b16bd4968841b 100644
--- a/oneflow/compatible_single_client_python/test/models/inceptionv3.py
+++ b/oneflow/compatible_single_client_python/test/models/inceptionv3.py
@@ -19,7 +19,7 @@ from datetime import datetime
 
 import numpy
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 _DATA_DIR = "/dataset/PNGS/PNG299/of_record_repeated"
 _EVAL_DIR = _DATA_DIR
diff --git a/oneflow/compatible_single_client_python/test/models/pretrain.py b/oneflow/compatible_single_client_python/test/models/pretrain.py
index 421cdac3b1e2bcbc19f694fd1f0ea41517731ad4..e501927671315ebbf239bd92796b9dd801279b04 100644
--- a/oneflow/compatible_single_client_python/test/models/pretrain.py
+++ b/oneflow/compatible_single_client_python/test/models/pretrain.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 import bert as bert_util
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 
 def PreTrain(
diff --git a/oneflow/compatible_single_client_python/test/models/resnet50.py b/oneflow/compatible_single_client_python/test/models/resnet50.py
index f325c784749cab49fcb6d00d10cbdee113b133cb..20bcd612bc7af46373ed8d6b189a10e3e7c1270e 100644
--- a/oneflow/compatible_single_client_python/test/models/resnet50.py
+++ b/oneflow/compatible_single_client_python/test/models/resnet50.py
@@ -19,7 +19,7 @@ from datetime import datetime
 
 import numpy
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 # import hook
 
diff --git a/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py b/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py
index 776e9e11aa4285c6cdd595dcf7600b610be1d730..f373a456e0de51df432555a62de6479db564d846 100644
--- a/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py
+++ b/oneflow/compatible_single_client_python/test/models/test_alexnet_model.py
@@ -18,8 +18,10 @@ from datetime import datetime
 import unittest
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
 
 
 _DATA_DIR = "/dataset/PNGS/PNG227/of_record_repeated"
diff --git a/oneflow/compatible_single_client_python/test/models/vgg16.py b/oneflow/compatible_single_client_python/test/models/vgg16.py
index 30d13b2b13f9a8d885a716061614288885d916db..c6035043fca607b17259d411e8a59818c1ae9fa8 100644
--- a/oneflow/compatible_single_client_python/test/models/vgg16.py
+++ b/oneflow/compatible_single_client_python/test/models/vgg16.py
@@ -19,8 +19,10 @@ from datetime import datetime
 
 import numpy
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
-from oneflow.core.job import initializer_conf_pb2 as initializer_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.job import (
+    initializer_conf_pb2 as initializer_conf_util,
+)
 
 _DATA_DIR = "/dataset/PNGS/PNG224/of_record_repeated"
 _SINGLE_DATA_DIR = "/dataset/PNGS/PNG224/of_record"
diff --git a/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py b/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py
index 8b75bc6ae3ce144c6233ce1bcf5d508e86fdf002..682cb45ad70268d5d88060ed41d037a27dd3caa7 100644
--- a/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py
+++ b/oneflow/compatible_single_client_python/test/serving/insightface_resnet100.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 from oneflow.compatible import single_client as flow
-from oneflow.core.operator import op_conf_pb2 as op_conf_util
+from oneflow.compatible.single_client.core.operator import op_conf_pb2 as op_conf_util
 
 
 def _get_initializer():
diff --git a/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py b/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py
index ebf6f84a6e09793d54f3e0cc76f2cae417a43d43..dd2754b7988724d768d7ff56928dbe10bd9ca530 100644
--- a/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py
+++ b/oneflow/compatible_single_client_python/test/serving/ofrecord_dataset.py
@@ -18,7 +18,7 @@ import os
 import struct
 import cv2
 import numpy as np
-from oneflow.core.record import record_pb2 as record_pb
+from oneflow.compatible.single_client.core.record import record_pb2 as record_pb
 
 
 class OFRecordDataset(object):
diff --git a/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py b/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py
index 4f5288e9b34baff210a6294129f9996b914f415d..b025ae63ffe5e5ddc57191cdc77f10890e916db3 100644
--- a/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py
+++ b/oneflow/compatible_single_client_python/test/serving/test_alexnet_save_and_load.py
@@ -20,7 +20,9 @@ import numpy as np
 from google.protobuf import text_format as text_format
 
 from oneflow.compatible import single_client as flow
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
+from oneflow.compatible.single_client.core.serving import (
+    saved_model_pb2 as saved_model_pb,
+)
 
 from alexnet import load_data, alexnet
 from ofrecord_dataset import ImageNetRecordDataset
diff --git a/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py b/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py
index 281a09d5dc563cad6493ff37968ba0e8527e1276..bed8e43f2dd30b522d896da714a096a8d81f2350 100644
--- a/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py
+++ b/oneflow/compatible_single_client_python/test/serving/test_resnet_save_and_load.py
@@ -20,7 +20,9 @@ import shutil
 import unittest
 from google.protobuf import text_format as text_format
 from oneflow.compatible import single_client as flow
-from oneflow.core.serving import saved_model_pb2 as saved_model_pb
+from oneflow.compatible.single_client.core.serving import (
+    saved_model_pb2 as saved_model_pb,
+)
 
 from resnet_model import resnet50
 from ofrecord_dataset import ImageNetRecordDataset