diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2763a2c256cbb2077c3bb8d5962360207f3c344..8542345a8ed3b86fbe58f35eac5ba7719d807c40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,12 +105,12 @@ if (NOT CLIENT_ONLY)
     list(APPEND EXTERNAL_LIBS opencv)
 endif()
 
+add_subdirectory(cube)
 add_subdirectory(configure)
 add_subdirectory(pdcodegen)
 add_subdirectory(sdk-cpp)
 add_subdirectory(demo-client)
 add_subdirectory(kvdb)
-add_subdirectory(cube)
 
 if (NOT CLIENT_ONLY)
 add_subdirectory(predictor)
diff --git a/cube/cube-api/CMakeLists.txt b/cube/cube-api/CMakeLists.txt
index c4c33024d86b8459a46b70ce55b0c3d9f47e5cff..28aa46dcbb9473c0fdd09fdb0b13adf043f7dd7b 100644
--- a/cube/cube-api/CMakeLists.txt
+++ b/cube/cube-api/CMakeLists.txt
@@ -25,9 +25,6 @@ execute_process(
 
 set(CMAKE_PREFIX_PATH ${OUTPUT_PATH})
 
-include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/include)
-include_directories(SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/../)
-
 include(FindThreads)
 include(FindProtobuf)
 protobuf_generate_cpp(PROTO_SRC PROTO_HEADER idl/cube.proto idl/control.proto)
@@ -91,12 +88,11 @@ if (NOT CRYPTO_LIB)
     message(FATAL_ERROR "Fail to find crypto")
 endif()
 
-add_executable(cube_cli src/cube_cli.cpp src/cube_api.cpp src/meta.cpp
+add_executable(cube-cli src/cube_cli.cpp src/cube_api.cpp src/meta.cpp
     ${PROTO_SRC} ${PROTO_HEADER})
 
-add_library(cube_api STATIC src/cube_api.cpp src/meta.cpp
+add_library(cube-api STATIC src/cube_api.cpp src/meta.cpp
     ${PROTO_SRC} ${PROTO_HEADER})
-install(TARGETS cube_api ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib/)
 
 set(DYNAMIC_LIB
     ${CMAKE_THREAD_LIBS_INIT}
@@ -122,10 +118,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         "-Wl,-U,_ProfilerStop")
 endif()
 
-target_link_libraries(cube_cli ${DYNAMIC_LIB} brpc -lpthread -ldl -lz)
-target_link_libraries(cube_api ${DYNAMIC_LIB} brpc -lpthread -ldl -lz)
+target_link_libraries(cube-cli ${DYNAMIC_LIB} brpc -lpthread -ldl -lz)
+target_link_libraries(cube-api ${DYNAMIC_LIB} brpc -lpthread -ldl -lz)
+
+# install
+install(TARGETS cube-api
+        ARCHIVE DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/lib
+        )
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/)
 
-file(GLOB cube_api_headers "${CMAKE_CURRENT_LIST_DIR}/src/*.h")
-install(FILES ${cube_api_headers} DESTINATION
-      ${PADDLE_SERVING_INSTALL_DIR}/include/cube_api/)
-message(STATUS "CUBE_API_INSTALL_DIR: ${PADDLE_SERVING_INSTALL_DIR}/include/cube_api/")
+FILE(GLOB inc ${CMAKE_CURRENT_BINARY_DIR}/*.pb.h)
+install(FILES ${inc}
+        DESTINATION ${PADDLE_SERVING_INSTALL_DIR}/include/cube-api)
diff --git a/cube/cube-api/include/cube/cube_api.h b/cube/cube-api/include/cube_api.h
similarity index 97%
rename from cube/cube-api/include/cube/cube_api.h
rename to cube/cube-api/include/cube_api.h
index 55838e0b1d18b8ab887091fe72c4090c5c11ad34..aee82f6dd1d009d5b5b53b3f6fe8de0d591e5d51 100644
--- a/cube/cube-api/include/cube/cube_api.h
+++ b/cube/cube-api/include/cube_api.h
@@ -19,8 +19,8 @@
 #include <vector>
 
 #include "brpc/server.h"
-#include "cube-api/cube.pb.h"
-#include "cube/meta.h"
+#include "cube/cube-api/cube.pb.h"
+#include "cube/cube-api/include/meta.h"
 
 namespace rec {
 namespace mcube {
diff --git a/cube/cube-api/include/cube/cube_api_bvar.h b/cube/cube-api/include/cube_api_bvar.h
similarity index 100%
rename from cube/cube-api/include/cube/cube_api_bvar.h
rename to cube/cube-api/include/cube_api_bvar.h
diff --git a/cube/cube-api/include/cube/error.h b/cube/cube-api/include/error.h
similarity index 100%
rename from cube/cube-api/include/cube/error.h
rename to cube/cube-api/include/error.h
diff --git a/cube/cube-api/include/cube/meta.h b/cube/cube-api/include/meta.h
similarity index 100%
rename from cube/cube-api/include/cube/meta.h
rename to cube/cube-api/include/meta.h
diff --git a/cube/cube-api/src/cube_api.cpp b/cube/cube-api/src/cube_api.cpp
index b5d094728d5dd6d44ea7e518f2a5c528d0f1ba38..8a9cebb9aa92f1bdb13c47cb7c065eaf2738c73f 100644
--- a/cube/cube-api/src/cube_api.cpp
+++ b/cube/cube-api/src/cube_api.cpp
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cube/cube_api.h"
+#include "cube/cube-api/include/cube_api.h"
 #include <brpc/channel.h>
 #include <brpc/parallel_channel.h>
 #include <google/protobuf/descriptor.h>
-#include "cube/cube_api_bvar.h"
+#include "cube/cube-api/include/cube_api_bvar.h"
 
-#include "cube/error.h"
-#include "cube/meta.h"
+#include "cube/cube-api/include/error.h"
+#include "cube/cube-api/include/meta.h"
 
 namespace {
 static ::rec::mcube::CubeAPI* g_ins = NULL;
diff --git a/cube/cube-api/src/cube_cli.cpp b/cube/cube-api/src/cube_cli.cpp
index c82b9863b65840afbad750323a94e008e631fee3..6df52710782e9a9e6ff1db9985a031669869080d 100644
--- a/cube/cube-api/src/cube_cli.cpp
+++ b/cube/cube-api/src/cube_cli.cpp
@@ -15,7 +15,7 @@
 #include <gflags/gflags.h>
 #include <atomic>
 
-#include "cube/cube_api.h"
+#include "cube/cube-api/include/cube_api.h"
 
 #define TIME_FLAG(flag) \
   struct timeval flag;  \
diff --git a/cube/cube-api/src/meta.cpp b/cube/cube-api/src/meta.cpp
index 75ed5a3de6d2f83452bb95c5afa34c7795cac82a..69ce43a08e0f5460dfa4e440958ff247458f6140 100644
--- a/cube/cube-api/src/meta.cpp
+++ b/cube/cube-api/src/meta.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "cube/meta.h"
+#include "cube/cube-api/include/meta.h"
 
 #include <google/protobuf/descriptor.h>
 #include <string.h>
@@ -20,7 +20,7 @@
 #include <new>
 #include <sstream>
 
-#include "cube-api/cube.pb.h"
+#include "cube/cube-api/cube.pb.h"
 
 namespace {
 static ::rec::mcube::Meta* g_ins = NULL;