diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cdc2322b079634d4584e2b764d23cc023db3b99e
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,6 @@
+project(libdap-stream C)
+cmake_minimum_required(VERSION 2.8)
+
+add_subdirectory(session)
+add_subdirectory(stream)
+
diff --git a/session/CMakeLists.txt b/session/CMakeLists.txt
index 6e15be24ab1b79d14230cc813b10d12fe4a6dde7..33770765853a5bbec65235420336ab0eaf2981f7 100644
--- a/session/CMakeLists.txt
+++ b/session/CMakeLists.txt
@@ -1,19 +1,23 @@
 cmake_minimum_required(VERSION 2.8)
-project (dapsession)
+project (dap_session)
   
 set(SESSION_SRCS stream_session.c)
-include_directories("${INCLUDE_DIRECTORIES} ${dapcore_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapcrypt_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapauth_INCLUDE_DIRS}")
-#include_directories("${INCLUDE_DIRECTORIES} ${dapstream_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapsession_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${daphttp_INCLUDE_DIRS}")
-add_definitions ("${dapcore_DEFINITIONS}")
-add_definitions ("${dapcrypt_DEFINITIONS}")
-add_definitions ("${dapauth_DEFINITIONS}")
-add_definitions ("${daphttp_DEFINITIONS}")
-#add_definitions ("${dapstream_DEFINITIONS}")
-add_definitions ("${dapsession_DEFINITIONS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_crypto_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_client_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_auth_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_db_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_core_server_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_http_server_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_http_INCLUDE_DIRS}")
+add_definitions ("${dap_core_DEFINITIONS}")
+add_definitions ("${dap_core_server_DEFINITIONS}")
+add_definitions ("${dap_crypto_DEFINITIONS}")
+add_definitions ("${dap_client_DEFINITIONS}")
+add_definitions ("${dap_db_DEFINITIONS}")
+add_definitions ("${dap_auth_DEFINITIONS}")
+add_definitions ("${dap_http_DEFINITIONS}")
+add_definitions ("${dap_http_server_DEFINITIONS}")
 add_library(${PROJECT_NAME} STATIC ${SESSION_SRCS})
 
 
diff --git a/stream/CMakeLists.txt b/stream/CMakeLists.txt
index c29a4b5a5d623055ed4e99b078a7a72a38ec312f..3e8300264671e8d04f1922151ddcdf2b713ef47e 100644
--- a/stream/CMakeLists.txt
+++ b/stream/CMakeLists.txt
@@ -1,24 +1,28 @@
 cmake_minimum_required(VERSION 2.8)
-project (dapstream)
+project (dap_stream)
   
 set(STREAM_SRCS stream.c  stream_ch.c  stream_ch_pkt.c	stream_ch_proc.c  stream_ctl.c	stream_pkt.c )
 
-include_directories("${INCLUDE_DIRECTORIES} ${dapcore_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapcrypt_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapauth_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapsession_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapdb_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${daphttp_INCLUDE_DIRS}")
-include_directories("${INCLUDE_DIRECTORIES} ${dapdb_http_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_core_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_core_server_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_crypto_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_client_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_auth_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_session_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_db_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_http_INCLUDE_DIRS}")
+include_directories("${INCLUDE_DIRECTORIES} ${dap_http_server_INCLUDE_DIRS}")
 include_directories("${INCLUDE_DIRECTORIES} ${MONGO_INCLUDE_DIRS}")
 
-add_definitions ("${dapcore_DEFINITIONS}")
-add_definitions ("${dapcrypt_DEFINITIONS}")
-add_definitions ("${dapauth_DEFINITIONS}")
-add_definitions ("${dapdb_DEFINITIONS}")
-add_definitions ("${dapdb_http_DEFINITIONS}")
-add_definitions ("${daphttp_DEFINITIONS}")
-add_definitions ("${dapsession_DEFINITIONS}")
+add_definitions ("${dap_core_DEFINITIONS}")
+add_definitions ("${dap_core_server_DEFINITIONS}")
+add_definitions ("${dap_crypto_DEFINITIONS}")
+add_definitions ("${dap_client_DEFINITIONS}")
+add_definitions ("${dap_auth_DEFINITIONS}")
+add_definitions ("${dap_db_DEFINITIONS}")
+add_definitions ("${dap_http_server_DEFINITIONS}")
+add_definitions ("${dap_http_DEFINITIONS}")
+add_definitions ("${dap_session_DEFINITIONS}")
 
 add_library(${PROJECT_NAME} STATIC ${STREAM_SRCS})
 set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
diff --git a/stream/stream_ch.c b/stream/stream_ch.c
index a2da40a50b48cca254b39f2bb92fbdff6d0027b1..b1ce6fd096713ba930d594bf0553cae29a6f0171 100644
--- a/stream/stream_ch.c
+++ b/stream/stream_ch.c
@@ -64,7 +64,7 @@ stream_ch_t* stream_ch_new(struct stream* stream,uint8_t id)
 {
     stream_ch_proc_t * proc=stream_ch_proc_find(id);
     if(proc){
-        stream_ch_t * ret= CALLOC(stream_ch_t);
+        stream_ch_t * ret= DAP_NEW_Z(stream_ch_t);
         ret->stream=stream;
         ret->proc=proc;
         ret->ready_to_read=true;