diff --git a/hexagon/BUILD b/hexagon/BUILD
deleted file mode 100644
index 7bbacc9139b69fbdcf52808af15068aa94863540..0000000000000000000000000000000000000000
--- a/hexagon/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-cc_library(
-    name = "hexagon",
-    srcs = [
-        "libhexagon_controller.so",
-    ],
-    visibility = ["//visibility:public"],
-)
diff --git a/hexagon/libhexagon_controller.so b/hexagon/libhexagon_controller.so
deleted file mode 100755
index 42dbfabb2cb90dfdcff463f4d46cac981de0dacf..0000000000000000000000000000000000000000
Binary files a/hexagon/libhexagon_controller.so and /dev/null differ
diff --git a/proto/BUILD b/mace/proto/BUILD
similarity index 100%
rename from proto/BUILD
rename to mace/proto/BUILD
diff --git a/proto/caffe.proto b/mace/proto/caffe.proto
similarity index 100%
rename from proto/caffe.proto
rename to mace/proto/caffe.proto
diff --git a/proto/mace.proto b/mace/proto/mace.proto
similarity index 100%
rename from proto/mace.proto
rename to mace/proto/mace.proto
diff --git a/python/tools/BUILD b/mace/python/tools/BUILD
similarity index 100%
rename from python/tools/BUILD
rename to mace/python/tools/BUILD
diff --git a/python/tools/binary_codegen.py b/mace/python/tools/binary_codegen.py
similarity index 100%
rename from python/tools/binary_codegen.py
rename to mace/python/tools/binary_codegen.py
diff --git a/python/tools/caffe_converter_lib.py b/mace/python/tools/caffe_converter_lib.py
similarity index 100%
rename from python/tools/caffe_converter_lib.py
rename to mace/python/tools/caffe_converter_lib.py
diff --git a/python/tools/convert_util.py b/mace/python/tools/convert_util.py
similarity index 100%
rename from python/tools/convert_util.py
rename to mace/python/tools/convert_util.py
diff --git a/python/tools/converter.py b/mace/python/tools/converter.py
similarity index 100%
rename from python/tools/converter.py
rename to mace/python/tools/converter.py
diff --git a/python/tools/dsp_ops.py b/mace/python/tools/dsp_ops.py
similarity index 100%
rename from python/tools/dsp_ops.py
rename to mace/python/tools/dsp_ops.py
diff --git a/python/tools/graph_util.py b/mace/python/tools/graph_util.py
similarity index 100%
rename from python/tools/graph_util.py
rename to mace/python/tools/graph_util.py
diff --git a/python/tools/memory_optimizer.py b/mace/python/tools/memory_optimizer.py
similarity index 100%
rename from python/tools/memory_optimizer.py
rename to mace/python/tools/memory_optimizer.py
diff --git a/python/tools/model.template b/mace/python/tools/model.template
similarity index 100%
rename from python/tools/model.template
rename to mace/python/tools/model.template
diff --git a/python/tools/model_header.template b/mace/python/tools/model_header.template
similarity index 100%
rename from python/tools/model_header.template
rename to mace/python/tools/model_header.template
diff --git a/python/tools/opencl_codegen.py b/mace/python/tools/opencl_codegen.py
similarity index 100%
rename from python/tools/opencl_codegen.py
rename to mace/python/tools/opencl_codegen.py
diff --git a/python/tools/operator.template b/mace/python/tools/operator.template
similarity index 100%
rename from python/tools/operator.template
rename to mace/python/tools/operator.template
diff --git a/python/tools/source_converter_lib.py b/mace/python/tools/source_converter_lib.py
similarity index 100%
rename from python/tools/source_converter_lib.py
rename to mace/python/tools/source_converter_lib.py
diff --git a/python/tools/str2vec_maps.cc.tmpl b/mace/python/tools/str2vec_maps.cc.tmpl
similarity index 100%
rename from python/tools/str2vec_maps.cc.tmpl
rename to mace/python/tools/str2vec_maps.cc.tmpl
diff --git a/python/tools/tensor_data.template b/mace/python/tools/tensor_data.template
similarity index 100%
rename from python/tools/tensor_data.template
rename to mace/python/tools/tensor_data.template
diff --git a/python/tools/tensor_source.template b/mace/python/tools/tensor_source.template
similarity index 100%
rename from python/tools/tensor_source.template
rename to mace/python/tools/tensor_source.template
diff --git a/python/tools/tf_converter_lib.py b/mace/python/tools/tf_converter_lib.py
similarity index 100%
rename from python/tools/tf_converter_lib.py
rename to mace/python/tools/tf_converter_lib.py
diff --git a/python/tools/tf_dsp_converter_lib.py b/mace/python/tools/tf_dsp_converter_lib.py
similarity index 100%
rename from python/tools/tf_dsp_converter_lib.py
rename to mace/python/tools/tf_dsp_converter_lib.py