diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a7230d..38d7076 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,34 +13,8 @@ target_include_directories(mesytec-mnode
 target_link_libraries(mesytec-mnode PUBLIC nng mnode-proto PRIVATE spdlog)
 target_compile_features(mesytec-mnode PRIVATE cxx_std_17)
 
-add_library(mesytec-mnode-dev INTERFACE)
-target_link_libraries(mesytec-mnode-dev INTERFACE mesytec-mnode mesytec-mvlc)
+add_subdirectory(tools)
 
-function(add_mnode_dev_executable name)
-    add_executable(${name} ${name}.cc)
-    target_link_libraries(${name} PRIVATE mesytec-mnode-dev)
-    target_compile_options(${name} PRIVATE ${MVLC_NNG_MNODE_WARN_FLAGS})
-endfunction()
-
-function(add_mnode_proto_dev_executable name)
-    add_mnode_dev_executable(${name})
-    target_link_libraries(${name} PRIVATE mnode-proto mesytec-mvlc)
-endfunction()
-
-add_mnode_dev_executable(pair_producer)
-add_mnode_dev_executable(pair_consumer)
-add_mnode_dev_executable(pair_inproc)
-add_mnode_dev_executable(mvlc_nng_replay)
-add_mnode_dev_executable(mesy_nng_pipeline_main)
-add_mnode_dev_executable(mesy_nng_push_pull_main)
-add_mnode_dev_executable(mesy_nng_pub_producer)
-add_mnode_dev_executable(mesy_nng_sub_consumer)
-
-add_mnode_proto_dev_executable(mnode_proto_test1)
-add_mnode_proto_dev_executable(mnode_proto_ping_client)
-add_mnode_proto_dev_executable(mnode_proto_ping_server)
-add_mnode_proto_dev_executable(mnode_proto_rpc_ping_server)
-add_mnode_proto_dev_executable(mnode_proto_rpc_ping_client)
 
 #add_subdirectory(qt)
 
diff --git a/src/pipeline.h b/src/pipeline.h
deleted file mode 100644
index f51444b..0000000
--- a/src/pipeline.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef CF3DAF23_18D2_419E_9DCC_3855C5A63226
-#define CF3DAF23_18D2_419E_9DCC_3855C5A63226
-
-#include <mesytec-node/mesytec_node_nng.h>
-
-namespace mesytec::mnode::pipeline
-{
-
-
-
-
-}
-
-#endif /* CF3DAF23_18D2_419E_9DCC_3855C5A63226 */
diff --git a/src/thread_name.cc b/src/thread_name.cc
deleted file mode 100644
index 005e237..0000000
--- a/src/thread_name.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "thread_name.h"
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-
-namespace mesytec::util
-{
-
-#ifdef __linux__
-void set_thread_name(const char *name)
-{
-    prctl(PR_SET_NAME,name,0,0,0);
-}
-
-#else
-
-void set_thread_name(const char *)
-{
-}
-
-#endif
-}
diff --git a/src/thread_name.h b/src/thread_name.h
deleted file mode 100644
index 0500f27..0000000
--- a/src/thread_name.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CAF8B988_F0C9_475A_8E38_8789949859DB
-#define CAF8B988_F0C9_475A_8E38_8789949859DB
-
-namespace mesytec::util
-{
-void set_thread_name(const char *name);
-}
-
-#endif /* CAF8B988_F0C9_475A_8E38_8789949859DB */
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 0000000..20a8162
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1,29 @@
+add_library(mesytec-mnode-dev INTERFACE)
+target_link_libraries(mesytec-mnode-dev INTERFACE mesytec-mnode mesytec-mvlc)
+target_include_directories(mesytec-mnode-dev INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
+
+function(add_mnode_dev_executable name)
+    add_executable(${name} ${name}.cc)
+    target_link_libraries(${name} PRIVATE mesytec-mnode-dev)
+    target_compile_options(${name} PRIVATE ${MVLC_NNG_MNODE_WARN_FLAGS})
+endfunction()
+
+function(add_mnode_proto_dev_executable name)
+    add_mnode_dev_executable(${name})
+    target_link_libraries(${name} PRIVATE mnode-proto mesytec-mvlc)
+endfunction()
+
+add_mnode_dev_executable(pair_producer)
+add_mnode_dev_executable(pair_consumer)
+add_mnode_dev_executable(pair_inproc)
+add_mnode_dev_executable(mvlc_nng_replay)
+add_mnode_dev_executable(mesy_nng_pipeline_main)
+add_mnode_dev_executable(mesy_nng_push_pull_main)
+add_mnode_dev_executable(mesy_nng_pub_producer)
+add_mnode_dev_executable(mesy_nng_sub_consumer)
+
+add_mnode_proto_dev_executable(mnode_proto_test1)
+add_mnode_proto_dev_executable(mnode_proto_ping_client)
+add_mnode_proto_dev_executable(mnode_proto_ping_server)
+add_mnode_proto_dev_executable(mnode_proto_rpc_ping_server)
+add_mnode_proto_dev_executable(mnode_proto_rpc_ping_client)
diff --git a/src/mesy_nng_pipeline_main.cc b/src/tools/mesy_nng_pipeline_main.cc
similarity index 100%
rename from src/mesy_nng_pipeline_main.cc
rename to src/tools/mesy_nng_pipeline_main.cc
diff --git a/src/mesy_nng_pub_producer.cc b/src/tools/mesy_nng_pub_producer.cc
similarity index 100%
rename from src/mesy_nng_pub_producer.cc
rename to src/tools/mesy_nng_pub_producer.cc
diff --git a/src/mesy_nng_push_pull_main.cc b/src/tools/mesy_nng_push_pull_main.cc
similarity index 100%
rename from src/mesy_nng_push_pull_main.cc
rename to src/tools/mesy_nng_push_pull_main.cc
diff --git a/src/mesy_nng_sub_consumer.cc b/src/tools/mesy_nng_sub_consumer.cc
similarity index 100%
rename from src/mesy_nng_sub_consumer.cc
rename to src/tools/mesy_nng_sub_consumer.cc
diff --git a/src/mnode_proto_ping_client.cc b/src/tools/mnode_proto_ping_client.cc
similarity index 100%
rename from src/mnode_proto_ping_client.cc
rename to src/tools/mnode_proto_ping_client.cc
diff --git a/src/mnode_proto_ping_server.cc b/src/tools/mnode_proto_ping_server.cc
similarity index 100%
rename from src/mnode_proto_ping_server.cc
rename to src/tools/mnode_proto_ping_server.cc
diff --git a/src/mnode_proto_rpc_ping_client.cc b/src/tools/mnode_proto_rpc_ping_client.cc
similarity index 100%
rename from src/mnode_proto_rpc_ping_client.cc
rename to src/tools/mnode_proto_rpc_ping_client.cc
diff --git a/src/mnode_proto_rpc_ping_server.cc b/src/tools/mnode_proto_rpc_ping_server.cc
similarity index 100%
rename from src/mnode_proto_rpc_ping_server.cc
rename to src/tools/mnode_proto_rpc_ping_server.cc
diff --git a/src/mnode_proto_test1.cc b/src/tools/mnode_proto_test1.cc
similarity index 100%
rename from src/mnode_proto_test1.cc
rename to src/tools/mnode_proto_test1.cc
diff --git a/src/mvlc_nng_replay.cc b/src/tools/mvlc_nng_replay.cc
similarity index 100%
rename from src/mvlc_nng_replay.cc
rename to src/tools/mvlc_nng_replay.cc
diff --git a/src/pair_consumer.cc b/src/tools/pair_consumer.cc
similarity index 100%
rename from src/pair_consumer.cc
rename to src/tools/pair_consumer.cc
diff --git a/src/pair_inproc.cc b/src/tools/pair_inproc.cc
similarity index 96%
rename from src/pair_inproc.cc
rename to src/tools/pair_inproc.cc
index c30daee..7046cf9 100644
--- a/src/pair_inproc.cc
+++ b/src/tools/pair_inproc.cc
@@ -2,7 +2,7 @@
 
 #include <mesytec-mvlc/mesytec-mvlc.h>
 
-int main(int argc, char *argv[])
+int main()
 {
     spdlog::set_level(spdlog::level::info);
     auto producerSocket = make_pair_socket();
diff --git a/src/pair_producer.cc b/src/tools/pair_producer.cc
similarity index 100%
rename from src/pair_producer.cc
rename to src/tools/pair_producer.cc
diff --git a/src/test_producer_consumer.h b/src/tools/test_producer_consumer.h
similarity index 100%
rename from src/test_producer_consumer.h
rename to src/tools/test_producer_consumer.h