🦄 refactor(directory structure): restructure and rename src to infra

131 files changed, 31 insertions, 27 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 841c9e6..611e0f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ enable_testing()
 add_subdirectory(conf)
 add_subdirectory(vendor)
 add_subdirectory(deps)
-add_subdirectory(src)
+add_subdirectory(infra)
 add_subdirectory(decoders)
 add_subdirectory(scripts)
 add_subdirectory(include)
diff --git a/include/stellar/stellar.h b/include/stellar/stellar.h
index efd542f..ee4c1b4 100644
--- a/include/stellar/stellar.h
+++ b/include/stellar/stellar.h
@@ -64,6 +64,8 @@ void stellar_run(struct stellar *st);
 void stellar_free(struct stellar *st);
 void stellar_loopbreak(struct stellar *st);
 
+void stellar_reload_log_level(struct stellar *st);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/infra/CMakeLists.txt b/infra/CMakeLists.txt
new file mode 100644
index 0000000..20dfe14
--- /dev/null
+++ b/infra/CMakeLists.txt
@@ -0,0 +1,18 @@
+add_subdirectory(log)
+add_subdirectory(tuple)
+add_subdirectory(packet_parser)
+add_subdirectory(packet_io)
+add_subdirectory(snowflake)
+add_subdirectory(ip_reassembly)
+add_subdirectory(tcp_reassembly)
+add_subdirectory(session_manager)
+add_subdirectory(plugin_manager)
+add_subdirectory(core)
+
+add_executable(stellar main.cpp)
+target_link_libraries(stellar PRIVATE -Wl,--whole-archive core ${LIBRARY} ${PLUGIN} -Wl,--no-whole-archive)
+target_link_libraries(stellar PRIVATE "-rdynamic")
+set_target_properties(stellar PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/core/version.map")
+
+install(TARGETS stellar RUNTIME DESTINATION bin COMPONENT PROGRAM)
+install(TARGETS stellar_devel LIBRARY DESTINATION lib COMPONENT LIBRARIES)
\ No newline at end of file
diff --git a/src/core/CMakeLists.txt b/infra/core/CMakeLists.txt
index 92c7b18..33c9f9d 100644
--- a/src/core/CMakeLists.txt
+++ b/infra/core/CMakeLists.txt
@@ -5,17 +5,9 @@ set(PLUGIN http glimpse_detector)
 
 add_library(core STATIC ${SOURCE})
 target_link_libraries(core PUBLIC ${LIBRARY})
-target_include_directories(core PUBLIC ${CMAKE_SOURCE_DIR}/src/utils)
 
 add_library(stellar_devel SHARED ${SOURCE})
 set_target_properties(stellar_devel PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/version.map")
 target_link_libraries(stellar_devel PRIVATE -Wl,--whole-archive ${LIBRARY} -Wl,--no-whole-archive)
 target_include_directories(stellar_devel PUBLIC ${CMAKE_SOURCE_DIR}/src/utils)
 
-add_executable(stellar main.cpp)
-target_link_libraries(stellar PRIVATE -Wl,--whole-archive core ${LIBRARY} ${PLUGIN} -Wl,--no-whole-archive)
-target_link_libraries(stellar PRIVATE "-rdynamic")
-set_target_properties(stellar PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/version.map")
-
-install(TARGETS stellar RUNTIME DESTINATION bin COMPONENT PROGRAM)
-install(TARGETS stellar_devel LIBRARY DESTINATION lib COMPONENT LIBRARIES)
\ No newline at end of file
diff --git a/src/core/stellar_config.cpp b/infra/core/stellar_config.cpp
index da0c2d5..da0c2d5 100644
--- a/src/core/stellar_config.cpp
+++ b/infra/core/stellar_config.cpp
diff --git a/src/core/stellar_config.h b/infra/core/stellar_config.h
index 8086331..8086331 100644
--- a/src/core/stellar_config.h
+++ b/infra/core/stellar_config.h
diff --git a/src/core/stellar_core.cpp b/infra/core/stellar_core.cpp
index bf4f2f6..bf4f2f6 100644
--- a/src/core/stellar_core.cpp
+++ b/infra/core/stellar_core.cpp
diff --git a/src/core/stellar_core.h b/infra/core/stellar_core.h
index d4bee86..1c92167 100644
--- a/src/core/stellar_core.h
+++ b/infra/core/stellar_core.h
@@ -13,7 +13,7 @@ struct plugin_manager_schema *stellar_get_plugin_manager(const struct stellar *s
 // TODO fix plugin manager, delete this function
 void stellar_set_plugin_manger(struct stellar *st, struct plugin_manager_schema *plug_mgr);
 
-void stellar_reload_log_level(struct stellar *st);
+
 
 #ifdef __cplusplus
 }
diff --git a/src/core/stellar_stat.cpp b/infra/core/stellar_stat.cpp
index 6171ecb..6171ecb 100644
--- a/src/core/stellar_stat.cpp
+++ b/infra/core/stellar_stat.cpp
diff --git a/src/core/stellar_stat.h b/infra/core/stellar_stat.h
index fbef78d..fbef78d 100644
--- a/src/core/stellar_stat.h
+++ b/infra/core/stellar_stat.h
diff --git a/src/utils/utils.h b/infra/core/utils.h
index 38514ca..38514ca 100644
--- a/src/utils/utils.h
+++ b/infra/core/utils.h
diff --git a/src/core/version.map b/infra/core/version.map
index 1b30a76..1b30a76 100644
--- a/src/core/version.map
+++ b/infra/core/version.map
diff --git a/src/ip_reassembly/CMakeLists.txt b/infra/ip_reassembly/CMakeLists.txt
index 8a38cde..8a38cde 100644
--- a/src/ip_reassembly/CMakeLists.txt
+++ b/infra/ip_reassembly/CMakeLists.txt
diff --git a/src/ip_reassembly/ip_reassembly.cpp b/infra/ip_reassembly/ip_reassembly.cpp
index c6eb492..c6eb492 100644
--- a/src/ip_reassembly/ip_reassembly.cpp
+++ b/infra/ip_reassembly/ip_reassembly.cpp
diff --git a/src/ip_reassembly/ip_reassembly.h b/infra/ip_reassembly/ip_reassembly.h
index 456e09b..456e09b 100644
--- a/src/ip_reassembly/ip_reassembly.h
+++ b/infra/ip_reassembly/ip_reassembly.h
diff --git a/src/ip_reassembly/test/CMakeLists.txt b/infra/ip_reassembly/test/CMakeLists.txt
index ae81edf..ae81edf 100644
--- a/src/ip_reassembly/test/CMakeLists.txt
+++ b/infra/ip_reassembly/test/CMakeLists.txt
diff --git a/src/ip_reassembly/test/gtest_ip_reassembly.cpp b/infra/ip_reassembly/test/gtest_ip_reassembly.cpp
index 18e4c87..18e4c87 100644
--- a/src/ip_reassembly/test/gtest_ip_reassembly.cpp
+++ b/infra/ip_reassembly/test/gtest_ip_reassembly.cpp
diff --git a/src/ip_reassembly/test/gtest_ipv4_reassembly.cpp b/infra/ip_reassembly/test/gtest_ipv4_reassembly.cpp
index 5d96336..5d96336 100644
--- a/src/ip_reassembly/test/gtest_ipv4_reassembly.cpp
+++ b/infra/ip_reassembly/test/gtest_ipv4_reassembly.cpp
diff --git a/src/ip_reassembly/test/gtest_ipv6_reassembly.cpp b/infra/ip_reassembly/test/gtest_ipv6_reassembly.cpp
index f7eae08..f7eae08 100644
--- a/src/ip_reassembly/test/gtest_ipv6_reassembly.cpp
+++ b/infra/ip_reassembly/test/gtest_ipv6_reassembly.cpp
diff --git a/src/ip_reassembly/test/gtest_utils.h b/infra/ip_reassembly/test/gtest_utils.h
index ede80af..ede80af 100644
--- a/src/ip_reassembly/test/gtest_utils.h
+++ b/infra/ip_reassembly/test/gtest_utils.h
diff --git a/src/log/CMakeLists.txt b/infra/log/CMakeLists.txt
index 0cdd154..0cdd154 100644
--- a/src/log/CMakeLists.txt
+++ b/infra/log/CMakeLists.txt
diff --git a/src/log/log.cpp b/infra/log/log.cpp
index d627f35..d627f35 100644
--- a/src/log/log.cpp
+++ b/infra/log/log.cpp
diff --git a/src/log/log_private.h b/infra/log/log_private.h
index dd18040..dd18040 100644
--- a/src/log/log_private.h
+++ b/infra/log/log_private.h
diff --git a/src/log/test/CMakeLists.txt b/infra/log/test/CMakeLists.txt
index a041d81..a041d81 100644
--- a/src/log/test/CMakeLists.txt
+++ b/infra/log/test/CMakeLists.txt
diff --git a/src/log/test/conf/log_file.toml b/infra/log/test/conf/log_file.toml
index 43e3621..43e3621 100644
--- a/src/log/test/conf/log_file.toml
+++ b/infra/log/test/conf/log_file.toml
diff --git a/src/log/test/conf/log_stderr.toml b/infra/log/test/conf/log_stderr.toml
index a2febcc..a2febcc 100644
--- a/src/log/test/conf/log_stderr.toml
+++ b/infra/log/test/conf/log_stderr.toml
diff --git a/src/log/test/gtest_log.cpp b/infra/log/test/gtest_log.cpp
index 2183109..2183109 100644
--- a/src/log/test/gtest_log.cpp
+++ b/infra/log/test/gtest_log.cpp
diff --git a/src/core/main.cpp b/infra/main.cpp
index 84b9ec4..becc338 100644
--- a/src/core/main.cpp
+++ b/infra/main.cpp
@@ -5,7 +5,6 @@
 
 #include "stellar/log.h"
 #include "stellar/stellar.h"
-#include "stellar_core.h"
 
 struct stellar *st = NULL;
 static void signal_handler(int signo)
diff --git a/src/packet_io/CMakeLists.txt b/infra/packet_io/CMakeLists.txt
index 8f07fd7..8f07fd7 100644
--- a/src/packet_io/CMakeLists.txt
+++ b/infra/packet_io/CMakeLists.txt
diff --git a/src/packet_io/dumpfile_io.cpp b/infra/packet_io/dumpfile_io.cpp
index cc6faaf..cc6faaf 100644
--- a/src/packet_io/dumpfile_io.cpp
+++ b/infra/packet_io/dumpfile_io.cpp
diff --git a/src/packet_io/dumpfile_io.h b/infra/packet_io/dumpfile_io.h
index 4728608..4728608 100644
--- a/src/packet_io/dumpfile_io.h
+++ b/infra/packet_io/dumpfile_io.h
diff --git a/src/packet_io/marsio_io.cpp b/infra/packet_io/marsio_io.cpp
index be57462..be57462 100644
--- a/src/packet_io/marsio_io.cpp
+++ b/infra/packet_io/marsio_io.cpp
diff --git a/src/packet_io/marsio_io.h b/infra/packet_io/marsio_io.h
index c18976c..c18976c 100644
--- a/src/packet_io/marsio_io.h
+++ b/infra/packet_io/marsio_io.h
diff --git a/src/packet_io/packet_io.cpp b/infra/packet_io/packet_io.cpp
index 1684adb..1684adb 100644
--- a/src/packet_io/packet_io.cpp
+++ b/infra/packet_io/packet_io.cpp
diff --git a/src/packet_io/packet_io.h b/infra/packet_io/packet_io.h
index 7decb74..7decb74 100644
--- a/src/packet_io/packet_io.h
+++ b/infra/packet_io/packet_io.h
diff --git a/src/packet/CMakeLists.txt b/infra/packet_parser/CMakeLists.txt
index 022c993..13e9547 100644
--- a/src/packet/CMakeLists.txt
+++ b/infra/packet_parser/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(packet
 target_include_directories(packet PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/deps/uthash)
 target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/src/utils)
+target_include_directories(packet PUBLIC ${CMAKE_SOURCE_DIR}/infra/core)
 target_link_libraries(packet tuple log dablooms)
 
 add_subdirectory(test)
\ No newline at end of file
diff --git a/src/packet/checksum.cpp b/infra/packet_parser/checksum.cpp
index a984598..a984598 100644
--- a/src/packet/checksum.cpp
+++ b/infra/packet_parser/checksum.cpp
diff --git a/src/packet/checksum.h b/infra/packet_parser/checksum.h
index 56c5b5e..56c5b5e 100644
--- a/src/packet/checksum.h
+++ b/infra/packet_parser/checksum.h
diff --git a/src/packet/packet_builder.cpp b/infra/packet_parser/packet_builder.cpp
index 64e77d8..64e77d8 100644
--- a/src/packet/packet_builder.cpp
+++ b/infra/packet_parser/packet_builder.cpp
diff --git a/src/packet/packet_dump.cpp b/infra/packet_parser/packet_dump.cpp
index 8f12d2d..8f12d2d 100644
--- a/src/packet/packet_dump.cpp
+++ b/infra/packet_parser/packet_dump.cpp
diff --git a/src/packet/packet_dump.h b/infra/packet_parser/packet_dump.h
index 689bfd5..689bfd5 100644
--- a/src/packet/packet_dump.h
+++ b/infra/packet_parser/packet_dump.h
diff --git a/src/packet/packet_filter.cpp b/infra/packet_parser/packet_filter.cpp
index 6167dbc..6167dbc 100644
--- a/src/packet/packet_filter.cpp
+++ b/infra/packet_parser/packet_filter.cpp
diff --git a/src/packet/packet_filter.h b/infra/packet_parser/packet_filter.h
index 8cf4428..8cf4428 100644
--- a/src/packet/packet_filter.h
+++ b/infra/packet_parser/packet_filter.h
diff --git a/src/packet/packet_helper.h b/infra/packet_parser/packet_helper.h
index f4beda2..f4beda2 100644
--- a/src/packet/packet_helper.h
+++ b/infra/packet_parser/packet_helper.h
diff --git a/src/packet/packet_parser.cpp b/infra/packet_parser/packet_parser.cpp
index f19c1f7..f19c1f7 100644
--- a/src/packet/packet_parser.cpp
+++ b/infra/packet_parser/packet_parser.cpp
diff --git a/src/packet/packet_parser.h b/infra/packet_parser/packet_parser.h
index d85ed1c..d85ed1c 100644
--- a/src/packet/packet_parser.h
+++ b/infra/packet_parser/packet_parser.h
diff --git a/src/packet/packet_private.h b/infra/packet_parser/packet_private.h
index ead56b3..ead56b3 100644
--- a/src/packet/packet_private.h
+++ b/infra/packet_parser/packet_private.h
diff --git a/src/packet/packet_utils.cpp b/infra/packet_parser/packet_utils.cpp
index 79485ec..79485ec 100644
--- a/src/packet/packet_utils.cpp
+++ b/infra/packet_parser/packet_utils.cpp
diff --git a/src/packet/test/CMakeLists.txt b/infra/packet_parser/test/CMakeLists.txt
index a5e3a2f..a5e3a2f 100644
--- a/src/packet/test/CMakeLists.txt
+++ b/infra/packet_parser/test/CMakeLists.txt
diff --git a/src/packet/test/gtest_eth_utils.cpp b/infra/packet_parser/test/gtest_eth_utils.cpp
index e00f032..e00f032 100644
--- a/src/packet/test/gtest_eth_utils.cpp
+++ b/infra/packet_parser/test/gtest_eth_utils.cpp
diff --git a/src/packet/test/gtest_gre0_utils.cpp b/infra/packet_parser/test/gtest_gre0_utils.cpp
index e195f42..e195f42 100644
--- a/src/packet/test/gtest_gre0_utils.cpp
+++ b/infra/packet_parser/test/gtest_gre0_utils.cpp
diff --git a/src/packet/test/gtest_gre1_utils.cpp b/infra/packet_parser/test/gtest_gre1_utils.cpp
index 92669f7..92669f7 100644
--- a/src/packet/test/gtest_gre1_utils.cpp
+++ b/infra/packet_parser/test/gtest_gre1_utils.cpp
diff --git a/src/packet/test/gtest_gtp1_utils.cpp b/infra/packet_parser/test/gtest_gtp1_utils.cpp
index 270d36a..270d36a 100644
--- a/src/packet/test/gtest_gtp1_utils.cpp
+++ b/infra/packet_parser/test/gtest_gtp1_utils.cpp
diff --git a/src/packet/test/gtest_gtp2_utils.cpp b/infra/packet_parser/test/gtest_gtp2_utils.cpp
index 584abf7..584abf7 100644
--- a/src/packet/test/gtest_gtp2_utils.cpp
+++ b/infra/packet_parser/test/gtest_gtp2_utils.cpp
diff --git a/src/packet/test/gtest_ip4_utils.cpp b/infra/packet_parser/test/gtest_ip4_utils.cpp
index f6e98a1..f6e98a1 100644
--- a/src/packet/test/gtest_ip4_utils.cpp
+++ b/infra/packet_parser/test/gtest_ip4_utils.cpp
diff --git a/src/packet/test/gtest_ip6_utils.cpp b/infra/packet_parser/test/gtest_ip6_utils.cpp
index 94a51f8..94a51f8 100644
--- a/src/packet/test/gtest_ip6_utils.cpp
+++ b/infra/packet_parser/test/gtest_ip6_utils.cpp
diff --git a/src/packet/test/gtest_l2tp_utils.cpp b/infra/packet_parser/test/gtest_l2tp_utils.cpp
index 3eb16bd..3eb16bd 100644
--- a/src/packet/test/gtest_l2tp_utils.cpp
+++ b/infra/packet_parser/test/gtest_l2tp_utils.cpp
diff --git a/src/packet/test/gtest_mpls_utils.cpp b/infra/packet_parser/test/gtest_mpls_utils.cpp
index 9d3f0d8..9d3f0d8 100644
--- a/src/packet/test/gtest_mpls_utils.cpp
+++ b/infra/packet_parser/test/gtest_mpls_utils.cpp
diff --git a/src/packet/test/gtest_packet_builder.cpp b/infra/packet_parser/test/gtest_packet_builder.cpp
index 0bbf2bb..0bbf2bb 100644
--- a/src/packet/test/gtest_packet_builder.cpp
+++ b/infra/packet_parser/test/gtest_packet_builder.cpp
diff --git a/src/packet/test/gtest_packet_filter.cpp b/infra/packet_parser/test/gtest_packet_filter.cpp
index 3263b90..3263b90 100644
--- a/src/packet/test/gtest_packet_filter.cpp
+++ b/infra/packet_parser/test/gtest_packet_filter.cpp
diff --git a/src/packet/test/gtest_packet_frag.cpp b/infra/packet_parser/test/gtest_packet_frag.cpp
index 222925b..222925b 100644
--- a/src/packet/test/gtest_packet_frag.cpp
+++ b/infra/packet_parser/test/gtest_packet_frag.cpp
diff --git a/src/packet/test/gtest_packet_ldbc.cpp b/infra/packet_parser/test/gtest_packet_ldbc.cpp
index e2dd430..e2dd430 100644
--- a/src/packet/test/gtest_packet_ldbc.cpp
+++ b/infra/packet_parser/test/gtest_packet_ldbc.cpp
diff --git a/src/packet/test/gtest_packet_parser.cpp b/infra/packet_parser/test/gtest_packet_parser.cpp
index 4fa3985..4fa3985 100644
--- a/src/packet/test/gtest_packet_parser.cpp
+++ b/infra/packet_parser/test/gtest_packet_parser.cpp
diff --git a/src/packet/test/gtest_tcp_utils.cpp b/infra/packet_parser/test/gtest_tcp_utils.cpp
index 47223e4..47223e4 100644
--- a/src/packet/test/gtest_tcp_utils.cpp
+++ b/infra/packet_parser/test/gtest_tcp_utils.cpp
diff --git a/src/packet/test/gtest_tunnel.cpp b/infra/packet_parser/test/gtest_tunnel.cpp
index 6d92cf0..6d92cf0 100644
--- a/src/packet/test/gtest_tunnel.cpp
+++ b/infra/packet_parser/test/gtest_tunnel.cpp
diff --git a/src/packet/test/gtest_udp_utils.cpp b/infra/packet_parser/test/gtest_udp_utils.cpp
index d8b2c9a..d8b2c9a 100644
--- a/src/packet/test/gtest_udp_utils.cpp
+++ b/infra/packet_parser/test/gtest_udp_utils.cpp
diff --git a/src/packet/test/gtest_vlan_utils.cpp b/infra/packet_parser/test/gtest_vlan_utils.cpp
index 0832ef1..0832ef1 100644
--- a/src/packet/test/gtest_vlan_utils.cpp
+++ b/infra/packet_parser/test/gtest_vlan_utils.cpp
diff --git a/src/packet/test/gtest_vxlan_utils.cpp b/infra/packet_parser/test/gtest_vxlan_utils.cpp
index 81a24fe..81a24fe 100644
--- a/src/packet/test/gtest_vxlan_utils.cpp
+++ b/infra/packet_parser/test/gtest_vxlan_utils.cpp
diff --git a/src/plugin/CMakeLists.txt b/infra/plugin_manager/CMakeLists.txt
index d72da69..c948fcd 100644
--- a/src/plugin/CMakeLists.txt
+++ b/infra/plugin_manager/CMakeLists.txt
@@ -1,7 +1,10 @@
 add_library(plugin_manager plugin_manager.cpp)
 target_include_directories(plugin_manager PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/include/)
-target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/src/)
+target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/core)
+target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/packet_parser)
+target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/session_manager)
+target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/infra/tuple)
 target_include_directories(plugin_manager PUBLIC ${CMAKE_SOURCE_DIR}/deps/)
 target_link_libraries(plugin_manager session_manager bitmap toml ${CMAKE_DL_LIBS})
 
diff --git a/src/plugin/plugin_manager.cpp b/infra/plugin_manager/plugin_manager.cpp
index d3527a7..0d297a4 100644
--- a/src/plugin/plugin_manager.cpp
+++ b/infra/plugin_manager/plugin_manager.cpp
@@ -4,10 +4,10 @@
 #include "toml/toml.h"
 #include "uthash/utlist.h"
 
-#include "core/stellar_core.h"
-#include "tuple/tuple.h"
-#include "packet/packet_private.h"
-#include "session/session_private.h"
+#include "stellar_core.h"
+#include "tuple.h"
+#include "packet_private.h"
+#include "session_private.h"
 
 UT_icd plugin_specs_icd = {sizeof(struct plugin_specific), NULL, NULL, NULL};
 
diff --git a/src/plugin/plugin_manager.h b/infra/plugin_manager/plugin_manager.h
index 1de5878..1de5878 100644
--- a/src/plugin/plugin_manager.h
+++ b/infra/plugin_manager/plugin_manager.h
diff --git a/src/plugin/plugin_manager_interna.h b/infra/plugin_manager/plugin_manager_interna.h
index 07e462d..07e462d 100644
--- a/src/plugin/plugin_manager_interna.h
+++ b/infra/plugin_manager/plugin_manager_interna.h
diff --git a/src/plugin/test/CMakeLists.txt b/infra/plugin_manager/test/CMakeLists.txt
index 7698640..7698640 100644
--- a/src/plugin/test/CMakeLists.txt
+++ b/infra/plugin_manager/test/CMakeLists.txt
diff --git a/src/plugin/test/plugin_manager_gtest_main.cpp b/infra/plugin_manager/test/plugin_manager_gtest_main.cpp
index 44cb3d4..44cb3d4 100644
--- a/src/plugin/test/plugin_manager_gtest_main.cpp
+++ b/infra/plugin_manager/test/plugin_manager_gtest_main.cpp
diff --git a/src/plugin/test/plugin_manager_gtest_mock.h b/infra/plugin_manager/test/plugin_manager_gtest_mock.h
index b25fb63..b25fb63 100644
--- a/src/plugin/test/plugin_manager_gtest_mock.h
+++ b/infra/plugin_manager/test/plugin_manager_gtest_mock.h
diff --git a/src/session/CMakeLists.txt b/infra/session_manager/CMakeLists.txt
index e632679..e632679 100644
--- a/src/session/CMakeLists.txt
+++ b/infra/session_manager/CMakeLists.txt
diff --git a/src/session/session_filter.cpp b/infra/session_manager/session_filter.cpp
index 6fe0ef1..6fe0ef1 100644
--- a/src/session/session_filter.cpp
+++ b/infra/session_manager/session_filter.cpp
diff --git a/src/session/session_filter.h b/infra/session_manager/session_filter.h
index 13f5236..13f5236 100644
--- a/src/session/session_filter.h
+++ b/infra/session_manager/session_filter.h
diff --git a/src/session/session_manager.cpp b/infra/session_manager/session_manager.cpp
index 1594e20..1594e20 100644
--- a/src/session/session_manager.cpp
+++ b/infra/session_manager/session_manager.cpp
diff --git a/src/session/session_manager.h b/infra/session_manager/session_manager.h
index 32bc8e7..32bc8e7 100644
--- a/src/session/session_manager.h
+++ b/infra/session_manager/session_manager.h
diff --git a/src/session/session_pool.cpp b/infra/session_manager/session_pool.cpp
index 11b6d57..11b6d57 100644
--- a/src/session/session_pool.cpp
+++ b/infra/session_manager/session_pool.cpp
diff --git a/src/session/session_pool.h b/infra/session_manager/session_pool.h
index 9f607b9..9f607b9 100644
--- a/src/session/session_pool.h
+++ b/infra/session_manager/session_pool.h
diff --git a/src/session/session_private.h b/infra/session_manager/session_private.h
index c7456aa..c7456aa 100644
--- a/src/session/session_private.h
+++ b/infra/session_manager/session_private.h
diff --git a/src/session/session_table.cpp b/infra/session_manager/session_table.cpp
index b1e55a1..b1e55a1 100644
--- a/src/session/session_table.cpp
+++ b/infra/session_manager/session_table.cpp
diff --git a/src/session/session_table.h b/infra/session_manager/session_table.h
index 5dc73fb..5dc73fb 100644
--- a/src/session/session_table.h
+++ b/infra/session_manager/session_table.h
diff --git a/src/session/session_timer.cpp b/infra/session_manager/session_timer.cpp
index 83abe6a..83abe6a 100644
--- a/src/session/session_timer.cpp
+++ b/infra/session_manager/session_timer.cpp
diff --git a/src/session/session_timer.h b/infra/session_manager/session_timer.h
index 56b2f79..56b2f79 100644
--- a/src/session/session_timer.h
+++ b/infra/session_manager/session_timer.h
diff --git a/src/session/session_transition.cpp b/infra/session_manager/session_transition.cpp
index 387fd56..387fd56 100644
--- a/src/session/session_transition.cpp
+++ b/infra/session_manager/session_transition.cpp
diff --git a/src/session/session_transition.h b/infra/session_manager/session_transition.h
index e413f93..e413f93 100644
--- a/src/session/session_transition.h
+++ b/infra/session_manager/session_transition.h
diff --git a/src/session/session_utils.cpp b/infra/session_manager/session_utils.cpp
index 528f1b2..528f1b2 100644
--- a/src/session/session_utils.cpp
+++ b/infra/session_manager/session_utils.cpp
diff --git a/src/session/test/CMakeLists.txt b/infra/session_manager/test/CMakeLists.txt
index 91e9017..91e9017 100644
--- a/src/session/test/CMakeLists.txt
+++ b/infra/session_manager/test/CMakeLists.txt
diff --git a/src/session/test/gtest_case_tcp_fast_open.cpp b/infra/session_manager/test/gtest_case_tcp_fast_open.cpp
index 3680faa..3680faa 100644
--- a/src/session/test/gtest_case_tcp_fast_open.cpp
+++ b/infra/session_manager/test/gtest_case_tcp_fast_open.cpp
diff --git a/src/session/test/gtest_filter_tcp_dupkt.cpp b/infra/session_manager/test/gtest_filter_tcp_dupkt.cpp
index 93c3243..93c3243 100644
--- a/src/session/test/gtest_filter_tcp_dupkt.cpp
+++ b/infra/session_manager/test/gtest_filter_tcp_dupkt.cpp
diff --git a/src/session/test/gtest_overload_evict_tcp_sess.cpp b/infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp
index a50d858..a50d858 100644
--- a/src/session/test/gtest_overload_evict_tcp_sess.cpp
+++ b/infra/session_manager/test/gtest_overload_evict_tcp_sess.cpp
diff --git a/src/session/test/gtest_overload_evict_udp_sess.cpp b/infra/session_manager/test/gtest_overload_evict_udp_sess.cpp
index 7137896..7137896 100644
--- a/src/session/test/gtest_overload_evict_udp_sess.cpp
+++ b/infra/session_manager/test/gtest_overload_evict_udp_sess.cpp
diff --git a/src/session/test/gtest_sess_mgr_scan.cpp b/infra/session_manager/test/gtest_sess_mgr_scan.cpp
index 708554c..708554c 100644
--- a/src/session/test/gtest_sess_mgr_scan.cpp
+++ b/infra/session_manager/test/gtest_sess_mgr_scan.cpp
diff --git a/src/session/test/gtest_sess_mgr_tcp_reassembly.cpp b/infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp
index 9e5d0da..9e5d0da 100644
--- a/src/session/test/gtest_sess_mgr_tcp_reassembly.cpp
+++ b/infra/session_manager/test/gtest_sess_mgr_tcp_reassembly.cpp
diff --git a/src/session/test/gtest_session_filter.cpp b/infra/session_manager/test/gtest_session_filter.cpp
index c3a0911..c3a0911 100644
--- a/src/session/test/gtest_session_filter.cpp
+++ b/infra/session_manager/test/gtest_session_filter.cpp
diff --git a/src/session/test/gtest_session_pool.cpp b/infra/session_manager/test/gtest_session_pool.cpp
index 658369f..658369f 100644
--- a/src/session/test/gtest_session_pool.cpp
+++ b/infra/session_manager/test/gtest_session_pool.cpp
diff --git a/src/session/test/gtest_session_table.cpp b/infra/session_manager/test/gtest_session_table.cpp
index b99d2aa..b99d2aa 100644
--- a/src/session/test/gtest_session_table.cpp
+++ b/infra/session_manager/test/gtest_session_table.cpp
diff --git a/src/session/test/gtest_session_timer.cpp b/infra/session_manager/test/gtest_session_timer.cpp
index 1a21d87..1a21d87 100644
--- a/src/session/test/gtest_session_timer.cpp
+++ b/infra/session_manager/test/gtest_session_timer.cpp
diff --git a/src/session/test/gtest_session_transition.cpp b/infra/session_manager/test/gtest_session_transition.cpp
index a41309e..a41309e 100644
--- a/src/session/test/gtest_session_transition.cpp
+++ b/infra/session_manager/test/gtest_session_transition.cpp
diff --git a/src/session/test/gtest_state_tcp_active_to_closing.cpp b/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
index 5f79726..5f79726 100644
--- a/src/session/test/gtest_state_tcp_active_to_closing.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_active_to_closing.cpp
diff --git a/src/session/test/gtest_state_tcp_init_to_opening.cpp b/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
index 30c07fc..30c07fc 100644
--- a/src/session/test/gtest_state_tcp_init_to_opening.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_init_to_opening.cpp
diff --git a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp b/infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
index 98b4ea2..98b4ea2 100644
--- a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
diff --git a/src/session/test/gtest_state_tcp_opening_to_active.cpp b/infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp
index d0fb0aa..d0fb0aa 100644
--- a/src/session/test/gtest_state_tcp_opening_to_active.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_opening_to_active.cpp
diff --git a/src/session/test/gtest_state_tcp_opening_to_closing.cpp b/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
index e53630f..e53630f 100644
--- a/src/session/test/gtest_state_tcp_opening_to_closing.cpp
+++ b/infra/session_manager/test/gtest_state_tcp_opening_to_closing.cpp
diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
index 90a01a0..90a01a0 100644
--- a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
+++ b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp
index bc59eb1..bc59eb1 100644
--- a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp
+++ b/infra/session_manager/test/gtest_state_udp_init_to_opening_to_closing.cpp
diff --git a/src/session/test/gtest_timeout_tcp_data.cpp b/infra/session_manager/test/gtest_timeout_tcp_data.cpp
index 47ff9cd..47ff9cd 100644
--- a/src/session/test/gtest_timeout_tcp_data.cpp
+++ b/infra/session_manager/test/gtest_timeout_tcp_data.cpp
diff --git a/src/session/test/gtest_timeout_tcp_handshake.cpp b/infra/session_manager/test/gtest_timeout_tcp_handshake.cpp
index 68d10f5..68d10f5 100644
--- a/src/session/test/gtest_timeout_tcp_handshake.cpp
+++ b/infra/session_manager/test/gtest_timeout_tcp_handshake.cpp
diff --git a/src/session/test/gtest_timeout_tcp_init.cpp b/infra/session_manager/test/gtest_timeout_tcp_init.cpp
index 7d9e1bb..7d9e1bb 100644
--- a/src/session/test/gtest_timeout_tcp_init.cpp
+++ b/infra/session_manager/test/gtest_timeout_tcp_init.cpp
diff --git a/src/session/test/gtest_timeout_udp_data.cpp b/infra/session_manager/test/gtest_timeout_udp_data.cpp
index 60bb133..60bb133 100644
--- a/src/session/test/gtest_timeout_udp_data.cpp
+++ b/infra/session_manager/test/gtest_timeout_udp_data.cpp
diff --git a/src/session/test/test_packets.h b/infra/session_manager/test/test_packets.h
index 231ef88..231ef88 100644
--- a/src/session/test/test_packets.h
+++ b/infra/session_manager/test/test_packets.h
diff --git a/src/snowflake/CMakeLists.txt b/infra/snowflake/CMakeLists.txt
index 7ebc441..7ebc441 100644
--- a/src/snowflake/CMakeLists.txt
+++ b/infra/snowflake/CMakeLists.txt
diff --git a/src/snowflake/snowflake.cpp b/infra/snowflake/snowflake.cpp
index 87ddf14..87ddf14 100644
--- a/src/snowflake/snowflake.cpp
+++ b/infra/snowflake/snowflake.cpp
diff --git a/src/snowflake/snowflake.h b/infra/snowflake/snowflake.h
index 228b96a..228b96a 100644
--- a/src/snowflake/snowflake.h
+++ b/infra/snowflake/snowflake.h
diff --git a/src/snowflake/test/CMakeLists.txt b/infra/snowflake/test/CMakeLists.txt
index 307c1e5..307c1e5 100644
--- a/src/snowflake/test/CMakeLists.txt
+++ b/infra/snowflake/test/CMakeLists.txt
diff --git a/src/snowflake/test/gtest_snowflake.cpp b/infra/snowflake/test/gtest_snowflake.cpp
index 78c4374..78c4374 100644
--- a/src/snowflake/test/gtest_snowflake.cpp
+++ b/infra/snowflake/test/gtest_snowflake.cpp
diff --git a/src/snowflake/test/snowflake_tool.cpp b/infra/snowflake/test/snowflake_tool.cpp
index 5d0d335..5d0d335 100644
--- a/src/snowflake/test/snowflake_tool.cpp
+++ b/infra/snowflake/test/snowflake_tool.cpp
diff --git a/src/tcp_reassembly/CMakeLists.txt b/infra/tcp_reassembly/CMakeLists.txt
index 0fa35a7..0fa35a7 100644
--- a/src/tcp_reassembly/CMakeLists.txt
+++ b/infra/tcp_reassembly/CMakeLists.txt
diff --git a/src/tcp_reassembly/tcp_reassembly.cpp b/infra/tcp_reassembly/tcp_reassembly.cpp
index 3abbc87..3abbc87 100644
--- a/src/tcp_reassembly/tcp_reassembly.cpp
+++ b/infra/tcp_reassembly/tcp_reassembly.cpp
diff --git a/src/tcp_reassembly/tcp_reassembly.h b/infra/tcp_reassembly/tcp_reassembly.h
index 65a7a35..65a7a35 100644
--- a/src/tcp_reassembly/tcp_reassembly.h
+++ b/infra/tcp_reassembly/tcp_reassembly.h
diff --git a/src/tcp_reassembly/test/CMakeLists.txt b/infra/tcp_reassembly/test/CMakeLists.txt
index b1c8be3..b1c8be3 100644
--- a/src/tcp_reassembly/test/CMakeLists.txt
+++ b/infra/tcp_reassembly/test/CMakeLists.txt
diff --git a/src/tcp_reassembly/test/gtest_tcp_reassembly.cpp b/infra/tcp_reassembly/test/gtest_tcp_reassembly.cpp
index 1b9480b..1b9480b 100644
--- a/src/tcp_reassembly/test/gtest_tcp_reassembly.cpp
+++ b/infra/tcp_reassembly/test/gtest_tcp_reassembly.cpp
diff --git a/src/tuple/CMakeLists.txt b/infra/tuple/CMakeLists.txt
index ea2df1c..ea2df1c 100644
--- a/src/tuple/CMakeLists.txt
+++ b/infra/tuple/CMakeLists.txt
diff --git a/src/tuple/test/CMakeLists.txt b/infra/tuple/test/CMakeLists.txt
index 59d8823..59d8823 100644
--- a/src/tuple/test/CMakeLists.txt
+++ b/infra/tuple/test/CMakeLists.txt
diff --git a/src/tuple/test/gtest_tuple.cpp b/infra/tuple/test/gtest_tuple.cpp
index c9fc0b7..c9fc0b7 100644
--- a/src/tuple/test/gtest_tuple.cpp
+++ b/infra/tuple/test/gtest_tuple.cpp
diff --git a/src/tuple/tuple.cpp b/infra/tuple/tuple.cpp
index daf30ea..daf30ea 100644
--- a/src/tuple/tuple.cpp
+++ b/infra/tuple/tuple.cpp
diff --git a/src/tuple/tuple.h b/infra/tuple/tuple.h
index eefb0e0..eefb0e0 100644
--- a/src/tuple/tuple.h
+++ b/infra/tuple/tuple.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index a80972c..0000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_subdirectory(log)
-add_subdirectory(tuple)
-add_subdirectory(packet)
-add_subdirectory(packet_io)
-add_subdirectory(snowflake)
-add_subdirectory(ip_reassembly)
-add_subdirectory(tcp_reassembly)
-add_subdirectory(session)
-add_subdirectory(plugin)
-add_subdirectory(core)
\ No newline at end of file