diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4de738e..a28ff75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,49 +1,33 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(wenet VERSION 0.1)
-# 测试模块参数设置
-option(GRPC "build with gRPC" OFF)
-option(GLOGS "build with GLOGS" OFF)
-option(ONNX "build with ONNX" OFF)
-option(OPENFST "build with FST" ON)
-option(CLEAN_CMAKE_CACHE "更换Build目录运行需要清空缓存" OFF)
+project(wenet VERSION 0.2)
+#运行参数
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pthread -fPIC")
+option(GRPC "whether to build with gRPC" ON)
+option(ONNX "whether to build with ONNX" ON)
 
-
-# set color
-string(ASCII 27 Esc)
-set(ColourReset "${Esc}[m")
-set(BoldGreen   "${Esc}[1;32m")
-set(BoldRed     "${Esc}[31m")
-
-set(third_party_libraries)
-set(LIB_BASE_DIR /root/projects/temp_xiaoke/asr_runtime/lib_files)
-#清空缓存
-if(CLEAN_CMAKE_CACHE)
-    message(STATUS "Cleaning CMakeCache.txt")
-    execute_process(
-            COMMAND find . -name "CMake*" -exec rm -rf {} \;
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-endif ()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux)
-if(GLOGS)
-    include(gflags)
-    include(glog)
-    add_executable(glog_main "glogs.cc")
-    target_link_libraries(glog_main ${third_party_libraries})
+# Model Option
+if(ONNX)
+    include(onnx)
 endif()
+include(openfst)
+include_directories(
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/kaldi
+)
+
+# Build all libraries
+add_subdirectory(utils)
+add_subdirectory(frontend)
+add_subdirectory(post_processor)
+add_subdirectory(kaldi)  # kaldi:
+add_subdirectory(decoder)
+#Connection Option
 if(GRPC)
     include(grpc)
-    add_subdirectory(bin_grpc)
+    add_subdirectory(grpc)
 endif()
 
-if(ONNX)
-    include(onnx)
-    add_executable(onnx_main "onnx.cc")
-    target_link_libraries(onnx_main PRIVATE ${third_party_libraries})
-endif()
-if(OPENFST)
-    include(openfst)
-    add_executable(fst_main "fst.cc")
-    target_link_libraries(fst_main PRIVATE ${third_party_libraries})
-endif()
+# Build all bins
+add_subdirectory(bin)
\ No newline at end of file
diff --git a/CMakeLists.txt.bak1 b/CMakeLists.txt.bak1
deleted file mode 100644
index 3470d52..0000000
--- a/CMakeLists.txt.bak1
+++ /dev/null
@@ -1,6 +0,0 @@
-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.txt.test b/CMakeLists.txt.test
new file mode 100644
index 0000000..dc0994e
--- /dev/null
+++ b/CMakeLists.txt.test
@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+project(wenet VERSION 0.1)
+# 测试模块参数设置
+option(GRPC "build with gRPC" OFF)
+option(GLOGS "build with GLOGS" OFF)
+option(ONNX "build with ONNX" OFF)
+option(OPENFST "build with FST" ON)
+option(CLEAN_CMAKE_CACHE "更换Build目录运行需要清空缓存" OFF)
+
+
+# set color
+string(ASCII 27 Esc)
+set(ColourReset "${Esc}[m")
+set(BoldGreen   "${Esc}[1;32m")
+set(BoldRed     "${Esc}[31m")
+
+set(third_party_libraries)
+set(LIB_BASE_DIR /root/projects/temp_xiaoke/asr_runtime/lib_files)
+#清空缓存
+if(CLEAN_CMAKE_CACHE)
+    message(STATUS "Cleaning CMakeCache.txt")
+    execute_process(
+            COMMAND find . -name "CMake*" -exec rm -rf {} \;
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+endif ()
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux)
+if(GLOGS)
+    include(gflags)
+    include(glog)
+    add_executable(glog_main "glogs.cc")
+    target_link_libraries(glog_main ${third_party_libraries})
+endif()
+if(GRPC)
+    include(grpc)
+    add_subdirectory(bin_test_grpc)
+endif()
+
+if(ONNX)
+    include(onnx)
+    add_executable(onnx_main "onnx.cc")
+    target_link_libraries(onnx_main PRIVATE ${third_party_libraries})
+endif()
+if(OPENFST)
+    include(openfst)
+    add_executable(fst_main "fst.cc")
+    target_link_libraries(fst_main PRIVATE ${third_party_libraries})
+endif()
diff --git a/bin_grpc/CMakeLists.txt b/bin_test_grpc/CMakeLists.txt
similarity index 100%
rename from bin_grpc/CMakeLists.txt
rename to bin_test_grpc/CMakeLists.txt
diff --git a/bin_grpc/greeter_async_client.cc b/bin_test_grpc/greeter_async_client.cc
similarity index 100%
rename from bin_grpc/greeter_async_client.cc
rename to bin_test_grpc/greeter_async_client.cc
diff --git a/bin_grpc/greeter_async_client2.cc b/bin_test_grpc/greeter_async_client2.cc
similarity index 100%
rename from bin_grpc/greeter_async_client2.cc
rename to bin_test_grpc/greeter_async_client2.cc
diff --git a/bin_grpc/greeter_async_server.cc b/bin_test_grpc/greeter_async_server.cc
similarity index 100%
rename from bin_grpc/greeter_async_server.cc
rename to bin_test_grpc/greeter_async_server.cc
diff --git a/bin_grpc/greeter_client.cc b/bin_test_grpc/greeter_client.cc
similarity index 100%
rename from bin_grpc/greeter_client.cc
rename to bin_test_grpc/greeter_client.cc
diff --git a/bin_grpc/greeter_server.cc b/bin_test_grpc/greeter_server.cc
similarity index 100%
rename from bin_grpc/greeter_server.cc
rename to bin_test_grpc/greeter_server.cc
diff --git a/bin_grpc/helloworld.proto b/bin_test_grpc/helloworld.proto
similarity index 100%
rename from bin_grpc/helloworld.proto
rename to bin_test_grpc/helloworld.proto
diff --git a/kaldi/CMakeLists.txt b/kaldi/CMakeLists.txt
index 353ecbe..68a3ecd 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.bak1.bak
+# include_directories() is called in the root CMakeLists.txt.test.bak1.bak
 
 add_library(kaldi-util
   base/kaldi-error.cc