Repository: alibaba/BladeDISC (language: python)

Issue:
torch-blade's `//src:torch_blade_include` may lead to illegal cache behaviour. 
https://github.com/alibaba/BladeDISC/blob/336736c89b4ccc2a5da28c1c43afd85be5e72893/pytorch_blade/src/BUILD#L15-L21

By depending on the above, bazel targets may have C++ source root as include root other than bazel workspace root. As a consequence, targets my reference any header file without explicitly adding it to `deps`. This may cause some problem when remote build cache is introduced. Bazel seems not treating change of any header file under `.` as change of target `torch_blade_include`. 

It's better to have explicit header dependency.


Discussion / hints:
As described above, we're planning to remove the target `torch_blade_include`. It will has several impacts:
1. Explicit dependencies have to be added to `deps` of targets which includes headers via this include path instead of bazel dependency chain.
2. Files in `#include` directive have to be prepended with `src`, which looks wired. We can rename `src` to `pytorch_blade` and include headers like `#include <pytorch_blade/....>`.

Any comments? @fortianyou 
How about moving all the headers to the directory `pytorch_blade/include`, and `strip_include_prefix` to strip the prefix?
This may not fit into bazel's convention, I think. With bazel, sources and headers file are usually put into the same target as `srcs` and `hdrs`. Segregating headers and source files into different directory makes it difficult. I'd prefer simply rename current `./src` to `./pytorch_blade` if the length of directory name doesn't bother you.
> I'd prefer simply rename current `./src` to `./pytorch_blade` if the length

Redirecting the headers' path will introduce a lot of changes into history. I think this is the main downside.

Fix patch:
diff --git a/pytorch_blade/bazel_build.py b/pytorch_blade/bazel_build.py
index c03526a9e11..4d99ce23bd2 100644
--- a/pytorch_blade/bazel_build.py
+++ b/pytorch_blade/bazel_build.py
@@ -45,8 +45,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.targets = [
             "@org_tensorflow//tensorflow/compiler/mlir/xla/ral:libral_base_context.so",
-            "//src:libtorch_blade.so",
-            "//src:_torch_blade.so",
+            "//pytorch_blade:libtorch_blade.so",
+            "//pytorch_blade:_torch_blade.so",
             "//tests/mhlo/torch-mlir-opt:torch-mlir-opt",
         ]
 
@@ -214,7 +214,7 @@ def test(self):
         env["LD_LIBRARY_PATH"] = ld_library_path
         env["GCC_HOST_COMPILER_PATH"] = env.get("GCC_HOST_COMPILER_PATH", which("gcc"))
 
-        self.test_suites = ["//tests/mhlo/...", "//src:torch_blade_test_suite"]
+        self.test_suites = ["//tests/mhlo/...", "//pytorch_blade:torch_blade_test_suite"]
 
         test_cmd = " ".join(
             [self.shell_setting, self.test_cmd]
diff --git a/pytorch_blade/distribution.cfg b/pytorch_blade/distribution.cfg
index ed955631039..ff869bb0039 100644
--- a/pytorch_blade/distribution.cfg
+++ b/pytorch_blade/distribution.cfg
@@ -1,4 +1,4 @@
-src/_torch_blade.so
-src/libtorch_blade.so
+pytorch_blade/_torch_blade.so
+pytorch_blade/libtorch_blade.so
 external/org_tensorflow/tensorflow/compiler/mlir/xla/ral/libral_base_context.so
 external/org_tensorflow/tensorflow/compiler/mlir/disc/disc_compiler_main
diff --git a/pytorch_blade/src/BUILD b/pytorch_blade/pytorch_blade/BUILD
similarity index 69%
rename from pytorch_blade/src/BUILD
rename to pytorch_blade/pytorch_blade/BUILD
index 775de36bc4b..4bcb90630ba 100644
--- a/pytorch_blade/src/BUILD
+++ b/pytorch_blade/pytorch_blade/BUILD
@@ -18,31 +18,23 @@ exports_files([
     "pybind.h",
 ])
 
-cc_library(
-    name = "torch_blade_include",
-    includes = ["."],
-    visibility = [
-        "//visibility:public",
-    ],
-)
-
 cc_library(
     name = "torch_blade",
     linkopts = ["-Wl,-rpath,$$ORIGIN"],
     deps = [
-        "//src/common_utils:torch_blade_common",
-        "//src/compiler/backends:torch_blade_backends",
-        "//src/compiler/jit:torch_blade_jit",
-        "//src/compiler/mlir:torch_blade_mlir",
+        "//pytorch_blade/common_utils:torch_blade_common",
+        "//pytorch_blade/compiler/backends:torch_blade_backends",
+        "//pytorch_blade/compiler/jit:torch_blade_jit",
+        "//pytorch_blade/compiler/mlir:torch_blade_mlir",
         "@local_org_torch//:libtorch",
     ] + if_tensorrt_enabled([
-        "//src/compiler/tensorrt:tensorrt_runtime_impl",
+        "//pytorch_blade/compiler/tensorrt:tensorrt_runtime_impl",
     ]) + if_cuda_is_configured([
         "@local_config_cuda//cuda:cudart",
     ]) + if_platform_alibaba([
-        "//src/platform_alibaba:torch_blade",
+        "//pytorch_blade/platform_alibaba:torch_blade",
     ]) + if_quantization_enabled([
-        "//src/quantization:quantization_op",
+        "//pytorch_blade/quantization:quantization_op",
     ]),
 )
 
@@ -74,11 +66,11 @@ filegroup(
     srcs = glob([
         "*pybind*.cpp",
     ]) + [
-        "//src/compiler:torch_blade_py_srcs",
+        "//pytorch_blade/compiler:torch_blade_py_srcs",
     ] + if_ltc_disc_backend([
-         "//src/ltc:torch_blade_ltc_py_srcs",
+         "//pytorch_blade/ltc:torch_blade_ltc_py_srcs",
     ]) + if_quantization_enabled([
-        "//src/quantization:torch_blade_quantization_py_srcs",
+        "//pytorch_blade/quantization:torch_blade_quantization_py_srcs",
     ]),
 )
 
@@ -87,11 +79,11 @@ filegroup(
     srcs = glob([
         "*.h",
     ]) + [
-        "//src/compiler:torch_blade_py_hdrs",
+        "//pytorch_blade/compiler:torch_blade_py_hdrs",
     ] + if_ltc_disc_backend([
-         "//src/ltc:torch_blade_ltc_py_hdrs",
+         "//pytorch_blade/ltc:torch_blade_ltc_py_hdrs",
     ]) + if_quantization_enabled([
-        "//src/quantization:torch_blade_quantization_py_hdrs",
+        "//pytorch_blade/quantization:torch_blade_quantization_py_hdrs",
     ]),
 )
 
@@ -124,7 +116,7 @@ pybind_library(
     ] + if_tensorrt_enabled([
         "@tensorrt//:nvinfer_headers",
     ]) + if_ltc_disc_backend([
-        "//src/ltc:torch_disc_backend",
+        "//pytorch_blade/ltc:torch_disc_backend",
     ]),
     alwayslink = 1,
 )
@@ -136,16 +128,16 @@ pybind_extension(
         ":torch_blade_shared",
         ":torch_blade_pybind11",
     ] + if_platform_alibaba([
-        "//src/platform_alibaba:torch_blade_pybind11",
+        "//pytorch_blade/platform_alibaba:torch_blade_pybind11",
     ]),
 )
 
 test_suite(
     name = "torch_blade_test_suite",
     tests = [
-        "//src/common_utils:torch_blade_common_utils_test",
-        "//src/compiler/jit:jit_test",
-        "//src/compiler/mlir/converters:mhlo_converter_register_test",
-        "//src/ltc/disc_compiler:ltc_disc_test",
+        "//pytorch_blade/common_utils:torch_blade_common_utils_test",
+        "//pytorch_blade/compiler/jit:jit_test",
+        "//pytorch_blade/compiler/mlir/converters:mhlo_converter_register_test",
+        "//pytorch_blade/ltc/disc_compiler:ltc_disc_test",
     ],
 )
diff --git a/pytorch_blade/src/common_utils/BUILD b/pytorch_blade/pytorch_blade/common_utils/BUILD
similarity index 94%
rename from pytorch_blade/src/common_utils/BUILD
rename to pytorch_blade/pytorch_blade/common_utils/BUILD
index be345a31cec..218ef14c1e3 100644
--- a/pytorch_blade/src/common_utils/BUILD
+++ b/pytorch_blade/pytorch_blade/common_utils/BUILD
@@ -19,7 +19,6 @@ cc_library(
         ":torch_blade_logging",
         ":torch_blade_macros",
         ":torch_blade_utils",
-        "//src:torch_blade_include",
     ],
 )
 
@@ -35,7 +34,6 @@ cc_library(
     deps = [
         ":torch_blade_logging",
         ":torch_blade_macros",
-        "//src:torch_blade_include",
         "@local_org_torch//:libtorch",
     ],
 )
diff --git a/pytorch_blade/src/common_utils/logging.h b/pytorch_blade/pytorch_blade/common_utils/logging.h
similarity index 100%
rename from pytorch_blade/src/common_utils/logging.h
rename to pytorch_blade/pytorch_blade/common_utils/logging.h
diff --git a/pytorch_blade/src/common_utils/macros.h b/pytorch_blade/pytorch_blade/common_utils/macros.h
similarity index 100%
rename from pytorch_blade/src/common_utils/macros.h
rename to pytorch_blade/pytorch_blade/common_utils/macros.h
diff --git a/pytorch_blade/src/common_utils/tempfs.cpp b/pytorch_blade/pytorch_blade/common_utils/tempfs.cpp
similarity index 95%
rename from pytorch_blade/src/common_utils/tempfs.cpp
rename to pytorch_blade/pytorch_blade/common_utils/tempfs.cpp
index 425f18dde46..992c23ce948 100644
--- a/pytorch_blade/src/common_utils/tempfs.cpp
+++ b/pytorch_blade/pytorch_blade/common_utils/tempfs.cpp
@@ -9,15 +9,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common_utils/tempfs.h"
+#include "pytorch_blade/common_utils/tempfs.h"
 
 #include <unistd.h>
 
 #include <fstream>
 #include <string>
 
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/common_utils/tempfs.h b/pytorch_blade/pytorch_blade/common_utils/tempfs.h
similarity index 96%
rename from pytorch_blade/src/common_utils/tempfs.h
rename to pytorch_blade/pytorch_blade/common_utils/tempfs.h
index 4afffd69037..c497ab8ae43 100644
--- a/pytorch_blade/src/common_utils/tempfs.h
+++ b/pytorch_blade/pytorch_blade/common_utils/tempfs.h
@@ -14,7 +14,7 @@
 #include <cstdio>
 #include <string>
 
-#include "common_utils/macros.h"
+#include "pytorch_blade/common_utils/macros.h"
 namespace torch {
 namespace blade {
 
diff --git a/pytorch_blade/src/common_utils/utils.cpp b/pytorch_blade/pytorch_blade/common_utils/utils.cpp
similarity index 97%
rename from pytorch_blade/src/common_utils/utils.cpp
rename to pytorch_blade/pytorch_blade/common_utils/utils.cpp
index fffda4b8449..1c57475b341 100644
--- a/pytorch_blade/src/common_utils/utils.cpp
+++ b/pytorch_blade/pytorch_blade/common_utils/utils.cpp
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "common_utils/utils.h"
+#include "pytorch_blade/common_utils/utils.h"
 
 #include <torch/csrc/jit/serialization/pickle.h>
 #include <algorithm>
 #include <cstdlib>
 #include <string>
 
-#include "common_utils/logging.h"
+#include "pytorch_blade/common_utils/logging.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/common_utils/utils.h b/pytorch_blade/pytorch_blade/common_utils/utils.h
similarity index 96%
rename from pytorch_blade/src/common_utils/utils.h
rename to pytorch_blade/pytorch_blade/common_utils/utils.h
index 8e2b95664cb..903d61b4226 100644
--- a/pytorch_blade/src/common_utils/utils.h
+++ b/pytorch_blade/pytorch_blade/common_utils/utils.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "common_utils/macros.h"
+#include "pytorch_blade/common_utils/macros.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/pytorch_blade/compiler/BUILD b/pytorch_blade/pytorch_blade/compiler/BUILD
new file mode 100644
index 00000000000..021bab2d4e9
--- /dev/null
+++ b/pytorch_blade/pytorch_blade/compiler/BUILD
@@ -0,0 +1,18 @@
+package(default_visibility = ["//visibility:public"])
+load("//bazel:build_defs.bzl", "if_tensorrt_enabled")
+
+filegroup(
+    name = "torch_blade_py_srcs",
+    srcs = [
+        "//pytorch_blade/compiler/jit:torch_blade_jit_py_srcs",
+        "//pytorch_blade/compiler/mlir:torch_blade_mlir_py_srcs",
+    ] + if_tensorrt_enabled(["//pytorch_blade/compiler/tensorrt:pybind_functions.cpp"]),
+)
+
+filegroup(
+    name = "torch_blade_py_hdrs",
+    srcs = [
+        "//pytorch_blade/compiler/jit:torch_blade_jit_py_hdrs",
+        "//pytorch_blade/compiler/mlir:torch_blade_mlir_py_hdrs",
+    ] + if_tensorrt_enabled(["//pytorch_blade/compiler/tensorrt:pybind_functions.h"]),
+)
diff --git a/pytorch_blade/src/compiler/backends/BUILD b/pytorch_blade/pytorch_blade/compiler/backends/BUILD
similarity index 76%
rename from pytorch_blade/src/compiler/backends/BUILD
rename to pytorch_blade/pytorch_blade/compiler/backends/BUILD
index 606f6fbd62d..19fe10151cd 100644
--- a/pytorch_blade/src/compiler/backends/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/backends/BUILD
@@ -13,8 +13,8 @@ cc_library(
         "backend_input_outputs.h",
     ],
     deps = [
-        "//src/common_utils:torch_blade_common",
-        "//src/compiler/jit:torch_blade_jit",
+        "//pytorch_blade/common_utils:torch_blade_common",
+        "//pytorch_blade/compiler/jit:torch_blade_jit",
     ],
     alwayslink = 1,
 )
diff --git a/pytorch_blade/src/compiler/backends/backend_input_outputs.cpp b/pytorch_blade/pytorch_blade/compiler/backends/backend_input_outputs.cpp
similarity index 100%
rename from pytorch_blade/src/compiler/backends/backend_input_outputs.cpp
rename to pytorch_blade/pytorch_blade/compiler/backends/backend_input_outputs.cpp
diff --git a/pytorch_blade/src/compiler/backends/backend_input_outputs.h b/pytorch_blade/pytorch_blade/compiler/backends/backend_input_outputs.h
similarity index 100%
rename from pytorch_blade/src/compiler/backends/backend_input_outputs.h
rename to pytorch_blade/pytorch_blade/compiler/backends/backend_input_outputs.h
diff --git a/pytorch_blade/src/compiler/backends/engine_class.cpp b/pytorch_blade/pytorch_blade/compiler/backends/engine_class.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/backends/engine_class.cpp
rename to pytorch_blade/pytorch_blade/compiler/backends/engine_class.cpp
index 34aa07f15c7..2f9505eef78 100644
--- a/pytorch_blade/src/compiler/backends/engine_class.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/backends/engine_class.cpp
@@ -9,11 +9,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "engine_class.h"
+#include "pytorch_blade/compiler/backends/engine_class.h"
 
 #include <torch/script.h>
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
 #include "sys/stat.h"
 
 namespace torch {
diff --git a/pytorch_blade/src/compiler/backends/engine_class.h b/pytorch_blade/pytorch_blade/compiler/backends/engine_class.h
similarity index 96%
rename from pytorch_blade/src/compiler/backends/engine_class.h
rename to pytorch_blade/pytorch_blade/compiler/backends/engine_class.h
index b5e96ef23ef..2f3d5a22b52 100644
--- a/pytorch_blade/src/compiler/backends/engine_class.h
+++ b/pytorch_blade/pytorch_blade/compiler/backends/engine_class.h
@@ -15,8 +15,8 @@
 #include <mutex>
 #include <tuple>
 
-#include "common_utils/macros.h"
-#include "compiler/backends/engine_interface.h"
+#include "pytorch_blade/common_utils/macros.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
 
 #include <ATen/core/Dict.h>
 #include <ATen/core/List.h>
diff --git a/pytorch_blade/src/compiler/backends/engine_interface.cpp b/pytorch_blade/pytorch_blade/compiler/backends/engine_interface.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/backends/engine_interface.cpp
rename to pytorch_blade/pytorch_blade/compiler/backends/engine_interface.cpp
index c7b147ac613..79fcc57a872 100644
--- a/pytorch_blade/src/compiler/backends/engine_interface.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/backends/engine_interface.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "engine_interface.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
 
 #include <torch/script.h>
 #include "common_utils/logging.h"
diff --git a/pytorch_blade/src/compiler/backends/engine_interface.h b/pytorch_blade/pytorch_blade/compiler/backends/engine_interface.h
similarity index 97%
rename from pytorch_blade/src/compiler/backends/engine_interface.h
rename to pytorch_blade/pytorch_blade/compiler/backends/engine_interface.h
index 8f3fe421b28..cb9ca3e4cfc 100644
--- a/pytorch_blade/src/compiler/backends/engine_interface.h
+++ b/pytorch_blade/pytorch_blade/compiler/backends/engine_interface.h
@@ -13,7 +13,7 @@
 
 #include <ATen/core/List.h>
 #include <ATen/core/Tensor.h>
-#include "compiler/backends/backend_input_outputs.h"
+#include "pytorch_blade/compiler/backends/backend_input_outputs.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/BUILD b/pytorch_blade/pytorch_blade/compiler/jit/BUILD
similarity index 85%
rename from pytorch_blade/src/compiler/jit/BUILD
rename to pytorch_blade/pytorch_blade/compiler/jit/BUILD
index d983f05d40a..1a9a9d9c2be 100644
--- a/pytorch_blade/src/compiler/jit/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/jit/BUILD
@@ -10,6 +10,7 @@ filegroup(
             "**/torch/onnx.cpp",
             "**/*test.cpp",
             "**/pybind*.cpp",
+            "**/tool_funcs.cpp",
         ],
     ),
 )
@@ -18,7 +19,10 @@ filegroup(
     name = "torch_blade_jit_hdrs",
     srcs = glob(
         ["**/*.h"],
-        exclude = ["**/pybind*.h"],
+        exclude = [
+            "**/pybind*.h",
+            "**/tool_funcs.h",
+        ],
     ),
 )
 
@@ -32,7 +36,8 @@ cc_library(
         "//visibility:public",
     ],
     deps = [
-        "//src/common_utils:torch_blade_common",
+        ":tool_funcs",
+        "//pytorch_blade/common_utils:torch_blade_common",
         "@local_org_torch//:libtorch",
     ],
     alwayslink = True,
@@ -79,7 +84,7 @@ cc_test(
     deps = [
         ":tool_funcs",
         ":torch_blade_jit",
-        "//src/common_utils:torch_blade_common",
+        "//pytorch_blade/common_utils:torch_blade_common",
         "@googltest//:gtest_main",
         "@local_org_torch//:libtorch",
     ],
diff --git a/pytorch_blade/src/compiler/jit/fusion.cpp b/pytorch_blade/pytorch_blade/compiler/jit/fusion.cpp
similarity index 99%
rename from pytorch_blade/src/compiler/jit/fusion.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/fusion.cpp
index 3970f8fdcec..f96fea44d9e 100644
--- a/pytorch_blade/src/compiler/jit/fusion.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/fusion.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "fusion.h"
+#include "pytorch_blade/compiler/jit/fusion.h"
 
 #include <torch/csrc/jit/passes/utils/subgraph_utils.h>
 
diff --git a/pytorch_blade/src/compiler/jit/fusion.h b/pytorch_blade/pytorch_blade/compiler/jit/fusion.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/fusion.h
rename to pytorch_blade/pytorch_blade/compiler/jit/fusion.h
diff --git a/pytorch_blade/src/compiler/jit/licm.cpp b/pytorch_blade/pytorch_blade/compiler/jit/licm.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/jit/licm.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/licm.cpp
index 8cae0f740a7..49af641c563 100644
--- a/pytorch_blade/src/compiler/jit/licm.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/licm.cpp
@@ -15,7 +15,7 @@
 #include <torch/csrc/jit/jit_log.h>
 #include <torch/csrc/jit/passes/common_subexpression_elimination.h>
 #include <stack>
-#include "compiler/jit/torch/alias_analysis.h"
+#include "pytorch_blade/compiler/jit/torch/alias_analysis.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/licm.h b/pytorch_blade/pytorch_blade/compiler/jit/licm.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/licm.h
rename to pytorch_blade/pytorch_blade/compiler/jit/licm.h
diff --git a/pytorch_blade/src/compiler/jit/onnx_funcs.cpp b/pytorch_blade/pytorch_blade/compiler/jit/onnx_funcs.cpp
similarity index 96%
rename from pytorch_blade/src/compiler/jit/onnx_funcs.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/onnx_funcs.cpp
index 3692bb7ceae..51f42e113ad 100644
--- a/pytorch_blade/src/compiler/jit/onnx_funcs.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/onnx_funcs.cpp
@@ -10,7 +10,7 @@
 // limitations under the License.
 
 #include "onnx_funcs.h"
-#include "common_utils/logging.h"
+#include "pytorch_blade/common_utils/logging.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/onnx_funcs.h b/pytorch_blade/pytorch_blade/compiler/jit/onnx_funcs.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/onnx_funcs.h
rename to pytorch_blade/pytorch_blade/compiler/jit/onnx_funcs.h
diff --git a/pytorch_blade/src/compiler/jit/pybind_functions.cpp b/pytorch_blade/pytorch_blade/compiler/jit/pybind_functions.cpp
similarity index 100%
rename from pytorch_blade/src/compiler/jit/pybind_functions.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/pybind_functions.cpp
diff --git a/pytorch_blade/src/compiler/jit/pybind_functions.h b/pytorch_blade/pytorch_blade/compiler/jit/pybind_functions.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/pybind_functions.h
rename to pytorch_blade/pytorch_blade/compiler/jit/pybind_functions.h
diff --git a/pytorch_blade/src/compiler/jit/shape_type_spec.cpp b/pytorch_blade/pytorch_blade/compiler/jit/shape_type_spec.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/jit/shape_type_spec.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/shape_type_spec.cpp
index 083dd17a0e1..8f7575b7330 100644
--- a/pytorch_blade/src/compiler/jit/shape_type_spec.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/shape_type_spec.cpp
@@ -9,15 +9,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/jit/shape_type_spec.h"
+#include "pytorch_blade/compiler/jit/shape_type_spec.h"
 
 #include <iterator>
 #include <regex>
 
 #include <c10/core/ScalarType.h>
 
-#include "common_utils/utils.h"
-#include "compiler/jit/tool_funcs.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/jit/tool_funcs.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/shape_type_spec.h b/pytorch_blade/pytorch_blade/compiler/jit/shape_type_spec.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/shape_type_spec.h
rename to pytorch_blade/pytorch_blade/compiler/jit/shape_type_spec.h
diff --git a/pytorch_blade/src/compiler/jit/tool_funcs.cpp b/pytorch_blade/pytorch_blade/compiler/jit/tool_funcs.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/jit/tool_funcs.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/tool_funcs.cpp
index f49278057a8..a08b475d1e8 100644
--- a/pytorch_blade/src/compiler/jit/tool_funcs.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/tool_funcs.cpp
@@ -19,7 +19,7 @@
                 ||----w |
                 ||     ||
  */
-#include "tool_funcs.h"
+#include "pytorch_blade/compiler/jit/tool_funcs.h"
 
 #include <torch/script.h>
 namespace torch {
diff --git a/pytorch_blade/src/compiler/jit/tool_funcs.h b/pytorch_blade/pytorch_blade/compiler/jit/tool_funcs.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/tool_funcs.h
rename to pytorch_blade/pytorch_blade/compiler/jit/tool_funcs.h
diff --git a/pytorch_blade/src/compiler/jit/torch/README.md b/pytorch_blade/pytorch_blade/compiler/jit/torch/README.md
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/README.md
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/README.md
diff --git a/pytorch_blade/src/compiler/jit/torch/alias_analysis.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/alias_analysis.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/jit/torch/alias_analysis.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/alias_analysis.cpp
index 089571c1df1..83d44167a0d 100644
--- a/pytorch_blade/src/compiler/jit/torch/alias_analysis.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/alias_analysis.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "alias_analysis.h"
+#include "pytorch_blade/compiler/jit/torch/alias_analysis.h"
 
 namespace torch {
 namespace blade {
@@ -81,4 +81,4 @@ bool isMutableType(const Value* v) {
   return isMutableType(v->type());
 }
 } // namespace blade
-} // namespace torch
\ No newline at end of file
+} // namespace torch
diff --git a/pytorch_blade/src/compiler/jit/torch/alias_analysis.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/alias_analysis.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/alias_analysis.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/alias_analysis.h
diff --git a/pytorch_blade/src/compiler/jit/torch/const_loop_unroll.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/const_loop_unroll.cpp
similarity index 99%
rename from pytorch_blade/src/compiler/jit/torch/const_loop_unroll.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/const_loop_unroll.cpp
index 3bf97e0227c..3fac0649654 100644
--- a/pytorch_blade/src/compiler/jit/torch/const_loop_unroll.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/const_loop_unroll.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "const_loop_unroll.h"
+#include "pytorch_blade/compiler/jit/torch/const_loop_unroll.h"
 #include <ATen/core/interned_strings.h>
 #include <c10/util/Exception.h>
 #include <torch/csrc/jit/ir/constants.h>
diff --git a/pytorch_blade/src/compiler/jit/torch/const_loop_unroll.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/const_loop_unroll.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/const_loop_unroll.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/const_loop_unroll.h
diff --git a/pytorch_blade/src/compiler/jit/torch/eliminate_redundant_permutations.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/eliminate_redundant_permutations.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/jit/torch/eliminate_redundant_permutations.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/eliminate_redundant_permutations.cpp
index 9c7f31065bc..3ceaeb5430e 100644
--- a/pytorch_blade/src/compiler/jit/torch/eliminate_redundant_permutations.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/eliminate_redundant_permutations.cpp
@@ -17,7 +17,7 @@
 #include <torch/csrc/jit/passes/dead_code_elimination.h>
 #include <torch/csrc/jit/passes/remove_inplace_ops.h>
 #include <stack>
-#include "compiler/jit/torch/alias_analysis.h"
+#include "pytorch_blade/compiler/jit/torch/alias_analysis.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/torch/eliminate_redundant_permutations.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/eliminate_redundant_permutations.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/eliminate_redundant_permutations.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/eliminate_redundant_permutations.h
diff --git a/pytorch_blade/src/compiler/jit/torch/freeze_module.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/freeze_module.cpp
similarity index 99%
rename from pytorch_blade/src/compiler/jit/torch/freeze_module.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/freeze_module.cpp
index 1f22b35692f..62c46367f0d 100644
--- a/pytorch_blade/src/compiler/jit/torch/freeze_module.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/freeze_module.cpp
@@ -23,7 +23,7 @@
 
 #include <functional>
 #include <stack>
-#include "compiler/jit/torch/alias_analysis.h"
+#include "pytorch_blade/compiler/jit/torch/alias_analysis.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/torch/freeze_module.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/freeze_module.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/freeze_module.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/freeze_module.h
diff --git a/pytorch_blade/src/compiler/jit/torch/onnx.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/onnx.cpp
similarity index 99%
rename from pytorch_blade/src/compiler/jit/torch/onnx.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/onnx.cpp
index 18660bb9f4c..597788c6dd0 100644
--- a/pytorch_blade/src/compiler/jit/torch/onnx.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/onnx.cpp
@@ -18,7 +18,7 @@ meet our requirements:
 through a callback function `deleteDeadValues`.
 */
 
-#include "onnx.h"
+#include "pytorch_blade/compiler/jit/torch/onnx.h"
 
 #include <ATen/core/functional.h>
 #include <c10/util/Exception.h>
diff --git a/pytorch_blade/src/compiler/jit/torch/onnx.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/onnx.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/onnx.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/onnx.h
diff --git a/pytorch_blade/src/compiler/jit/torch/op_registry.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/op_registry.cpp
similarity index 99%
rename from pytorch_blade/src/compiler/jit/torch/op_registry.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/op_registry.cpp
index eb4aede4758..2dfeb427b51 100644
--- a/pytorch_blade/src/compiler/jit/torch/op_registry.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/op_registry.cpp
@@ -12,7 +12,7 @@
 - * (Ronan Collobert, Samy Bengio, Johnny Mariethoz)
 - */
 
-#include "op_registry.h"
+#include "pytorch_blade/compiler/jit/torch/op_registry.h"
 
 // Location for Commonly Used Shape registries
 
diff --git a/pytorch_blade/src/compiler/jit/torch/op_registry.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/op_registry.h
similarity index 96%
rename from pytorch_blade/src/compiler/jit/torch/op_registry.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/op_registry.h
index 164fd236892..7628c9dcb9b 100644
--- a/pytorch_blade/src/compiler/jit/torch/op_registry.h
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/op_registry.h
@@ -16,7 +16,7 @@
 
 #include <torch/csrc/jit/ir/ir.h>
 #include <memory>
-#include "operator_set.h"
+#include "pytorch_blade/compiler/jit/torch/operator_set.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/jit/torch/operator_set.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/operator_set.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/jit/torch/operator_set.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/operator_set.cpp
index d7347920a94..93225ed9e02 100644
--- a/pytorch_blade/src/compiler/jit/torch/operator_set.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/operator_set.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "operator_set.h"
+#include "pytorch_blade/compiler/jit/torch/operator_set.h"
 #include <torch/script.h>
 
 namespace torch {
diff --git a/pytorch_blade/src/compiler/jit/torch/operator_set.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/operator_set.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/operator_set.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/operator_set.h
diff --git a/pytorch_blade/src/compiler/jit/torch/pybind_utils.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/pybind_utils.cpp
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/pybind_utils.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/pybind_utils.cpp
diff --git a/pytorch_blade/src/compiler/jit/torch/shape_analysis.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis.cpp
similarity index 99%
rename from pytorch_blade/src/compiler/jit/torch/shape_analysis.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis.cpp
index 27d8cf5b8da..f2675bbab46 100644
--- a/pytorch_blade/src/compiler/jit/torch/shape_analysis.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis.cpp
@@ -11,7 +11,7 @@
  * Institute (Samy Bengio) Copyright (c) 2001-2004 Idiap Research Institute
  * (Ronan Collobert, Samy Bengio, Johnny Mariethoz)
  */
-#include "shape_analysis.h"
+#include "pytorch_blade/compiler/jit/torch/shape_analysis.h"
 
 #include <c10/util/Exception.h>
 #include <torch/csrc/autograd/variable.h>
diff --git a/pytorch_blade/src/compiler/jit/torch/shape_analysis.h b/pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis.h
similarity index 100%
rename from pytorch_blade/src/compiler/jit/torch/shape_analysis.h
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis.h
diff --git a/pytorch_blade/src/compiler/mlir/BUILD b/pytorch_blade/pytorch_blade/compiler/mlir/BUILD
similarity index 56%
rename from pytorch_blade/src/compiler/mlir/BUILD
rename to pytorch_blade/pytorch_blade/compiler/mlir/BUILD
index bfb4581e3ec..072f4a26717 100644
--- a/pytorch_blade/src/compiler/mlir/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/BUILD
@@ -8,11 +8,11 @@ cc_library(
         "//visibility:public",
     ],
     deps = [
-        "//src/common_utils:torch_blade_common",
-        "//src/compiler/jit:torch_blade_jit",
-        "//src/compiler/mlir/converters:torch_blade_mhlo_converter",
-        "//src/compiler/mlir/converters/impl:torch_blade_mhlo_converter_impl",
-        "//src/compiler/mlir/runtime:torch_blade_disc_rt",
+        "//pytorch_blade/common_utils:torch_blade_common",
+        "//pytorch_blade/compiler/jit:torch_blade_jit",
+        "//pytorch_blade/compiler/mlir/converters:torch_blade_mhlo_converter",
+        "//pytorch_blade/compiler/mlir/converters/impl:torch_blade_mhlo_converter_impl",
+        "//pytorch_blade/compiler/mlir/runtime:torch_blade_disc_rt",
         "@local_org_torch//:libtorch",
     ],
 )
diff --git a/pytorch_blade/src/compiler/mlir/converters/BUILD b/pytorch_blade/pytorch_blade/compiler/mlir/converters/BUILD
similarity index 71%
rename from pytorch_blade/src/compiler/mlir/converters/BUILD
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/BUILD
index 0bcb470cecd..0f5a8b734dc 100644
--- a/pytorch_blade/src/compiler/mlir/converters/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/BUILD
@@ -22,9 +22,11 @@ cc_library(
         "//visibility:public",
     ],
     deps = [
-        "//src/common_utils:torch_blade_logging",
-        "//src:torch_blade_include",
-        "//src/torch-mlir:DiscTorchMLIRTorchToMhlo",
+        "//pytorch_blade/common_utils:torch_blade_logging",
+        "//pytorch_blade/common_utils:torch_blade_utils",
+        "//pytorch_blade/compiler/jit:tool_funcs",
+        "//pytorch_blade/compiler/jit:torch_blade_jit",
+        "//pytorch_blade/torch-mlir:DiscTorchMLIRTorchToMhlo",
         "@local_org_torch//:libtorch",
         "@org_mhlo_builder//csrc:mhlo_library",
         "@torch-mlir-importer//:jit_ir_importer",
@@ -37,6 +39,7 @@ cc_test(
     name = "mhlo_converter_register_test",
     srcs = [
         "mhlo_converter_register_test.cpp",
+        ":torch_blade_mhlo_converter_hdrs",
     ],
     linkopts = [
         "-lpthread",
@@ -45,14 +48,14 @@ cc_test(
     ],
     linkstatic = True,
     deps = [
-        "//src:torch_blade_include",
-        "//src:torch_blade_shared",
+        "//pytorch_blade/common_utils:torch_blade_macros",
+        "//pytorch_blade:torch_blade_shared",
         "@zlib",
         "@googltest//:gtest_main",
         "@local_org_torch//:libtorch",
         "@org_mhlo_builder//csrc:mhlo_library",
         "@org_tensorflow//tensorflow/compiler/mlir/xla/ral:ral_base_context_lib",
     ] + if_platform_alibaba([
-        "//src/platform_alibaba:runtime_deps",
+        "//pytorch_blade/platform_alibaba:runtime_deps",
     ])
 )
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/BUILD b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/BUILD
similarity index 80%
rename from pytorch_blade/src/compiler/mlir/converters/impl/BUILD
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/BUILD
index 5b32cbe223e..6e3953b8d75 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/BUILD
@@ -12,8 +12,8 @@ cc_library(
         "//visibility:public",
     ],
     deps = [
-        "//src/common_utils:torch_blade_common",
-        "//src/compiler/mlir/converters:torch_blade_mhlo_converter",
+        "//pytorch_blade/common_utils:torch_blade_common",
+        "//pytorch_blade/compiler/mlir/converters:torch_blade_mhlo_converter",
         "@local_org_torch//:libtorch",
         "@org_mhlo_builder//csrc:mhlo_library",
     ],
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/activation.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/activation.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/mlir/converters/impl/activation.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/activation.cpp
index d36c62e43f6..4750f9fb136 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/activation.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/activation.cpp
@@ -16,9 +16,9 @@
 #include <mlir/mhlo/builder/slice.h>
 #include <mlir/mhlo/builder/standard.h>
 
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/batchnorm.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/batchnorm.cpp
similarity index 92%
rename from pytorch_blade/src/compiler/mlir/converters/impl/batchnorm.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/batchnorm.cpp
index 4c452c73645..7d058c195b6 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/batchnorm.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/batchnorm.cpp
@@ -12,9 +12,9 @@
 #include <mlir/mhlo/builder/algebra_statistics.h>
 #include <mlir/mhlo/builder/mlir_utils.h>
 
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 // was included last because of llvm headers conflicts
 #include <torch/script.h>
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/broadcast.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/broadcast.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/mlir/converters/impl/broadcast.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/broadcast.cpp
index 23cea39c37d..f2f439cc95c 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/broadcast.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/broadcast.cpp
@@ -16,10 +16,10 @@
 #include <mlir/mhlo/builder/mlir_utils.h>
 #include <mlir/mhlo/builder/standard.h>
 
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 // was included last because of llvm headers conflicts
 #include <torch/script.h>
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/convolution.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/convolution.cpp
similarity index 95%
rename from pytorch_blade/src/compiler/mlir/converters/impl/convolution.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/convolution.cpp
index 4b37ee505f8..766b39f413e 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/convolution.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/convolution.cpp
@@ -15,10 +15,10 @@
 #include <mlir/mhlo/builder/mlir_shape_builder.h>
 #include <mlir/mhlo/builder/standard.h>
 
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/element_wise_binary.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/element_wise_binary.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/mlir/converters/impl/element_wise_binary.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/element_wise_binary.cpp
index bb5b7bd9083..2dae185197b 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/element_wise_binary.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/element_wise_binary.cpp
@@ -13,18 +13,18 @@
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
 #include "mlir-hlo/utils/hlo_utils.h"
 
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 #include "stablehlo/dialect/ChloOps.h"
 
 #include <torch/script.h>
-#include "compiler/jit/shape_type_spec.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
+#include "pytorch_blade/compiler/jit/shape_type_spec.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/element_wise_unary.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/element_wise_unary.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/mlir/converters/impl/element_wise_unary.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/element_wise_unary.cpp
index bc6a4ea2fdb..a4f629de39e 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/element_wise_unary.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/element_wise_unary.cpp
@@ -9,9 +9,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 #include "stablehlo/dialect/ChloOps.h"
 
 #include <torch/script.h>
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/embedding.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/embedding.cpp
similarity index 89%
rename from pytorch_blade/src/compiler/mlir/converters/impl/embedding.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/embedding.cpp
index 4657487b622..4c44029c2a1 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/embedding.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/embedding.cpp
@@ -11,10 +11,10 @@
 
 #include <mlir/mhlo/builder/gather.h>
 
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/gru_cell.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/gru_cell.cpp
similarity index 95%
rename from pytorch_blade/src/compiler/mlir/converters/impl/gru_cell.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/gru_cell.cpp
index ea4362e3ae0..b6886de8b02 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/gru_cell.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/gru_cell.cpp
@@ -12,9 +12,9 @@
 #include <mlir/mhlo/builder/gru_cell.h>
 #include <mlir/mhlo/builder/matmul.h>
 
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/layernorm.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/layernorm.cpp
similarity index 93%
rename from pytorch_blade/src/compiler/mlir/converters/impl/layernorm.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/layernorm.cpp
index bbd63a471fd..57b2b2e679b 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/layernorm.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/layernorm.cpp
@@ -13,10 +13,10 @@
 #include <mlir/mhlo/builder/mlir_shape_builder.h>
 #include <mlir/mhlo/builder/mlir_utils.h>
 
-#include "common_utils/logging.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/list_operations.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/list_operations.cpp
similarity index 90%
rename from pytorch_blade/src/compiler/mlir/converters/impl/list_operations.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/list_operations.cpp
index 3ccfcf25f17..f0ec8d4208a 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/list_operations.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/list_operations.cpp
@@ -11,11 +11,11 @@
 
 #include <mlir/mhlo/builder/mlir_type_utils.h>
 
-#include "common_utils/logging.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 #include <torch/script.h>
 namespace torch {
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/matmul.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/matmul.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/mlir/converters/impl/matmul.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/matmul.cpp
index b4a41a9fb60..195659e01a2 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/matmul.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/matmul.cpp
@@ -15,9 +15,9 @@
 #include <mlir/mhlo/builder/mlir_shape_builder.h>
 #include <mlir/mhlo/builder/mlir_utils.h>
 
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 #include "stablehlo/dialect/ChloOps.h"
 
 #include <torch/script.h>
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/prim_constant.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/prim_constant.cpp
similarity index 96%
rename from pytorch_blade/src/compiler/mlir/converters/impl/prim_constant.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/prim_constant.cpp
index 3df45ac39da..494a0c2a9d7 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/prim_constant.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/prim_constant.cpp
@@ -9,15 +9,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
 
 #include <mlir/mhlo/builder/constant.h>
 #include <mlir/mhlo/builder/mlir_attr_utils.h>
 #include <mlir/mhlo/builder/standard.h>
 
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 // was included last because of llvm headers conflicts
 #include <torch/script.h>
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/prim_constant.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/prim_constant.h
similarity index 100%
rename from pytorch_blade/src/compiler/mlir/converters/impl/prim_constant.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/prim_constant.h
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/reduction.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/reduction.cpp
similarity index 93%
rename from pytorch_blade/src/compiler/mlir/converters/impl/reduction.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/reduction.cpp
index b03e119908e..c59fb82577c 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/reduction.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/reduction.cpp
@@ -11,11 +11,11 @@
 
 #include <mlir/mhlo/builder/reduction.h>
 
-#include "common_utils/logging.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/shapes.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/shapes.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/mlir/converters/impl/shapes.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/shapes.cpp
index 7cdf98668fa..68949d09492 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/shapes.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/shapes.cpp
@@ -16,14 +16,14 @@
 #include <mlir/mhlo/builder/slice.h>
 #include <mlir/mhlo/builder/standard.h>
 
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/softmax.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/softmax.cpp
similarity index 87%
rename from pytorch_blade/src/compiler/mlir/converters/impl/softmax.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/softmax.cpp
index e3a3aa547f2..defd1c23989 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/softmax.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/softmax.cpp
@@ -11,11 +11,11 @@
 
 #include <mlir/mhlo/builder/softmax.h>
 
-#include "common_utils/logging.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/tensor.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/tensor.cpp
similarity index 94%
rename from pytorch_blade/src/compiler/mlir/converters/impl/tensor.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/tensor.cpp
index e10a3732021..13a27cec07e 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/tensor.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/tensor.cpp
@@ -17,12 +17,12 @@
 #include <mlir/mhlo/builder/standard.h>
 #include <mlir/Dialect/Tensor/IR/TensorOps.h.inc>
 
-#include "common_utils/logging.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
-#include "compiler/mlir/converters/impl/utils.h"
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/utils.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/utils.cpp
similarity index 86%
rename from pytorch_blade/src/compiler/mlir/converters/impl/utils.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/utils.cpp
index 75070c81e1a..e53f26288e4 100644
--- a/pytorch_blade/src/compiler/mlir/converters/impl/utils.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/utils.cpp
@@ -9,10 +9,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/impl/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/utils.h"
 
-#include "common_utils/logging.h"
-#include "compiler/mlir/converters/impl/prim_constant.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/mlir/converters/impl/prim_constant.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/impl/utils.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/utils.h
similarity index 100%
rename from pytorch_blade/src/compiler/mlir/converters/impl/utils.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/impl/utils.h
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp
similarity index 96%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_conversion.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp
index 428fb3c40e3..7829aee873a 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.cpp
@@ -9,8 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/mhlo_conversion.h"
-
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion.h"
 #include <mlir-hlo/Dialect/mhlo/IR/hlo_ops.h>
 #include <mlir/CAPI/IR.h>
 #include <mlir/Dialect/Func/IR/FuncOps.h>
@@ -19,13 +18,13 @@
 #include "llvm/Support/SourceMgr.h"
 #include "tensorflow/compiler/mlir/disc/IR/hlo_disc_ops.h"
 
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
-#include "compiler/jit/tool_funcs.h"
-#include "compiler/jit/torch/shape_analysis.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
-#include "compiler/mlir/converters/mlir_type_utils.h"
-#include "compiler/mlir/converters/torch_mlir_op_filter.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/jit/tool_funcs.h"
+#include "pytorch_blade/compiler/jit/torch/shape_analysis.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.h"
 
 #include "function_importer.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.h
similarity index 100%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_conversion.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion.h
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion_context.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_conversion_context.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.cpp
index 6cec2bedb59..2ca31bd89f3 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion_context.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
 
 #include <mlir-hlo/Dialect/mhlo/IR/hlo_ops.h> // from tf repo
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion_context.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h
similarity index 98%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_conversion_context.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h
index bf6894fff75..cea7d1b919a 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mhlo_conversion_context.h
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h
@@ -20,7 +20,7 @@
 
 #include <c10/util/ArrayRef.h>
 
-#include "common_utils/macros.h"
+#include "pytorch_blade/common_utils/macros.h"
 
 namespace torch {
 namespace jit {
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register.cpp
similarity index 96%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register.cpp
index a540645aea0..5e5f3cdf244 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register.cpp
@@ -9,10 +9,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 #include <torch/script.h>
-#include "common_utils/logging.h"
+#include "pytorch_blade/common_utils/logging.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h
similarity index 92%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h
index c9581a9b94f..dabb63c0dda 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register.h
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h
@@ -14,8 +14,8 @@
 #include <ATen/core/operator_name.h>
 #include <c10/util/Optional.h>
 
-#include "common_utils/macros.h"
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/common_utils/macros.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
 
 namespace c10 {
 class Symbol;
diff --git a/pytorch_blade/src/compiler/mlir/converters/mlir_type_utils.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mlir_type_utils.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/mlir/converters/mlir_type_utils.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mlir_type_utils.cpp
index 93e5e100920..c8efdbe9661 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mlir_type_utils.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mlir_type_utils.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/mlir_type_utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mlir_type_utils.h"
 
 #include <mlir-hlo/Dialect/mhlo/IR/hlo_ops.h> // from tf repo
 #include <mlir/mhlo/builder/mlir_type_utils.h>
diff --git a/pytorch_blade/src/compiler/mlir/converters/mlir_type_utils.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mlir_type_utils.h
similarity index 100%
rename from pytorch_blade/src/compiler/mlir/converters/mlir_type_utils.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mlir_type_utils.h
diff --git a/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.cpp
similarity index 95%
rename from pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.cpp
index 1f63c732e00..2cb937a1a13 100644
--- a/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.cpp
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/converters/torch_mlir_op_filter.h"
+#include "pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.h"
 
 #include <iostream>
 #include <sstream>
 #include <string>
 #include <unordered_set>
-#include "common_utils/utils.h"
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.h b/pytorch_blade/pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.h
similarity index 91%
rename from pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.h
index 47cd4a99cd6..ce1a871ae71 100644
--- a/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.h
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/torch_mlir_op_filter.h
@@ -10,7 +10,7 @@
 // limitations under the License.
 
 #pragma once
-#include "compiler/mlir/converters/mhlo_conversion_context.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion_context.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/mlir/pybind_functions.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/pybind_functions.cpp
similarity index 82%
rename from pytorch_blade/src/compiler/mlir/pybind_functions.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/pybind_functions.cpp
index 113f09f4ab0..73bc426b075 100644
--- a/pytorch_blade/src/compiler/mlir/pybind_functions.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/pybind_functions.cpp
@@ -9,11 +9,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "pybind.h"
+#include "pytorch_blade/pybind.h"
 
-#include "compiler/mlir/converters/mhlo_conversion.h"
-#include "compiler/mlir/pybind_functions.h"
-#include "compiler/mlir/runtime/disc_engine.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion.h"
+#include "pytorch_blade/compiler/mlir/pybind_functions.h"
+#include "pytorch_blade/compiler/mlir/runtime/disc_engine.h"
 
 #include <torch/csrc/jit/python/pybind_utils.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/pybind_functions.h b/pytorch_blade/pytorch_blade/compiler/mlir/pybind_functions.h
similarity index 100%
rename from pytorch_blade/src/compiler/mlir/pybind_functions.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/pybind_functions.h
diff --git a/pytorch_blade/src/compiler/mlir/runtime/BUILD b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD
similarity index 86%
rename from pytorch_blade/src/compiler/mlir/runtime/BUILD
rename to pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD
index 3edce3ca1f5..c471a335447 100644
--- a/pytorch_blade/src/compiler/mlir/runtime/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/BUILD
@@ -9,8 +9,8 @@ cc_library(
     srcs = ["ral_context.cpp"],
     hdrs = ["ral_context.h"],
     deps = [
-        "//src/common_utils:torch_blade_common",
-        "//src/compiler/jit:torch_blade_jit",
+        "//pytorch_blade/common_utils:torch_blade_common",
+        "//pytorch_blade/compiler/jit:torch_blade_jit",
         "@org_tensorflow//tensorflow/compiler/mlir/xla/ral:ral_base_context_lib",
         "@local_org_torch//:ATen",
         "@local_org_torch//:libtorch",
@@ -38,7 +38,7 @@ cc_library(
     ],
     deps = [
         ":torch_blade_ral_context",
-	    "//src/compiler/backends:torch_blade_backends",
+	    "//pytorch_blade/compiler/backends:torch_blade_backends",
         "@local_org_torch//:libtorch",
     ],
     copts = select({
diff --git a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/disc_engine.cpp
similarity index 92%
rename from pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/runtime/disc_engine.cpp
index 4b6b6c480be..af174a13f63 100644
--- a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/disc_engine.cpp
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/runtime/disc_engine.h"
+#include "pytorch_blade/compiler/mlir/runtime/disc_engine.h"
 
 #include <algorithm>
 #include <sstream>
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
-#include "compiler/backends/engine_interface.h"
-#include "compiler/mlir/runtime/ral_context.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
+#include "pytorch_blade/compiler/mlir/runtime/ral_context.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.h b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/disc_engine.h
similarity index 100%
rename from pytorch_blade/src/compiler/mlir/runtime/disc_engine.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/runtime/disc_engine.h
diff --git a/pytorch_blade/src/compiler/mlir/runtime/ral_context.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/mlir/runtime/ral_context.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp
index 3fda979fac6..e753d43fa69 100644
--- a/pytorch_blade/src/compiler/mlir/runtime/ral_context.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/mlir/runtime/ral_context.h"
+#include "pytorch_blade/compiler/mlir/runtime/ral_context.h"
 
 #include <dlfcn.h>
 
@@ -30,7 +30,7 @@
 
 #include "tensorflow/compiler/mlir/xla/ral/ral_api.h"
 
-#include "common_utils/utils.h"
+#include "pytorch_blade/common_utils/utils.h"
 
 #ifdef TORCH_BLADE_USE_ROCM
 namespace c10 {
diff --git a/pytorch_blade/src/compiler/mlir/runtime/ral_context.h b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h
similarity index 92%
rename from pytorch_blade/src/compiler/mlir/runtime/ral_context.h
rename to pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h
index 88b9e7dba72..14908ae22d0 100644
--- a/pytorch_blade/src/compiler/mlir/runtime/ral_context.h
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/runtime/ral_context.h
@@ -36,10 +36,10 @@ using CUDAStream = ::c10::hip::HIPStream;
 // after we update ral.
 #include "tensorflow/compiler/mlir/xla/ral/context/base/cpu/cpu_context_impl.h"
 
-#include "common_utils/macros.h"
-#include "common_utils/tempfs.h"
-#include "compiler/backends/engine_interface.h"
-#include "compiler/jit/shape_type_spec.h"
+#include "pytorch_blade/common_utils/macros.h"
+#include "pytorch_blade/common_utils/tempfs.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
+#include "pytorch_blade/compiler/jit/shape_type_spec.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/tensorrt/BUILD b/pytorch_blade/pytorch_blade/compiler/tensorrt/BUILD
similarity index 95%
rename from pytorch_blade/src/compiler/tensorrt/BUILD
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/BUILD
index 068fc28718a..302bfd3055a 100644
--- a/pytorch_blade/src/compiler/tensorrt/BUILD
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/BUILD
@@ -22,8 +22,8 @@ cc_library(
     ],
     visibility = ["//visibility:private"],
     deps = [
-        "//src/common_utils:torch_blade_common",
-        "//src/compiler/backends:torch_blade_backends",
+        "//pytorch_blade/common_utils:torch_blade_common",
+        "//pytorch_blade/compiler/backends:torch_blade_backends",
     ] + if_tensorrt_static_linked(
         [
             "@tensorrt//:nvinfer_static",
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_calibrator.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_calibrator.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.cpp
index 6a70897cfdc..f00d7829471 100644
--- a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_calibrator.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorrt_calibrator.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.h"
 #include "compiler/tensorrt/bridge/tensorrt_logger.h"
 
 #include <iostream>
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_calibrator.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.h
similarity index 96%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_calibrator.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.h
index 91c5505e71a..f65de52ace4 100644
--- a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_calibrator.h
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_calibrator.h
@@ -17,7 +17,7 @@
 #include <vector>
 #include "NvInfer.h"
 
-#include "compiler/backends/engine_interface.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
 
 namespace torch {
 namespace blade {
@@ -81,4 +81,4 @@ class Int8EntropyCalibrator2 : public nvinfer1::IInt8EntropyCalibrator2 {
 
 } // namespace tensorrt
 } // namespace blade
-} // namespace torch
\ No newline at end of file
+} // namespace torch
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_common.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_common.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.cpp
index e78dde6fb3c..6d9ad0b78cd 100644
--- a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_common.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorrt_common.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.h"
 
 #include "common_utils/logging.h"
 #include "tensorrt_logger.h"
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_common.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.h
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_common.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.h
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_flags.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.cpp
similarity index 94%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_flags.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.cpp
index 9dbf53b0f17..3a3e235a0b4 100644
--- a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_flags.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorrt_flags.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_flags.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.h
similarity index 96%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_flags.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.h
index 4dec8f4d339..3840eca5e5f 100644
--- a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_flags.h
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.h
@@ -13,7 +13,7 @@
 #define __COMPILER_TENSORRT_FLAGS_H__
 
 #include "NvInfer.h"
-#include "common_utils/macros.h"
+#include "pytorch_blade/common_utils/macros.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_logger.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_logger.cpp
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_logger.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_logger.cpp
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_logger.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_logger.h
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_logger.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_logger.h
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_onnx_parser.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_onnx_parser.cpp
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_onnx_parser.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_onnx_parser.cpp
diff --git a/pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_onnx_parser.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_onnx_parser.h
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/bridge/tensorrt_onnx_parser.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/bridge/tensorrt_onnx_parser.h
diff --git a/pytorch_blade/src/compiler/tensorrt/pybind_functions.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/pybind_functions.cpp
similarity index 91%
rename from pytorch_blade/src/compiler/tensorrt/pybind_functions.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/pybind_functions.cpp
index 69871548708..4fc715d4844 100644
--- a/pytorch_blade/src/compiler/tensorrt/pybind_functions.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/pybind_functions.cpp
@@ -9,11 +9,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/tensorrt/pybind_functions.h"
+#include "pytorch_blade/compiler/tensorrt/pybind_functions.h"
 
-#include "compiler/tensorrt/bridge/tensorrt_flags.h"
-#include "compiler/tensorrt/bridge/tensorrt_onnx_parser.h"
-#include "compiler/tensorrt/tensorrt_engine.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_flags.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_onnx_parser.h"
+#include "pytorch_blade/compiler/tensorrt/tensorrt_engine.h"
 #include "torch/csrc/jit/python/pybind_utils.h"
 
 namespace torch {
diff --git a/pytorch_blade/src/compiler/tensorrt/pybind_functions.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/pybind_functions.h
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/pybind_functions.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/pybind_functions.h
diff --git a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine.cpp
similarity index 90%
rename from pytorch_blade/src/compiler/tensorrt/tensorrt_engine.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine.cpp
index f98adca5d82..f57547d501b 100644
--- a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine.cpp
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/tensorrt/tensorrt_engine.h"
+#include "pytorch_blade/compiler/tensorrt/tensorrt_engine.h"
 
 #include <algorithm>
 #include <sstream>
 
-#include "common_utils/logging.h"
-#include "compiler/backends/engine_interface.h"
-#include "compiler/tensorrt/tensorrt_engine_context.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
+#include "pytorch_blade/compiler/tensorrt/tensorrt_engine_context.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine.h
similarity index 100%
rename from pytorch_blade/src/compiler/tensorrt/tensorrt_engine.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine.h
diff --git a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine_context.cpp b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine_context.cpp
similarity index 98%
rename from pytorch_blade/src/compiler/tensorrt/tensorrt_engine_context.cpp
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine_context.cpp
index c26167a3bae..3508c0ea15f 100644
--- a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine_context.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine_context.cpp
@@ -9,16 +9,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "compiler/tensorrt/tensorrt_engine_context.h"
+#include "pytorch_blade/compiler/tensorrt/tensorrt_engine_context.h"
 
 #include <c10/cuda/CUDAException.h>
 #include <c10/cuda/CUDAFunctions.h>
 #include <c10/cuda/CUDAStream.h>
 #include <torch/script.h>
 
-#include "compiler/jit/shape_type_spec.h"
-#include "compiler/tensorrt/bridge/tensorrt_common.h"
-#include "compiler/tensorrt/bridge/tensorrt_logger.h"
+#include "pytorch_blade/compiler/jit/shape_type_spec.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_logger.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine_context.h b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine_context.h
similarity index 94%
rename from pytorch_blade/src/compiler/tensorrt/tensorrt_engine_context.h
rename to pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine_context.h
index 06cc352e9a9..e79c8b22ce1 100644
--- a/pytorch_blade/src/compiler/tensorrt/tensorrt_engine_context.h
+++ b/pytorch_blade/pytorch_blade/compiler/tensorrt/tensorrt_engine_context.h
@@ -17,9 +17,9 @@
 #include <c10/cuda/CUDAStream.h>
 
 #include <atomic>
-#include "common_utils/macros.h"
-#include "compiler/backends/engine_interface.h"
-#include "compiler/tensorrt/bridge/tensorrt_common.h"
+#include "pytorch_blade/common_utils/macros.h"
+#include "pytorch_blade/compiler/backends/engine_interface.h"
+#include "pytorch_blade/compiler/tensorrt/bridge/tensorrt_common.h"
 
 namespace torch {
 namespace blade {
diff --git a/pytorch_blade/src/ltc/BUILD b/pytorch_blade/pytorch_blade/ltc/BUILD
similarity index 91%
rename from pytorch_blade/src/ltc/BUILD
rename to pytorch_blade/pytorch_blade/ltc/BUILD
index 54d5242419f..f9334907d7a 100644
--- a/pytorch_blade/src/ltc/BUILD
+++ b/pytorch_blade/pytorch_blade/ltc/BUILD
@@ -9,7 +9,7 @@ cc_library (
     "disc_backend/backend_impl.h",
   ],
   deps = [
-    "//src/ltc/disc_compiler:disc_compiler",
+    "//pytorch_blade/ltc/disc_compiler:disc_compiler",
   ],
   visibility = [
       "//visibility:public",
diff --git a/pytorch_blade/src/ltc/disc_backend/backend_impl.cpp b/pytorch_blade/pytorch_blade/ltc/disc_backend/backend_impl.cpp
similarity index 97%
rename from pytorch_blade/src/ltc/disc_backend/backend_impl.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_backend/backend_impl.cpp
index d5bfd770c92..13b5271ab3f 100644
--- a/pytorch_blade/src/ltc/disc_backend/backend_impl.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_backend/backend_impl.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/disc_backend/backend_impl.h"
+#include "pytorch_blade/ltc/disc_backend/backend_impl.h"
 
 #include <ATen/Functions.h>
 #include <torch/csrc/jit/passes/shape_analysis.h>
@@ -21,9 +21,9 @@
 #include <torch/csrc/lazy/ts_backend/ir_builder.h>
 #include <torch/csrc/lazy/ts_backend/ts_backend_impl.h>
 #include <torch/csrc/lazy/ts_backend/ts_lowering_context.h>
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
-#include "ltc/disc_compiler/disc_compiler.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/ltc/disc_compiler/disc_compiler.h"
 
 namespace torch_disc {
 namespace compiler {
@@ -294,4 +294,4 @@ void InitTorchScriptBackend() {
 }
 
 } //  namespace compiler
-} //  namespace torch_disc
\ No newline at end of file
+} //  namespace torch_disc
diff --git a/pytorch_blade/src/ltc/disc_backend/backend_impl.h b/pytorch_blade/pytorch_blade/ltc/disc_backend/backend_impl.h
similarity index 100%
rename from pytorch_blade/src/ltc/disc_backend/backend_impl.h
rename to pytorch_blade/pytorch_blade/ltc/disc_backend/backend_impl.h
diff --git a/pytorch_blade/src/ltc/disc_compiler/BUILD b/pytorch_blade/pytorch_blade/ltc/disc_compiler/BUILD
similarity index 96%
rename from pytorch_blade/src/ltc/disc_compiler/BUILD
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/BUILD
index d0dda2933d6..a1661b0d9d5 100644
--- a/pytorch_blade/src/ltc/disc_compiler/BUILD
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/BUILD
@@ -15,7 +15,7 @@ cc_library (
     "passes/graph_fuser.h",
   ],
   deps = [
-    "//src/compiler/mlir:torch_blade_mlir",
+    "//pytorch_blade/compiler/mlir:torch_blade_mlir",
     "@local_org_torch//:ATen",
     "@local_org_torch//:libtorch", 
   ],
diff --git a/pytorch_blade/src/ltc/disc_compiler/README.md b/pytorch_blade/pytorch_blade/ltc/disc_compiler/README.md
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/README.md
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/README.md
diff --git a/pytorch_blade/src/ltc/disc_compiler/disc_compiler.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler.cpp
similarity index 94%
rename from pytorch_blade/src/ltc/disc_compiler/disc_compiler.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler.cpp
index ae87e3bdd27..8a318c9bfd5 100644
--- a/pytorch_blade/src/ltc/disc_compiler/disc_compiler.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/disc_compiler/disc_compiler.h"
+#include "pytorch_blade/ltc/disc_compiler/disc_compiler.h"
 
 #include <ATen/Functions.h>
 #include <torch/csrc/jit/jit_log.h>
@@ -21,11 +21,11 @@
 #include <torch/csrc/lazy/ts_backend/ts_backend_impl.h>
 #include <torch/csrc/lazy/ts_backend/ts_lowering_context.h>
 #include <torch/script.h>
-#include "common_utils/utils.h"
-#include "compiler/jit/torch/shape_analysis.h"
-#include "ltc/disc_compiler/passes/disc_fuser.h"
-#include "ltc/disc_compiler/passes/register_disc_class.h"
-#include "ltc/disc_compiler/replay.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/jit/torch/shape_analysis.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/disc_fuser.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/register_disc_class.h"
+#include "pytorch_blade/ltc/disc_compiler/replay.h"
 
 namespace torch_disc {
 namespace compiler {
diff --git a/pytorch_blade/src/ltc/disc_compiler/disc_compiler.h b/pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler.h
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/disc_compiler.h
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler.h
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser.cpp
similarity index 94%
rename from pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser.cpp
index ca3b3dbaddf..39488b68dfe 100644
--- a/pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser.cpp
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/disc_compiler/passes/disc_fuser.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/disc_fuser.h"
 
 #include <torch/csrc/jit/passes/dead_code_elimination.h>
 #include <torch/script.h>
 
-#include "compiler/jit/fusion.h"
-#include "compiler/mlir/converters/mhlo_conversion.h"
-#include "ltc/disc_compiler/passes/graph_fuser.h"
+#include "pytorch_blade/compiler/jit/fusion.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/graph_fuser.h"
 
 #ifdef TORCH_BLADE_BUILD_WITH_CUDA
 #include <c10/cuda/CUDAFunctions.h>
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser.h b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser.h
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser.h
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser.h
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/graph_fuser.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/graph_fuser.cpp
similarity index 99%
rename from pytorch_blade/src/ltc/disc_compiler/passes/graph_fuser.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/graph_fuser.cpp
index 32c878aee25..7afaffef6fc 100644
--- a/pytorch_blade/src/ltc/disc_compiler/passes/graph_fuser.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/graph_fuser.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/disc_compiler/passes/graph_fuser.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/graph_fuser.h"
 
 #include <c10/util/Exception.h>
 #include <c10/util/irange.h>
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/graph_fuser.h b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/graph_fuser.h
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/passes/graph_fuser.h
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/graph_fuser.h
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/io.h b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/io.h
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/passes/io.h
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/io.h
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/register_disc_class.cpp
similarity index 94%
rename from pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/register_disc_class.cpp
index 9d3f237381e..12a32590475 100644
--- a/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/register_disc_class.cpp
@@ -9,14 +9,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/disc_compiler/passes/register_disc_class.h"
-
-#include "common_utils/logging.h"
-#include "compiler/backends/engine_class.h"
-#include "compiler/mlir/converters/mhlo_conversion.h"
-#include "compiler/mlir/runtime/disc_engine.h"
-#include "ltc/disc_compiler/passes/io.h"
-#include "ltc/disc_compiler/replay.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/register_disc_class.h"
+
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/compiler/backends/engine_class.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion.h"
+#include "pytorch_blade/compiler/mlir/runtime/disc_engine.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/io.h"
+#include "pytorch_blade/ltc/disc_compiler/replay.h"
 
 #include <torch/csrc/jit/jit_log.h>
 #include <torch/csrc/lazy/core/hash.h>
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.h b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/register_disc_class.h
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.h
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/register_disc_class.h
diff --git a/pytorch_blade/src/ltc/disc_compiler/replay.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/replay.cpp
similarity index 96%
rename from pytorch_blade/src/ltc/disc_compiler/replay.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/replay.cpp
index bedcba50932..c81b07b8d22 100644
--- a/pytorch_blade/src/ltc/disc_compiler/replay.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/replay.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/disc_compiler/replay.h"
+#include "pytorch_blade/ltc/disc_compiler/replay.h"
 
 #include <sys/stat.h>
 #include <torch/csrc/jit/api/function_impl.h>
@@ -23,10 +23,10 @@
 #include <cuda_profiler_api.h>
 #endif
 
-#include "common_utils/logging.h"
-#include "common_utils/utils.h"
-#include "compiler/jit/tool_funcs.h"
-#include "ltc/disc_compiler/disc_compiler.h"
+#include "pytorch_blade/common_utils/logging.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/compiler/jit/tool_funcs.h"
+#include "pytorch_blade/ltc/disc_compiler/disc_compiler.h"
 
 namespace torch_disc {
 namespace compiler {
@@ -206,4 +206,4 @@ bool IsForceFallback() {
 }
 
 } //  namespace compiler
-} //  namespace torch_disc
\ No newline at end of file
+} //  namespace torch_disc
diff --git a/pytorch_blade/src/ltc/disc_compiler/replay.h b/pytorch_blade/pytorch_blade/ltc/disc_compiler/replay.h
similarity index 94%
rename from pytorch_blade/src/ltc/disc_compiler/replay.h
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/replay.h
index 9fb6512460a..948c0d2041d 100644
--- a/pytorch_blade/src/ltc/disc_compiler/replay.h
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/replay.h
@@ -15,8 +15,8 @@
 #include <memory>
 #include <string>
 
-#include "common_utils/utils.h"
-#include "ltc/disc_compiler/disc_compiler.h"
+#include "pytorch_blade/common_utils/utils.h"
+#include "pytorch_blade/ltc/disc_compiler/disc_compiler.h"
 
 namespace c10 {
 class IValue;
@@ -79,4 +79,4 @@ void BeginClusterReplayRecord();
 void EndClusterReplayRecord();
 
 } //  namespace compiler
-} //  namespace torch_disc
\ No newline at end of file
+} //  namespace torch_disc
diff --git a/pytorch_blade/src/ltc/include/LICENSE b/pytorch_blade/pytorch_blade/ltc/include/LICENSE
similarity index 100%
rename from pytorch_blade/src/ltc/include/LICENSE
rename to pytorch_blade/pytorch_blade/ltc/include/LICENSE
diff --git a/pytorch_blade/src/ltc/include/README.md b/pytorch_blade/pytorch_blade/ltc/include/README.md
similarity index 100%
rename from pytorch_blade/src/ltc/include/README.md
rename to pytorch_blade/pytorch_blade/ltc/include/README.md
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/core/internal_ops/ltc_ops.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/core/internal_ops/ltc_ops.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/core/internal_ops/ltc_ops.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/core/internal_ops/ltc_ops.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/python/python_util.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/python/python_util.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/python/python_util.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/python/python_util.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/config.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/config.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/config.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/config.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/dynamic_ir.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/dynamic_ir.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/dynamic_ir.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/dynamic_ir.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ir_builder.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ir_builder.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ir_builder.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ir_builder.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/batch_norm_ops.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/batch_norm_ops.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/batch_norm_ops.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/batch_norm_ops.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/cast.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/cast.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/cast.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/cast.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/device_data.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/device_data.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/device_data.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/device_data.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/expand.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/expand.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/expand.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/expand.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/generic.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/generic.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/generic.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/generic.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/random_ops.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/random_ops.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/random_ops.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/random_ops.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/scalar.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/scalar.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/scalar.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/scalar.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/to_copy.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/to_copy.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ops/to_copy.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ops/to_copy.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/tensor_aten_ops.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/tensor_aten_ops.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/tensor_aten_ops.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/tensor_aten_ops.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_autograd_functions.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_autograd_functions.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_autograd_functions.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_autograd_functions.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_backend_impl.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_backend_impl.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_backend_impl.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_backend_impl.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_eager_fallback.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_eager_fallback.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_eager_fallback.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_eager_fallback.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_lowering_context.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_lowering_context.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_lowering_context.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_lowering_context.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_node.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_node.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_node.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_node.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_node_lowering.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_node_lowering.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/ts_node_lowering.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/ts_node_lowering.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided_view_update.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided_view_update.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided_view_update.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/as_strided_view_update.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal_view_update.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal_view_update.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal_view_update.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/diagonal_view_update.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow_view_update.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow_view_update.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow_view_update.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/narrow_view_update.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/permute.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/permute.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/permute.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/permute.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/resize.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/resize.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/resize.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/resize.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select_view_update.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select_view_update.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select_view_update.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/select_view_update.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/squeeze.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/squeeze.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/squeeze.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/squeeze.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/unsqueeze.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/unsqueeze.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/unsqueeze.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/unsqueeze.h
diff --git a/pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/view.h b/pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/view.h
similarity index 100%
rename from pytorch_blade/src/ltc/include/torch/csrc/lazy/ts_backend/view_ops/view.h
rename to pytorch_blade/pytorch_blade/ltc/include/torch/csrc/lazy/ts_backend/view_ops/view.h
diff --git a/pytorch_blade/src/ltc/init_python_bindings.cpp b/pytorch_blade/pytorch_blade/ltc/init_python_bindings.cpp
similarity index 85%
rename from pytorch_blade/src/ltc/init_python_bindings.cpp
rename to pytorch_blade/pytorch_blade/ltc/init_python_bindings.cpp
index 4932119a8ce..efa3076b816 100644
--- a/pytorch_blade/src/ltc/init_python_bindings.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/init_python_bindings.cpp
@@ -9,10 +9,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ltc/init_python_bindings.h"
+#include "pytorch_blade/ltc/init_python_bindings.h"
 
-#include "ltc/disc_backend/backend_impl.h"
-#include "ltc/disc_compiler/replay.h"
+#include "pytorch_blade/ltc/disc_backend/backend_impl.h"
+#include "pytorch_blade/ltc/disc_compiler/replay.h"
 
 namespace torch_disc {
 namespace py = pybind11;
diff --git a/pytorch_blade/src/ltc/init_python_bindings.h b/pytorch_blade/pytorch_blade/ltc/init_python_bindings.h
similarity index 100%
rename from pytorch_blade/src/ltc/init_python_bindings.h
rename to pytorch_blade/pytorch_blade/ltc/init_python_bindings.h
diff --git a/pytorch_blade/src/pybind.cpp b/pytorch_blade/pytorch_blade/pybind.cpp
similarity index 99%
rename from pytorch_blade/src/pybind.cpp
rename to pytorch_blade/pytorch_blade/pybind.cpp
index dd4de3f2ae2..ac0db1515d1 100644
--- a/pytorch_blade/src/pybind.cpp
+++ b/pytorch_blade/pytorch_blade/pybind.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "pybind.h"
+#include "pytorch_blade/pybind.h"
 
 #include <mutex>
 #include "compiler/backends/engine_class.h"
diff --git a/pytorch_blade/src/pybind.h b/pytorch_blade/pytorch_blade/pybind.h
similarity index 100%
rename from pytorch_blade/src/pybind.h
rename to pytorch_blade/pytorch_blade/pybind.h
diff --git a/pytorch_blade/src/quantization/BUILD b/pytorch_blade/pytorch_blade/quantization/BUILD
similarity index 93%
rename from pytorch_blade/src/quantization/BUILD
rename to pytorch_blade/pytorch_blade/quantization/BUILD
index cc0f490aef3..785da0a483b 100644
--- a/pytorch_blade/src/quantization/BUILD
+++ b/pytorch_blade/pytorch_blade/quantization/BUILD
@@ -11,7 +11,7 @@ cc_library(
     ],
     deps = [
         "@local_org_torch//:libtorch",
-        "//src/common_utils:torch_blade_common"
+        "//pytorch_blade/common_utils:torch_blade_common"
     ],
     alwayslink = 1,
 )
diff --git a/pytorch_blade/src/quantization/fake_quant.cpp b/pytorch_blade/pytorch_blade/quantization/fake_quant.cpp
similarity index 97%
rename from pytorch_blade/src/quantization/fake_quant.cpp
rename to pytorch_blade/pytorch_blade/quantization/fake_quant.cpp
index 08559143b4c..43b5f1594b6 100644
--- a/pytorch_blade/src/quantization/fake_quant.cpp
+++ b/pytorch_blade/pytorch_blade/quantization/fake_quant.cpp
@@ -13,7 +13,7 @@
 #include <mutex>
 
 #include <ATen/Functions.h>
-#include "common_utils/logging.h"
+#include "pytorch_blade/common_utils/logging.h"
 
 #include <torch/script.h>
 
diff --git a/pytorch_blade/src/quantization/placeholder_op.cpp b/pytorch_blade/pytorch_blade/quantization/placeholder_op.cpp
similarity index 94%
rename from pytorch_blade/src/quantization/placeholder_op.cpp
rename to pytorch_blade/pytorch_blade/quantization/placeholder_op.cpp
index a9f6a0846dc..883e89b70b7 100644
--- a/pytorch_blade/src/quantization/placeholder_op.cpp
+++ b/pytorch_blade/pytorch_blade/quantization/placeholder_op.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "placeholder_op.h"
+#include "pytorch_blade/quantization/placeholder_op.h"
 #include "common_utils/logging.h"
 
 #include <torch/script.h>
@@ -35,4 +35,4 @@ TORCH_LIBRARY(torch_blade_quantization, m) {
 
 } // namespace quantization
 } // namespace blade
-} // namespace torch
\ No newline at end of file
+} // namespace torch
diff --git a/pytorch_blade/src/quantization/placeholder_op.h b/pytorch_blade/pytorch_blade/quantization/placeholder_op.h
similarity index 100%
rename from pytorch_blade/src/quantization/placeholder_op.h
rename to pytorch_blade/pytorch_blade/quantization/placeholder_op.h
diff --git a/pytorch_blade/src/quantization/pybind_functions.cpp b/pytorch_blade/pytorch_blade/quantization/pybind_functions.cpp
similarity index 97%
rename from pytorch_blade/src/quantization/pybind_functions.cpp
rename to pytorch_blade/pytorch_blade/quantization/pybind_functions.cpp
index bf6dc39de09..7480418fc04 100644
--- a/pytorch_blade/src/quantization/pybind_functions.cpp
+++ b/pytorch_blade/pytorch_blade/quantization/pybind_functions.cpp
@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "pybind_functions.h"
+#include "pytorch_blade/quantization/pybind_functions.h"
 #include "placeholder_op.h"
 
 #include <torch/csrc/jit/passes/inliner.h>
diff --git a/pytorch_blade/src/quantization/pybind_functions.h b/pytorch_blade/pytorch_blade/quantization/pybind_functions.h
similarity index 100%
rename from pytorch_blade/src/quantization/pybind_functions.h
rename to pytorch_blade/pytorch_blade/quantization/pybind_functions.h
diff --git a/pytorch_blade/src/torch-mlir/BUILD b/pytorch_blade/pytorch_blade/torch-mlir/BUILD
similarity index 100%
rename from pytorch_blade/src/torch-mlir/BUILD
rename to pytorch_blade/pytorch_blade/torch-mlir/BUILD
diff --git a/pytorch_blade/src/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h b/pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h
similarity index 100%
rename from pytorch_blade/src/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h
rename to pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.h
diff --git a/pytorch_blade/src/torch-mlir/include/torch-mlir/Conversion/MhloPasses.td b/pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.td
similarity index 100%
rename from pytorch_blade/src/torch-mlir/include/torch-mlir/Conversion/MhloPasses.td
rename to pytorch_blade/pytorch_blade/torch-mlir/include/torch-mlir/Conversion/MhloPasses.td
diff --git a/pytorch_blade/src/torch-mlir/lib/Conversion/MhloPasses.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Conversion/MhloPasses.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Conversion/MhloPasses.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Conversion/MhloPasses.cpp
diff --git a/pytorch_blade/src/torch-mlir/lib/Conversion/TorchToMhlo/DiscTorchToMhlo.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Conversion/TorchToMhlo/DiscTorchToMhlo.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Conversion/TorchToMhlo/DiscTorchToMhlo.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Conversion/TorchToMhlo/DiscTorchToMhlo.cpp
diff --git a/pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyValueSemantics.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyValueSemantics.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyValueSemantics.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ApplyValueSemantics.cpp
diff --git a/pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscConvertTorchToDiscMhlo.cpp
diff --git a/pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscDecomposeComplexOps.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscDecomposeComplexOps.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscDecomposeComplexOps.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/DiscDecomposeComplexOps.cpp
diff --git a/pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/ReduceTensorConversions.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ReduceTensorConversions.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/ReduceTensorConversions.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/ReduceTensorConversions.cpp
diff --git a/pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp b/pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp
similarity index 100%
rename from pytorch_blade/src/torch-mlir/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp
rename to pytorch_blade/pytorch_blade/torch-mlir/lib/Dialect/TorchConversion/Transforms/VerifyMhloBackendContract.cpp
diff --git a/pytorch_blade/src/torch_blade.lds b/pytorch_blade/pytorch_blade/torch_blade.lds
similarity index 100%
rename from pytorch_blade/src/torch_blade.lds
rename to pytorch_blade/pytorch_blade/torch_blade.lds
diff --git a/pytorch_blade/src/compiler/BUILD b/pytorch_blade/src/compiler/BUILD
deleted file mode 100644
index 5f49e0df6a4..00000000000
--- a/pytorch_blade/src/compiler/BUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-load("//bazel:build_defs.bzl", "if_tensorrt_enabled")
-
-filegroup(
-    name = "torch_blade_py_srcs",
-    srcs = [
-        "//src/compiler/jit:torch_blade_jit_py_srcs",
-        "//src/compiler/mlir:torch_blade_mlir_py_srcs",
-    ] + if_tensorrt_enabled(["//src/compiler/tensorrt:pybind_functions.cpp"]),
-)
-
-filegroup(
-    name = "torch_blade_py_hdrs",
-    srcs = [
-        "//src/compiler/jit:torch_blade_jit_py_hdrs",
-        "//src/compiler/mlir:torch_blade_mlir_py_hdrs",
-    ] + if_tensorrt_enabled(["//src/compiler/tensorrt:pybind_functions.h"]),
-)


Test patch:
diff --git a/pytorch_blade/src/common_utils/tempfs_test.cpp b/pytorch_blade/pytorch_blade/common_utils/tempfs_test.cpp
similarity index 96%
rename from pytorch_blade/src/common_utils/tempfs_test.cpp
rename to pytorch_blade/pytorch_blade/common_utils/tempfs_test.cpp
index de3a2219d3e..04c4bbffa10 100644
--- a/pytorch_blade/src/common_utils/tempfs_test.cpp
+++ b/pytorch_blade/pytorch_blade/common_utils/tempfs_test.cpp
@@ -13,7 +13,7 @@
 
 #include <fstream>
 
-#include <common_utils/tempfs.h>
+#include "pytorch_blade/common_utils/tempfs.h"
 
 using torch::blade::TempFile;
 
diff --git a/pytorch_blade/src/common_utils/utils_test.cpp b/pytorch_blade/pytorch_blade/common_utils/utils_test.cpp
similarity index 96%
rename from pytorch_blade/src/common_utils/utils_test.cpp
rename to pytorch_blade/pytorch_blade/common_utils/utils_test.cpp
index 1e2164a0979..2716b73bc47 100644
--- a/pytorch_blade/src/common_utils/utils_test.cpp
+++ b/pytorch_blade/pytorch_blade/common_utils/utils_test.cpp
@@ -11,9 +11,9 @@
 
 #include <gtest/gtest.h>
 
-#include <common_utils/utils.h>
 #include <torch/script.h>
 #include <fstream>
+#include "pytorch_blade/common_utils/utils.h"
 
 TEST(DumpIValues, TestDumpIValues) {
   struct stat f_stat;
@@ -35,4 +35,4 @@ TEST(DumpIValues, TestDumpIValues) {
       std::istreambuf_iterator<char>());
   auto ivalue = torch::jit::pickle_load(load_input);
   EXPECT_TRUE(ivalue.isTensor());
-}
\ No newline at end of file
+}
diff --git a/pytorch_blade/src/compiler/jit/fusion_test.cpp b/pytorch_blade/pytorch_blade/compiler/jit/fusion_test.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/jit/fusion_test.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/fusion_test.cpp
index 2d31b686927..45fdb93d33f 100644
--- a/pytorch_blade/src/compiler/jit/fusion_test.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/fusion_test.cpp
@@ -13,7 +13,7 @@
 #include <torch/csrc/jit/ir/irparser.h>
 #include <vector>
 
-#include "compiler/jit/fusion.h"
+#include "pytorch_blade/compiler/jit/fusion.h"
 
 using namespace torch::blade;
 TEST(SetTensorShapeTest, TestCase) {
diff --git a/pytorch_blade/src/compiler/jit/shape_type_test.cpp b/pytorch_blade/pytorch_blade/compiler/jit/shape_type_test.cpp
similarity index 97%
rename from pytorch_blade/src/compiler/jit/shape_type_test.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/shape_type_test.cpp
index ad69656b31d..4cb549ccf9b 100644
--- a/pytorch_blade/src/compiler/jit/shape_type_test.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/shape_type_test.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "compiler/jit/shape_type_spec.h"
+#include "pytorch_blade/compiler/jit/shape_type_spec.h"
 
 using namespace torch::blade;
 TEST(ShapeTypeTest, ShapeTypeString) {
@@ -57,4 +57,4 @@ TEST(ShapeTypeSpecTest, ShapeTypeSpecString) {
       ShapeTypeSpec::Deserialize(serial_str + "Float(1,);"), c10::Error);
   serial_str += "Int(1:1,);";
   ASSERT_FALSE(spec == ShapeTypeSpec::Deserialize(serial_str));
-}
\ No newline at end of file
+}
diff --git a/pytorch_blade/src/compiler/jit/torch/shape_analysis_test.cpp b/pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis_test.cpp
similarity index 95%
rename from pytorch_blade/src/compiler/jit/torch/shape_analysis_test.cpp
rename to pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis_test.cpp
index 46f0aa23fd0..bc22b11c497 100644
--- a/pytorch_blade/src/compiler/jit/torch/shape_analysis_test.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/jit/torch/shape_analysis_test.cpp
@@ -13,7 +13,7 @@
 #include <torch/csrc/jit/ir/irparser.h>
 #include <torch/csrc/jit/testing/file_check.h>
 #include <torch/script.h>
-#include "compiler/jit/torch/shape_analysis.h"
+#include "pytorch_blade/compiler/jit/torch/shape_analysis.h"
 
 namespace torch {
 namespace blade {
@@ -52,4 +52,4 @@ graph(%p1 : Float(*, *, *)):
       ->run(*g);
 }
 } //  namespace blade
-} //  namespace torch
\ No newline at end of file
+} //  namespace torch
diff --git a/pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register_test.cpp b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register_test.cpp
similarity index 94%
rename from pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register_test.cpp
rename to pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register_test.cpp
index 153dd8a3a8c..adb427c48c8 100644
--- a/pytorch_blade/src/compiler/mlir/converters/mhlo_converter_register_test.cpp
+++ b/pytorch_blade/pytorch_blade/compiler/mlir/converters/mhlo_converter_register_test.cpp
@@ -11,8 +11,8 @@
 
 #include <gtest/gtest.h>
 
-#include "compiler/mlir/converters/mhlo_conversion.h"
-#include "compiler/mlir/converters/mhlo_converter_register.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_conversion.h"
+#include "pytorch_blade/compiler/mlir/converters/mhlo_converter_register.h"
 
 #include <torch/csrc/jit/ir/irparser.h>
 #include <torch/csrc/jit/testing/file_check.h>
diff --git a/pytorch_blade/src/ltc/disc_compiler/disc_compiler_test.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler_test.cpp
similarity index 100%
rename from pytorch_blade/src/ltc/disc_compiler/disc_compiler_test.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/disc_compiler_test.cpp
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser_test.cpp b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser_test.cpp
similarity index 96%
rename from pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser_test.cpp
rename to pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser_test.cpp
index cf85c5cf417..ebd51a76b35 100644
--- a/pytorch_blade/src/ltc/disc_compiler/passes/disc_fuser_test.cpp
+++ b/pytorch_blade/pytorch_blade/ltc/disc_compiler/passes/disc_fuser_test.cpp
@@ -17,8 +17,8 @@
 #include <torch/custom_class.h>
 #include <torch/script.h>
 
-#include "ltc/disc_compiler/passes/disc_fuser.h"
-#include "ltc/disc_compiler/passes/graph_fuser.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/disc_fuser.h"
+#include "pytorch_blade/ltc/disc_compiler/passes/graph_fuser.h"
 
 namespace torch_disc {
 namespace compiler {
diff --git a/pytorch_blade/tests/mhlo/torch-mlir-opt/BUILD b/pytorch_blade/tests/mhlo/torch-mlir-opt/BUILD
index fe9cb81e7e1..e17fa47207d 100644
--- a/pytorch_blade/tests/mhlo/torch-mlir-opt/BUILD
+++ b/pytorch_blade/tests/mhlo/torch-mlir-opt/BUILD
@@ -8,7 +8,7 @@ cc_binary(
         "torch-mlir-opt.cpp"
     ],
     deps = [
-        "//src/torch-mlir:DiscTorchMLIRTorchToMhlo",
+        "//pytorch_blade/torch-mlir:DiscTorchMLIRTorchToMhlo",
         "@torch-mlir//:TorchMLIRInitAll",
         "@torch-mlir//:TorchMLIRTorchDialect",
         "@torch-mlir//:TorchMLIRTorchPasses",