diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index e8f09c6d51..11193d7185 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -2,5 +2,5 @@ add_subdirectory(os)
 add_subdirectory(util)
 add_subdirectory(common)
 add_subdirectory(libs)
-# add_subdirectory(client)
-# add_subdirectory(server)
\ No newline at end of file
+add_subdirectory(client)
+add_subdirectory(server)
\ No newline at end of file
diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt
index bb3b1bf78c..26623d3cdc 100644
--- a/source/client/CMakeLists.txt
+++ b/source/client/CMakeLists.txt
@@ -1,2 +1,7 @@
 aux_source_directory(src CLIENT_SRC)
-add_library(taos ${CLIENT_SRC})
\ No newline at end of file
+add_library(taos ${CLIENT_SRC})
+target_include_directories(
+    taos
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/client"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
\ No newline at end of file
diff --git a/source/client/src/client.c b/source/client/src/client.c
new file mode 100644
index 0000000000..6dea4a4e57
--- /dev/null
+++ b/source/client/src/client.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
\ No newline at end of file
diff --git a/source/server/CMakeLists.txt b/source/server/CMakeLists.txt
index 9830f1093a..c29b1ba0fc 100644
--- a/source/server/CMakeLists.txt
+++ b/source/server/CMakeLists.txt
@@ -6,5 +6,5 @@ aux_source_directory(src TAOSD_SRC)
 add_executable(taosd ${TAOSD_SRC})
 target_link_libraries(
     taosd
-    private os
+    PUBLIC os
 )
\ No newline at end of file
diff --git a/source/server/mnode/src/mnode.c b/source/server/mnode/src/mnode.c
new file mode 100644
index 0000000000..6dea4a4e57
--- /dev/null
+++ b/source/server/mnode/src/mnode.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
\ No newline at end of file
diff --git a/source/server/qnode/src/qnode.c b/source/server/qnode/src/qnode.c
new file mode 100644
index 0000000000..6dea4a4e57
--- /dev/null
+++ b/source/server/qnode/src/qnode.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
\ No newline at end of file
diff --git a/source/server/vnode/src/vnode.c b/source/server/vnode/src/vnode.c
new file mode 100644
index 0000000000..6dea4a4e57
--- /dev/null
+++ b/source/server/vnode/src/vnode.c
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
\ No newline at end of file