diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc1d01e637098974a7d956862d7660e654ab1190..99d984dcaaaca798b668ca0bbc758dfd62e74ff1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,9 @@ add_subdirectory(modules/dap-sdk/net/client)
add_subdirectory(modules/dap-sdk/net/server/enc)
add_subdirectory(modules/dap-sdk/net/server/http)
add_subdirectory(modules/dap-sdk/net/server/json_rpc)
+add_subdirectory(modules/dap-sdk/net/stream/stream)
add_subdirectory(modules/cellframe-sdk/common)
+add_subdirectory(modules/cellframe-sdk/mempool)
add_subdirectory(modules/cellframe-sdk/net)
add_subdirectory(modules/cellframe-sdk/net/srv)
add_subdirectory(modules/cellframe-sdk/gdb)
@@ -180,9 +182,11 @@ target_link_libraries(${PROJECT_NAME} cellframe-sdk dap_python_module
dap_server_core_python_module
dap_enc_server_python_module
dap_server_http_python_module
+ dap_stream_python_module
dap_chain_python_module
dap_chain_net_python_module
dap_chain_net_srv_python_module
+ dap_mempool_python_module
dap_chain_gdb_python_module
dap_app_cli_python_module
dap_chain_wallet_python_module
diff --git a/modules/cellframe-sdk/mempool/CMakeLists.txt b/modules/cellframe-sdk/mempool/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bb41c56bdc59802ab56db4644c30c139bc3a8005
--- /dev/null
+++ b/modules/cellframe-sdk/mempool/CMakeLists.txt
@@ -0,0 +1,218 @@
+project(dap_mempool_python_module C)
+cmake_minimum_required(VERSION 3.0)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_COLOR_MAKEFILE ON)
+set(CMAKE_C_STANDARD 11)
+add_definitions("-fpic")
+add_definitions("-DDAP_LOG_MT")
+
+if(UNIX)
+ add_definitions("-DDAP_OS_UNIX")
+endif()
+
+if (NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
+ set (SUBMODULES_NO_BUILD ON)
+ if (NOT (TARGET dap_core))
+ add_subdirectory(libdap)
+ target_compile_options(
+ dap_core PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_crypto))
+ add_subdirectory(libdap-crypto)
+ target_compile_options(
+ dap_crypto PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain))
+ add_subdirectory(libdap-chain)
+ target_compile_options(
+ dap_chain PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_crypto))
+ add_subdirectory(libdap-chain-crypto)
+ target_compile_options(
+ dap_chain_crypto PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_common))
+ add_subdirectory(libdap-chain-common)
+ target_compile_options(
+ dap_chain_common PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_mempool))
+ add_subdirectory(libdap-chain-mempool)
+ target_compile_options(
+ dap_chain_mempool PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_net))
+ add_subdirectory(libdap-chain-net)
+ target_compile_options(
+ dap_chain_net PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_server_core))
+ add_subdirectory(libdap-server-core)
+ target_compile_options(
+ dap_server_core PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_global_db))
+ add_subdirectory(libdap-chain-global-db)
+ target_compile_options(
+ dap_chain_global_db PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_client))
+ add_subdirectory(libdap-client)
+ target_compile_options(
+ dap_client PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET libdap-server))
+ add_subdirectory(libdap-server)
+# target_compile_options(
+# libdap-server PRIVATE
+# "-fpic"
+# )
+ endif()
+ if (NOT (TARGET dap_stream))
+ add_subdirectory(libdap-stream)
+ target_compile_options(
+ dap_stream PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_stream_ch))
+ add_subdirectory(libdap-stream-ch)
+ target_compile_options(
+ dap_stream_ch PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_stream_ch_chain))
+ add_subdirectory(libdap-stream-ch-chain)
+ target_compile_options(
+ dap_stream_ch_chain PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_stream_ch_chain_net))
+ add_subdirectory(libdap-stream-ch-chain-net)
+ target_compile_options(
+ dap_stream_ch_chain_net PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_udp_server))
+ add_subdirectory(libdap-server-udp)
+ target_compile_options(
+ dap_udp_server PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_wallet))
+ add_subdirectory(libdap-chain-wallet)
+ target_compile_options(
+ dap_chain_wallet PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_net_srv))
+ add_subdirectory(libdap-chain-net-srv)
+ target_compile_options(
+ dap_chain_net_srv PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_server_http_db_auth))
+ add_subdirectory(libdap-server-http-db-auth)
+ target_compile_options(
+ dap_server_http_db_auth PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_gdb))
+ add_subdirectory(libdap-chain-gdb)
+ target_compile_options(
+ dap_chain_gdb PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_python_module))
+ add_subdirectory(libdap-python)
+ target_compile_options(
+ dap_python_module PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_crypto_python_module))
+ add_subdirectory(libdap-crypto-python)
+ target_compile_options(
+ dap_crypto_python_module PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_net_srv_vpn))
+ add_subdirectory(libdap-chain-net-srv-vpn)
+ target_compile_options(
+ dap_chain_net_srv_vpn PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_server_http_db))
+ add_subdirectory(libdap-server-http-db)
+ target_compile_options(
+ dap_server_http_db PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_chain_common_python_module))
+ add_subdirectory(libdap-chain-common-python)
+ target_compile_options(
+ dap_chain_common_python_module PRIVATE
+ "-fpic"
+ )
+ endif()
+endif()
+#add_definitions("-DDAP_APP_NAME=\"TestPRJ\" -DSYSTEM_CONFIGS_DIR=\"${CMAKE_CURRENT_BINARY_DIR}\"")
+
+file(GLOB CHAIN_PYTHON_SRCS src/*.c)
+file(GLOB CHAIN_PYTHON_HEADERS include/*.h)
+
+set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+find_package (PythonLibs REQUIRED)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
+
+add_library(${PROJECT_NAME} STATIC ${CHAIN_PYTHON_SRCS} ${CHAIN_PYTHON_HEADERS})
+
+target_link_libraries(${PROJECT_NAME})
+
+target_link_libraries(${PROJECT_NAME} dap_core
+ dap_crypto
+ dap_chain
+ dap_server_core
+ dap_server_core_python_module
+ dap_chain_net_python_module
+ dap_chain_net
+ dap_crypto_python_module
+ dap_python_module
+ dap_chain_common_python_module
+ dap_chain_cs_dag_python_module)
+
+target_include_directories(${PROJECT_NAME} PUBLIC include/ )
+
diff --git a/include/wrapping_dap_mempool.h b/modules/cellframe-sdk/mempool/include/wrapping_dap_mempool.h
similarity index 100%
rename from include/wrapping_dap_mempool.h
rename to modules/cellframe-sdk/mempool/include/wrapping_dap_mempool.h
diff --git a/CellFrame/wrapping_dap_mempool.c b/modules/cellframe-sdk/mempool/src/wrapping_dap_mempool.c
similarity index 100%
rename from CellFrame/wrapping_dap_mempool.c
rename to modules/cellframe-sdk/mempool/src/wrapping_dap_mempool.c
diff --git a/modules/dap-sdk/net/server/http/CMakeLists.txt b/modules/dap-sdk/net/server/http/CMakeLists.txt
index c21ebd42d0feaa6b7aaf35a7b0b57864ce7ff244..023921e047a63768bceb488f02255528dc70beff 100644
--- a/modules/dap-sdk/net/server/http/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/http/CMakeLists.txt
@@ -32,7 +32,12 @@ target_compile_options(
"-fpic"
)
-target_link_libraries(${PROJECT_NAME} dap_core dap_http_server dap_server_core_python_module ${PYTHON_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}
+ dap_core
+ dap_http_server
+ dap_server_core_python_module
+ dap_enc_server_python_module
+ ${PYTHON_LIBRARIES})
target_include_directories(${PROJECT_NAME} PUBLIC include/ )
diff --git a/include/wrapping_dap_http_folder.h b/modules/dap-sdk/net/server/http/include/wrapping_dap_http_folder.h
similarity index 100%
rename from include/wrapping_dap_http_folder.h
rename to modules/dap-sdk/net/server/http/include/wrapping_dap_http_folder.h
diff --git a/CellFrame/wrapping_dap_http_folder.c b/modules/dap-sdk/net/server/http/src/wrapping_dap_http_folder.c
similarity index 100%
rename from CellFrame/wrapping_dap_http_folder.c
rename to modules/dap-sdk/net/server/http/src/wrapping_dap_http_folder.c
diff --git a/modules/dap-sdk/net/stream/stream/CMakeLists.txt b/modules/dap-sdk/net/stream/stream/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..66451745e5cb00f73fcfc5f5c3884e84c47372e4
--- /dev/null
+++ b/modules/dap-sdk/net/stream/stream/CMakeLists.txt
@@ -0,0 +1,50 @@
+project(dap_stream_python_module C)
+cmake_minimum_required(VERSION 3.0)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_COLOR_MAKEFILE ON)
+set(CMAKE_C_STANDARD 11)
+add_definitions("-fpic")
+
+if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
+ if (NOT (TARGET dap_core))
+ add_subdirectory(libdap)
+ target_compile_options(
+ dap_core PRIVATE
+ "-fpic"
+ )
+ endif()
+endif()
+
+file(GLOB SERVER_HTTP_SIMPLE_SRCS src/*.c)
+file(GLOB SERVER_HTTP_SIMPLE_HEADERS include/*.h)
+
+set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
+find_package (PythonLibs REQUIRED)
+include_directories(${PYTHON_INCLUDE_DIR} include/ )
+
+add_library(${PROJECT_NAME} STATIC ${SERVER_HTTP_SIMPLE_SRCS} ${SERVER_HTTP_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
+
+target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES})
+
+target_compile_options(
+ dap_core PRIVATE
+ "-fpic"
+)
+
+target_link_libraries(${PROJECT_NAME}
+ dap_core
+ dap_http_server
+ dap_stream
+ dap_server_core_python_module
+ dap_enc_server_python_module
+ ${PYTHON_LIBRARIES})
+
+target_include_directories(${PROJECT_NAME} PUBLIC include/ )
+
+#if(BUILD_DAP_PYTHON_TESTS)
+# add_subdirectory(test)
+# file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/main_test.py
+# DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test/)
+#endif()
+
diff --git a/include/wrapping_dap_stream.h b/modules/dap-sdk/net/stream/stream/include/wrapping_dap_stream.h
similarity index 100%
rename from include/wrapping_dap_stream.h
rename to modules/dap-sdk/net/stream/stream/include/wrapping_dap_stream.h
diff --git a/include/wrapping_dap_stream_ctl.h b/modules/dap-sdk/net/stream/stream/include/wrapping_dap_stream_ctl.h
similarity index 100%
rename from include/wrapping_dap_stream_ctl.h
rename to modules/dap-sdk/net/stream/stream/include/wrapping_dap_stream_ctl.h
diff --git a/CellFrame/wrapping_dap_stream.c b/modules/dap-sdk/net/stream/stream/src/wrapping_dap_stream.c
similarity index 100%
rename from CellFrame/wrapping_dap_stream.c
rename to modules/dap-sdk/net/stream/stream/src/wrapping_dap_stream.c
diff --git a/CellFrame/wrapping_dap_stream_ctl.c b/modules/dap-sdk/net/stream/stream/src/wrapping_dap_stream_ctl.c
similarity index 100%
rename from CellFrame/wrapping_dap_stream_ctl.c
rename to modules/dap-sdk/net/stream/stream/src/wrapping_dap_stream_ctl.c