Index: configure.ac
===================================================================
--- configure.ac	(revision 23)
+++ configure.ac	(working copy)
@@ -253,7 +253,7 @@
    src/shared/Auth/Makefile
    src/shared/Config/Makefile
    src/shared/Database/Makefile
-   src/shared/Network/Makefile
+   src/shared/NetworkNew/Makefile
    src/shared/vmap/Makefile
    src/shared/SystemConfig.h
    src/game/Makefile
Index: src/game/Makefile.am
===================================================================
--- src/game/Makefile.am	(revision 23)
+++ src/game/Makefile.am	(working copy)
@@ -256,7 +256,7 @@
 	GroupRefManager.h
 
 ## Link against shared library
-libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/Network/libmangosnetwork.a ../shared/vmap/libmangosvmaps.a
+libmangosgame_a_LIBADD = ../shared/libmangosshared.a ../shared/Auth/libmangosauth.a ../shared/Config/libmangosconfig.a ../shared/Database/libmangosdatabase.a ../shared/NetworkNew/libmangosnetwork.a ../shared/vmap/libmangosvmaps.a
 
 ## Additional files to include when running 'make dist'
 #  Nothing yet.
Index: src/mangosd/Makefile.am
===================================================================
--- src/mangosd/Makefile.am	(revision 23)
+++ src/mangosd/Makefile.am	(working copy)
@@ -33,7 +33,7 @@
 	WorldRunnable.h
 
 ## Link world daemon against the shared library
-mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../shared/Network/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
+mangos_worldd_LDADD = ../bindings/universal/libmangosscript.la ../game/libmangosgame.a ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/vmap/libmangosvmaps.a ../shared/NetworkNew/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la ../../dep/src/g3dlite/libg3dlite.a
 mangos_worldd_LDFLAGS = -L../../dep/src/zthread  -L../../dep/src/g3dlite -L../bindings/universal/ $(MYSQL_LIBS) $(LEVENT_LIB) $(POSTGRE_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB) -export-dynamic
 
 ## Additional files to include when running 'make dist'
Index: src/realmd/Makefile.am
===================================================================
--- src/realmd/Makefile.am	(revision 23)
+++ src/realmd/Makefile.am	(working copy)
@@ -30,7 +30,7 @@
 	RealmList.h
 
 ## Link realm list daemon against the shared library
-mangos_realmd_LDADD = ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/Network/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la
+mangos_realmd_LDADD = ../shared/Database/libmangosdatabase.a ../shared/Config/libmangosconfig.a ../shared/Auth/libmangosauth.a ../shared/libmangosshared.a ../shared/NetworkNew/libmangosnetwork.a ../framework/libmangosframework.a ../../dep/src/zthread/libZThread.la
 mangos_realmd_LDFLAGS = -L../../dep/src/zthread $(MYSQL_LIBS) $(LEVENT_LIB) $(POSTGRE_LIBS) -L$(libdir) $(ZLIB) $(COMPATLIB) $(SSLLIB)
 
 ## Additional files to include when running 'make dist'
Index: src/shared/NetworkNew/SocketManager.cpp
===================================================================
--- src/shared/NetworkNew/SocketManager.cpp	(revision 23)
+++ src/shared/NetworkNew/SocketManager.cpp	(working copy)
@@ -74,7 +74,7 @@
 void SocketWriterRunnable::run()
 {
 	return;
-
+/*
 	if(!sSocketManager.GetWriterBase())
 	{
 		sLog.outError("<Socket manager> Couldn't start Socket worker thread. Event_base is wrong!");
@@ -99,6 +99,7 @@
 		}
 	}
 	sLog.outBasic("<Socket manager> Socket worker thread is finished");
+*/
 }
 
 SocketManager::SocketManager()