15 files changed, 55 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97191ba..ea049cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,9 @@ endif(DOXYGEN_FOUND)
 add_subdirectory(libcmix-crypto)
 add_subdirectory(libcmix)
 
+add_subdirectory(libcmix-network)
+
 add_subdirectory(network-handler)
+add_subdirectory(node)
 
 add_subdirectory(scratchpad)
diff --git a/libcmix-network/CMakeLists.txt b/libcmix-network/CMakeLists.txt
new file mode 100644
index 0000000..d819bec
--- /dev/null
+++ b/libcmix-network/CMakeLists.txt
@@ -0,0 +1,29 @@
+find_package(Boost COMPONENTS system REQUIRED)
+
+add_library(cmix-network
+	acceptor.hpp acceptor.cpp
+	server.hpp server.cpp
+	client.hpp client.cpp
+	nodeclient.hpp nodeclient.cpp
+)
+
+target_compile_options(cmix-network
+	PRIVATE "-std=c++11"
+)
+
+target_include_directories(cmix-network
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+target_link_libraries(cmix-network
+	PRIVATE Boost::boost
+	PUBLIC Boost::system
+	PRIVATE cmix
+)
+
+if(WIN32)
+	target_link_libraries(cmix-network
+		PUBLIC wsock32
+		PUBLIC ws2_32
+	)
+endif()
diff --git a/network-handler/acceptor.cpp b/libcmix-network/acceptor.cpp
index 34b5f0e..34b5f0e 100644
--- a/network-handler/acceptor.cpp
+++ b/libcmix-network/acceptor.cpp
diff --git a/network-handler/acceptor.hpp b/libcmix-network/acceptor.hpp
index 7d8e0a2..7d8e0a2 100644
--- a/network-handler/acceptor.hpp
+++ b/libcmix-network/acceptor.hpp
diff --git a/network-handler/client.cpp b/libcmix-network/client.cpp
index 3098185..3098185 100644
--- a/network-handler/client.cpp
+++ b/libcmix-network/client.cpp
diff --git a/network-handler/client.hpp b/libcmix-network/client.hpp
index 2b6a6df..2b6a6df 100644
--- a/network-handler/client.hpp
+++ b/libcmix-network/client.hpp
diff --git a/network-handler/nodeclient.cpp b/libcmix-network/nodeclient.cpp
index 9b026ba..9b026ba 100644
--- a/network-handler/nodeclient.cpp
+++ b/libcmix-network/nodeclient.cpp
diff --git a/network-handler/nodeclient.hpp b/libcmix-network/nodeclient.hpp
index 9a3799a..9a3799a 100644
--- a/network-handler/nodeclient.hpp
+++ b/libcmix-network/nodeclient.hpp
diff --git a/network-handler/server.cpp b/libcmix-network/server.cpp
index cb2bd34..cb2bd34 100644
--- a/network-handler/server.cpp
+++ b/libcmix-network/server.cpp
diff --git a/network-handler/server.hpp b/libcmix-network/server.hpp
index 942cb14..942cb14 100644
--- a/network-handler/server.hpp
+++ b/libcmix-network/server.hpp
diff --git a/network-handler/CMakeLists.txt b/network-handler/CMakeLists.txt
index b4aef97..072172e 100644
--- a/network-handler/CMakeLists.txt
+++ b/network-handler/CMakeLists.txt
@@ -3,13 +3,8 @@ find_package(Boost COMPONENTS system program_options REQUIRED)
 
 add_executable(network-handler
 	main.cpp
-	acceptor.hpp acceptor.cpp
-	server.hpp server.cpp
 	networkhandler.hpp networkhandler.cpp
-	node.hpp node.cpp
-	client.hpp client.cpp
 	userclient.hpp userclient.cpp
-	nodeclient.hpp nodeclient.cpp
 	nodemanager.hpp nodemanager.cpp
 )
 
@@ -22,11 +17,5 @@ target_link_libraries(network-handler
 	PRIVATE Boost::program_options
 	PRIVATE Boost::system
 	PRIVATE cmix
+	PRIVATE cmix-network
 )
-
-if(WIN32)
-	target_link_libraries(network-handler
-		PRIVATE wsock32
-		PRIVATE ws2_32
-	)
-endif()
diff --git a/node/CMakeLists.txt b/node/CMakeLists.txt
new file mode 100644
index 0000000..895cfb2
--- /dev/null
+++ b/node/CMakeLists.txt
@@ -0,0 +1,18 @@
+find_package(Boost COMPONENTS system program_options REQUIRED)
+
+add_executable(node
+	main.cpp
+	node.hpp node.cpp
+)
+
+target_compile_options(node
+	PRIVATE "-std=c++11"
+)
+
+target_link_libraries(node
+	PRIVATE Boost::boost
+	PRIVATE Boost::program_options
+	PRIVATE Boost::system
+	PRIVATE cmix
+	PRIVATE cmix-network
+)
diff --git a/node/main.cpp b/node/main.cpp
new file mode 100644
index 0000000..970e150
--- /dev/null
+++ b/node/main.cpp
@@ -0,0 +1,4 @@
+
+int main() {
+
+}
diff --git a/network-handler/node.cpp b/node/node.cpp
index 497a920..497a920 100644
--- a/network-handler/node.cpp
+++ b/node/node.cpp
diff --git a/network-handler/node.hpp b/node/node.hpp
index 7d30188..7d30188 100644
--- a/network-handler/node.hpp
+++ b/node/node.hpp