diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0b70d1..63af0ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ if(CLEAN_CMAKE_CACHE)
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
 endif ()
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-local)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux)
 if(GLOGS)
     include(gflags)
     include(glog)
@@ -46,6 +46,6 @@ if(ONNX)
 endif()
 if(OPENFST)
     include(openfst)
-    add_executable(fst_main bin_test/fst.cc)
+    add_executable(fst_main bin_test_env/fst.cc)
     target_link_libraries(fst_main PRIVATE ${third_party_libraries})
 endif()
diff --git a/CMakeLists.txt.bak1 b/CMakeLists.txt.bak1
new file mode 100644
index 0000000..3470d52
--- /dev/null
+++ b/CMakeLists.txt.bak1
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(wenet VERSION 0.2)
+
+option(GRPC "whether to build with gRPC" ON)
+option(ONNX "whether to build with ONNX" ON)
\ No newline at end of file
diff --git a/CMakeLists.txt1 b/CMakeLists.txt1
index 08d7cdb..27041dd 100644
--- a/CMakeLists.txt1
+++ b/CMakeLists.txt1
@@ -52,7 +52,7 @@ endif()
 add_subdirectory(utils)
 add_subdirectory(frontend)
 add_subdirectory(post_processor)
-add_subdirectory(kaldi)  # kaldi: wfst based decoder
+add_subdirectory(kaldi)  # kaldi:
 add_subdirectory(decoder)
 
 # Optionally, you can build with websocket
diff --git a/bin_test/fst.cc b/bin_test_env/fst.cc
similarity index 100%
rename from bin_test/fst.cc
rename to bin_test_env/fst.cc
diff --git a/bin_test/gflags.cc b/bin_test_env/gflags.cc
similarity index 100%
rename from bin_test/gflags.cc
rename to bin_test_env/gflags.cc
diff --git a/bin_test/glogs.cc b/bin_test_env/glogs.cc
similarity index 100%
rename from bin_test/glogs.cc
rename to bin_test_env/glogs.cc
diff --git a/bin_test/onnx.cc b/bin_test_env/onnx.cc
similarity index 100%
rename from bin_test/onnx.cc
rename to bin_test_env/onnx.cc
diff --git a/cmake-local/gflags.cmake b/cmake-linux/gflags.cmake
similarity index 100%
rename from cmake-local/gflags.cmake
rename to cmake-linux/gflags.cmake
diff --git a/cmake-local/glog.cmake b/cmake-linux/glog.cmake
similarity index 100%
rename from cmake-local/glog.cmake
rename to cmake-linux/glog.cmake
diff --git a/cmake-local/grpc.cmake b/cmake-linux/grpc.cmake
similarity index 100%
rename from cmake-local/grpc.cmake
rename to cmake-linux/grpc.cmake
diff --git a/cmake-local/onnx.cmake b/cmake-linux/onnx.cmake
similarity index 100%
rename from cmake-local/onnx.cmake
rename to cmake-linux/onnx.cmake
diff --git a/cmake-local/openfst.cmake b/cmake-linux/openfst.cmake
similarity index 90%
rename from cmake-local/openfst.cmake
rename to cmake-linux/openfst.cmake
index de23800..db7497f 100644
--- a/cmake-local/openfst.cmake
+++ b/cmake-linux/openfst.cmake
@@ -1,7 +1,7 @@
 # We can't build glog with gflags, unless gflags is pre-installed.
 # If build glog with pre-installed gflags, there will be conflict.
 
-
+set(openfst_ROOT ${LIB_BASE_DIR}/openfst-src)
 set(openfst_BUILD "${LIB_BASE_DIR}/openfst-build")
 if(NOT EXISTS ${openfst_BUILD})
     # install openfst
@@ -48,11 +48,10 @@ set(HAVE_LOOKAHEAD OFF CACHE BOOL "Build lookahead" FORCE)
 set(HAVE_NGRAM OFF CACHE BOOL "Build ngram" FORCE)
 set(HAVE_SPECIAL OFF CACHE BOOL "Build special" FORCE)
 
-FetchContent_Declare(openfst
-        SOURCE_DIR ${LIB_BASE_DIR}/openfst-src)
-FetchContent_MakeAvailable(openfst)
+find_package(openfst REQUIRED CONFIG HINTS ${openfst_ROOT})
+message(STATUS "${BoldGreen}Find Package openfst: ${openfst_FOUND}${ColourReset}")
 
-include_directories(${LIB_BASE_DIR}/openfst-src/src/include)
+include_directories(${openfst_ROOT}/src/include)
 
 message(STATUS "${BoldGreen}openfst_BINARY_DIR: ${openfst_BINARY_DIR}${ColourReset}")
 
diff --git a/kaldi/CMakeLists.txt b/kaldi/CMakeLists.txt
index b072309..353ecbe 100644
--- a/kaldi/CMakeLists.txt
+++ b/kaldi/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
 project(kaldi)
 
-# include_directories() is called in the root CMakeLists.txt
+# include_directories() is called in the root CMakeLists.txt.bak1.bak
 
 add_library(kaldi-util
   base/kaldi-error.cc