diff --git a/pokerth_game.pro b/pokerth_game.pro
index bad7b3b5..d55f0f26 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -118,8 +118,8 @@ HEADERS += src/game.h \
     src/net/genericsocket.h \
     src/net/netpacket.h \
     src/net/resolverthread.h \
-    src/net/senderthread.h \
-    src/net/serveracceptthread.h \
+	src/net/senderhelper.h \
+	src/net/serveraccepthelper.h \
     src/net/serverlobbythread.h \
     src/net/socket_helper.h \
     src/net/socket_msg.h \
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 782a830f..86918c2a 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -64,9 +64,11 @@ HEADERS += \
 		src/engine/playerinterface.h \
 		src/engine/berointerface.h \
 		src/gui/guiinterface.h \
+		src/net/connectdata.h \
 		src/net/clientcallback.h \
 		src/net/clientcontext.h \
 		src/net/clientexception.h \
+		src/net/netcontext.h \
 		src/net/clientstate.h \
 		src/net/clientthread.h \
 		src/net/genericsocket.h \
@@ -74,17 +76,24 @@ HEADERS += \
 		src/net/resolverthread.h \
 		src/net/senderinterface.h \
 		src/net/senderhelper.h \
+		src/net/sendercallback.h \
+		src/net/servercontext.h \
+		src/net/serverexception.h \
 		src/net/serveraccepthelper.h \
 		src/net/servergamethread.h \
 		src/net/servergamestate.h \
 		src/net/serverlobbythread.h \
+		src/net/servercallback.h \
+		src/net/sessiondata.h \
 		src/net/sessiondatacallback.h \
+		src/net/sessionmanager.h \
 		src/net/socket_helper.h \
 		src/net/socket_msg.h \
 		src/net/socket_startup.h \
 		src/net/irccallback.h \
 		src/net/ircthread.h \
 		src/net/netexception.h \
+		src/net/receiverhelper.h \
 		src/net/servermanager.h \
 		src/net/transferdata.h \
 		src/net/transferhelper.h \
diff --git a/pokerth_server.pro b/pokerth_server.pro
index bf0d12d6..d59205ce 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -71,8 +71,8 @@ HEADERS += \
 		src/net/genericsocket.h \
 		src/net/netpacket.h \
 		src/net/resolverthread.h \
-		src/net/senderthread.h \
-		src/net/serveracceptthread.h \
+		src/net/senderhelper.h \
+		src/net/serveraccepthelper.h \
 		src/net/serverlobbythread.h \
 		src/net/socket_helper.h \
 		src/net/socket_msg.h \