diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 47b57f587234a0f263484fa7379b1a9ce5f8a899..d24b23f9ba19d2ce2921070682f3fa224bad35cf 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -10,6 +10,7 @@ add_subdirectory(spec)
 add_subdirectory(container)
 add_subdirectory(connect)
 add_subdirectory(log)
+add_subdirectory(events)
 
 set(local_daemon_srcs
     ${daemon_top_srcs}
@@ -22,6 +23,7 @@ set(local_daemon_srcs
     ${MANAGER_SRCS}
     ${SERVER_CONNECT_SRCS}
     ${LOG_GATHER_SRCS}
+    ${EVENTS_SRCS}
     )
 
 set(local_daemon_incs
@@ -35,6 +37,7 @@ set(local_daemon_incs
     ${MANAGER_INCS}
     ${SERVER_CONNECT_INCS}
     ${LOG_GATHER_INCS}
+    ${EVENTS_INCS}
     )
 
 if (GRPC_CONNECTOR)
diff --git a/src/daemon/callback/container_cb/CMakeLists.txt b/src/daemon/callback/container_cb/CMakeLists.txt
index 9cc4093ec5e80b82ffb766a5688b133e1983b3be..bc306175724bc1c5111b8673ea55f6b9c1451a4b 100644
--- a/src/daemon/callback/container_cb/CMakeLists.txt
+++ b/src/daemon/callback/container_cb/CMakeLists.txt
@@ -1,17 +1,11 @@
 # get current directory sources files
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_container_cb_srcs)
-add_subdirectory(events)
-add_subdirectory(execute)
 
 set(CONTAINER_CB_SRCS
     ${local_container_cb_srcs}
-    ${EVENTS_SRCS}
-    ${EXECUTE_SRCS}
     PARENT_SCOPE
     )
 set(CONTAINER_CB_INCS
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/events
-    ${CMAKE_CURRENT_SOURCE_DIR}/execute
     PARENT_SCOPE
     )
diff --git a/src/daemon/callback/container_cb/execute/CMakeLists.txt b/src/daemon/callback/container_cb/execute/CMakeLists.txt
deleted file mode 100644
index 0b22b88e44849677ca97db1e8a19c9cebc8ac8d6..0000000000000000000000000000000000000000
--- a/src/daemon/callback/container_cb/execute/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# get current directory sources files
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_execute_srcs)
-
-set(EXECUTE_SRCS
-    ${local_execute_srcs}
-    PARENT_SCOPE
-    )
diff --git a/src/daemon/callback/container_cb/execute/execution.c b/src/daemon/callback/container_cb/execution.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution.c
rename to src/daemon/callback/container_cb/execution.c
diff --git a/src/daemon/callback/container_cb/execute/execution.h b/src/daemon/callback/container_cb/execution.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution.h
rename to src/daemon/callback/container_cb/execution.h
diff --git a/src/daemon/callback/container_cb/execute/execution_create.c b/src/daemon/callback/container_cb/execution_create.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_create.c
rename to src/daemon/callback/container_cb/execution_create.c
diff --git a/src/daemon/callback/container_cb/execute/execution_create.h b/src/daemon/callback/container_cb/execution_create.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_create.h
rename to src/daemon/callback/container_cb/execution_create.h
diff --git a/src/daemon/callback/container_cb/execute/execution_extend.c b/src/daemon/callback/container_cb/execution_extend.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_extend.c
rename to src/daemon/callback/container_cb/execution_extend.c
diff --git a/src/daemon/callback/container_cb/execute/execution_extend.h b/src/daemon/callback/container_cb/execution_extend.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_extend.h
rename to src/daemon/callback/container_cb/execution_extend.h
diff --git a/src/daemon/callback/container_cb/execute/execution_information.c b/src/daemon/callback/container_cb/execution_information.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_information.c
rename to src/daemon/callback/container_cb/execution_information.c
diff --git a/src/daemon/callback/container_cb/execute/execution_information.h b/src/daemon/callback/container_cb/execution_information.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_information.h
rename to src/daemon/callback/container_cb/execution_information.h
diff --git a/src/daemon/callback/container_cb/execute/execution_network.c b/src/daemon/callback/container_cb/execution_network.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_network.c
rename to src/daemon/callback/container_cb/execution_network.c
diff --git a/src/daemon/callback/container_cb/execute/execution_network.h b/src/daemon/callback/container_cb/execution_network.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_network.h
rename to src/daemon/callback/container_cb/execution_network.h
diff --git a/src/daemon/callback/container_cb/execute/execution_stream.c b/src/daemon/callback/container_cb/execution_stream.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_stream.c
rename to src/daemon/callback/container_cb/execution_stream.c
diff --git a/src/daemon/callback/container_cb/execute/execution_stream.h b/src/daemon/callback/container_cb/execution_stream.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/execution_stream.h
rename to src/daemon/callback/container_cb/execution_stream.h
diff --git a/src/daemon/callback/container_cb/execute/list.c b/src/daemon/callback/container_cb/list.c
similarity index 100%
rename from src/daemon/callback/container_cb/execute/list.c
rename to src/daemon/callback/container_cb/list.c
diff --git a/src/daemon/callback/container_cb/execute/list.h b/src/daemon/callback/container_cb/list.h
similarity index 100%
rename from src/daemon/callback/container_cb/execute/list.h
rename to src/daemon/callback/container_cb/list.h
diff --git a/src/daemon/callback/container_cb/events/CMakeLists.txt b/src/daemon/events/CMakeLists.txt
similarity index 54%
rename from src/daemon/callback/container_cb/events/CMakeLists.txt
rename to src/daemon/events/CMakeLists.txt
index 6655e0ff56a871013fd6e3ce5c1ca5b6259c500e..f6413d69af54a32571aa24bc0cc25563f5d01d8c 100644
--- a/src/daemon/callback/container_cb/events/CMakeLists.txt
+++ b/src/daemon/events/CMakeLists.txt
@@ -2,6 +2,11 @@
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_events_srcs)
 
 set(EVENTS_SRCS
-    ${local_events_srcs}
-    PARENT_SCOPE
-    )
+	${local_events_srcs}
+	PARENT_SCOPE
+	)
+
+set(EVENTS_INCS
+	${CMAKE_CURRENT_SOURCE_DIR}
+	PARENT_SCOPE
+	)
diff --git a/src/daemon/callback/container_cb/events/collector.c b/src/daemon/events/collector.c
similarity index 100%
rename from src/daemon/callback/container_cb/events/collector.c
rename to src/daemon/events/collector.c
diff --git a/src/daemon/callback/container_cb/events/collector.h b/src/daemon/events/collector.h
similarity index 100%
rename from src/daemon/callback/container_cb/events/collector.h
rename to src/daemon/events/collector.h
diff --git a/src/daemon/callback/container_cb/events/events_handler.c b/src/daemon/events/events_handler.c
similarity index 100%
rename from src/daemon/callback/container_cb/events/events_handler.c
rename to src/daemon/events/events_handler.c
diff --git a/src/daemon/callback/container_cb/events/events_handler.h b/src/daemon/events/events_handler.h
similarity index 100%
rename from src/daemon/callback/container_cb/events/events_handler.h
rename to src/daemon/events/events_handler.h