diff --git a/animation-server/CMakeLists.txt b/animation-server/CMakeLists.txt
index 7d3222327a..d8fa8d97b2 100644
--- a/animation-server/CMakeLists.txt
+++ b/animation-server/CMakeLists.txt
@@ -29,4 +29,5 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi voxels library
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 
-
+# link the hifi networking library
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
\ No newline at end of file
diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 1611b1e2b4..fa8d23051a 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -13,7 +13,6 @@ set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
 
 find_package(Qt5 COMPONENTS Network Script Widgets)
-find_package(GnuTLS REQUIRED)
 
 include("${MACRO_DIR}/SetupHifiProject.cmake")
 setup_hifi_project(${TARGET_NAME} TRUE)
@@ -31,6 +30,7 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
@@ -42,5 +42,4 @@ IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)
 
-include_directories("${GNUTLS_INCLUDE_DIR}")
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")
\ No newline at end of file
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
\ No newline at end of file
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index 9289d640f5..f35285124f 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <PacketHeaders.h>
+
 #include "AvatarMixerClientData.h"
 
 AvatarMixerClientData::AvatarMixerClientData() :
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 4cbc29c62d..0db22542b0 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -34,6 +34,7 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
 
 # link the shared hifi library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 251553f3c3..6a3186bb70 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -32,8 +32,8 @@ elseif (UNIX)
   # include the right GL headers for UNIX
   set(GL_HEADERS "#include <GL/gl.h>\n#include <GL/glut.h>\n#include <GL/glext.h>")
 elseif (WIN32)
-    add_definitions( -D_USE_MATH_DEFINES ) # apparently needed to get M_PI and other defines from cmath/math.h
-    add_definitions( -DWINDOWS_LEAN_AND_MEAN ) # needed to make sure windows doesn't go to crazy with its defines
+    add_definitions(-D_USE_MATH_DEFINES) # apparently needed to get M_PI and other defines from cmath/math.h
+    add_definitions(-DWINDOWS_LEAN_AND_MEAN) # needed to make sure windows doesn't go to crazy with its defines
 
     set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/glut.h>")
 endif ()
@@ -67,7 +67,6 @@ foreach(EXTERNAL_SOURCE_SUBDIR ${EXTERNAL_SOURCE_SUBDIRS})
 endforeach(EXTERNAL_SOURCE_SUBDIR)
 
 find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools)
-find_package(GnuTLS REQUIRED)
 
 # grab the ui files in resources/ui
 file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
@@ -125,6 +124,7 @@ link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(avatars ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(audio ${TARGET_NAME} "${ROOT_DIR}")
@@ -189,7 +189,7 @@ include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes"
 
 # include external library headers
 # use system flag so warnings are supressed
-include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}" "${GNUTLS_INCLUDE_DIR}")
+include_directories(SYSTEM "${FACESHIFT_INCLUDE_DIRS}")
 
 target_link_libraries(
   ${TARGET_NAME}
@@ -197,7 +197,6 @@ target_link_libraries(
   "${ZLIB_LIBRARIES}"
   Qt5::Core Qt5::Gui Qt5::Multimedia Qt5::Network Qt5::OpenGL 
   Qt5::Script Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::UiTools
-  "${GNUTLS_LIBRARY}"
 )
 
 if (APPLE)
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index 8d2feb22a2..0bf0ba9904 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -20,4 +20,5 @@ include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
\ No newline at end of file
+link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
\ No newline at end of file
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index 4cc97e56a5..9816282dda 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -26,5 +26,6 @@ link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi voxels library
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 target_link_libraries(${TARGET_NAME} Qt5::Script)
\ No newline at end of file
diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index acc060b270..7a8319815a 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -20,8 +20,11 @@ auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME} "${AUTOMTC_SRC}")
 
+# link in the networking library
+include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
+
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
-
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
\ No newline at end of file
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
new file mode 100644
index 0000000000..101e739fea
--- /dev/null
+++ b/libraries/networking/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.8)
+
+if (WIN32)
+  cmake_policy (SET CMP0020 NEW)
+endif (WIN32)
+
+set(ROOT_DIR ../..)
+set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
+
+set(TARGET_NAME networking)
+project(${TARGET_NAME})
+
+find_package(Qt5 COMPONENTS Network)
+find_package(GnuTLS REQUIRED)
+
+include(${MACRO_DIR}/SetupHifiLibrary.cmake)
+setup_hifi_library(${TARGET_NAME})
+
+# include GLM
+include(${MACRO_DIR}/IncludeGLM.cmake)
+include_glm(${TARGET_NAME} "${ROOT_DIR}")
+
+include_directories("${GNUTLS_INCLUDE_DIR}")
+target_link_libraries(${TARGET_NAME} Qt5::Network "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
similarity index 99%
rename from libraries/shared/src/AccountManager.cpp
rename to libraries/networking/src/AccountManager.cpp
index 6c0bcb33cb..d1e4edf2ea 100644
--- a/libraries/shared/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -1,6 +1,6 @@
 //
 //  AccountManager.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/AccountManager.h b/libraries/networking/src/AccountManager.h
similarity index 99%
rename from libraries/shared/src/AccountManager.h
rename to libraries/networking/src/AccountManager.h
index fed6a61772..cb76786f4e 100644
--- a/libraries/shared/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -1,6 +1,6 @@
 //
 //  AccountManager.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp
similarity index 99%
rename from libraries/shared/src/Assignment.cpp
rename to libraries/networking/src/Assignment.cpp
index 4d6740b400..dd318aad8e 100644
--- a/libraries/shared/src/Assignment.cpp
+++ b/libraries/networking/src/Assignment.cpp
@@ -1,6 +1,6 @@
 //
 //  Assignment.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 8/22/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/Assignment.h b/libraries/networking/src/Assignment.h
similarity index 99%
rename from libraries/shared/src/Assignment.h
rename to libraries/networking/src/Assignment.h
index c5a83cf417..041121f760 100644
--- a/libraries/shared/src/Assignment.h
+++ b/libraries/networking/src/Assignment.h
@@ -1,6 +1,6 @@
 //
 //  Assignment.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 8/22/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/DTLSClientSession.cpp b/libraries/networking/src/DTLSClientSession.cpp
similarity index 98%
rename from libraries/shared/src/DTLSClientSession.cpp
rename to libraries/networking/src/DTLSClientSession.cpp
index bd626dfcd8..b17de8e168 100644
--- a/libraries/shared/src/DTLSClientSession.cpp
+++ b/libraries/networking/src/DTLSClientSession.cpp
@@ -1,6 +1,6 @@
 //
 //  DTLSClientSession.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DTLSClientSession.h b/libraries/networking/src/DTLSClientSession.h
similarity index 96%
rename from libraries/shared/src/DTLSClientSession.h
rename to libraries/networking/src/DTLSClientSession.h
index fcd5a3b5e9..eeca1aaa68 100644
--- a/libraries/shared/src/DTLSClientSession.h
+++ b/libraries/networking/src/DTLSClientSession.h
@@ -1,6 +1,6 @@
 //
 //  DTLSClientSession.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DTLSSession.cpp b/libraries/networking/src/DTLSSession.cpp
similarity index 99%
rename from libraries/shared/src/DTLSSession.cpp
rename to libraries/networking/src/DTLSSession.cpp
index 8e84c38edc..7d375ec327 100644
--- a/libraries/shared/src/DTLSSession.cpp
+++ b/libraries/networking/src/DTLSSession.cpp
@@ -1,6 +1,6 @@
 //
 //  DTLSSession.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DTLSSession.h b/libraries/networking/src/DTLSSession.h
similarity index 97%
rename from libraries/shared/src/DTLSSession.h
rename to libraries/networking/src/DTLSSession.h
index 4b69f13c78..9e9542e147 100644
--- a/libraries/shared/src/DTLSSession.h
+++ b/libraries/networking/src/DTLSSession.h
@@ -1,6 +1,6 @@
 //
 //  DTLSSession.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-01.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp
similarity index 98%
rename from libraries/shared/src/DataServerAccountInfo.cpp
rename to libraries/networking/src/DataServerAccountInfo.cpp
index 1c53bca30f..87d3b694a7 100644
--- a/libraries/shared/src/DataServerAccountInfo.cpp
+++ b/libraries/networking/src/DataServerAccountInfo.cpp
@@ -1,6 +1,6 @@
 //
 //  DataServerAccountInfo.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DataServerAccountInfo.h b/libraries/networking/src/DataServerAccountInfo.h
similarity index 97%
rename from libraries/shared/src/DataServerAccountInfo.h
rename to libraries/networking/src/DataServerAccountInfo.h
index ae5de6de64..21380c0855 100644
--- a/libraries/shared/src/DataServerAccountInfo.h
+++ b/libraries/networking/src/DataServerAccountInfo.h
@@ -1,6 +1,6 @@
 //
 //  DataServerAccountInfo.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/21/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
similarity index 99%
rename from libraries/shared/src/DomainHandler.cpp
rename to libraries/networking/src/DomainHandler.cpp
index 85c452f01c..6c2fb0274a 100644
--- a/libraries/shared/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -1,6 +1,6 @@
 //
 //  DomainHandler.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
similarity index 98%
rename from libraries/shared/src/DomainHandler.h
rename to libraries/networking/src/DomainHandler.h
index ef698fd826..9a18feb1ed 100644
--- a/libraries/shared/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -1,6 +1,6 @@
 //
 //  DomainHandler.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DummyDTLSSession.cpp b/libraries/networking/src/DummyDTLSSession.cpp
similarity index 97%
rename from libraries/shared/src/DummyDTLSSession.cpp
rename to libraries/networking/src/DummyDTLSSession.cpp
index 96207477cf..a42e3f1599 100644
--- a/libraries/shared/src/DummyDTLSSession.cpp
+++ b/libraries/networking/src/DummyDTLSSession.cpp
@@ -1,6 +1,6 @@
 //
 //  DummyDTLSSession.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-04.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/DummyDTLSSession.h b/libraries/networking/src/DummyDTLSSession.h
similarity index 96%
rename from libraries/shared/src/DummyDTLSSession.h
rename to libraries/networking/src/DummyDTLSSession.h
index e13686ac51..352b2c23e2 100644
--- a/libraries/shared/src/DummyDTLSSession.h
+++ b/libraries/networking/src/DummyDTLSSession.h
@@ -1,6 +1,6 @@
 //
 //  DummyDTLSSession.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2014-04-04.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/HifiSockAddr.cpp b/libraries/networking/src/HifiSockAddr.cpp
similarity index 99%
rename from libraries/shared/src/HifiSockAddr.cpp
rename to libraries/networking/src/HifiSockAddr.cpp
index fd79341850..be482cfe02 100644
--- a/libraries/shared/src/HifiSockAddr.cpp
+++ b/libraries/networking/src/HifiSockAddr.cpp
@@ -1,6 +1,6 @@
 //
 //  HifiSockAddr.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 11/26/2013.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/HifiSockAddr.h b/libraries/networking/src/HifiSockAddr.h
similarity index 98%
rename from libraries/shared/src/HifiSockAddr.h
rename to libraries/networking/src/HifiSockAddr.h
index 229587e523..49db336d19 100644
--- a/libraries/shared/src/HifiSockAddr.h
+++ b/libraries/networking/src/HifiSockAddr.h
@@ -1,6 +1,6 @@
 //
 //  HifiSockAddr.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 11/26/2013.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
similarity index 99%
rename from libraries/shared/src/LimitedNodeList.cpp
rename to libraries/networking/src/LimitedNodeList.cpp
index b4a65475d6..b0b048dde4 100644
--- a/libraries/shared/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -1,6 +1,6 @@
 //
 //  LimitedNodeList.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
similarity index 99%
rename from libraries/shared/src/LimitedNodeList.h
rename to libraries/networking/src/LimitedNodeList.h
index d428805511..7fc0346a74 100644
--- a/libraries/shared/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -1,6 +1,6 @@
 //
 //  LimitedNodeList.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/Logging.cpp b/libraries/networking/src/Logging.cpp
similarity index 99%
rename from libraries/shared/src/Logging.cpp
rename to libraries/networking/src/Logging.cpp
index 2625cc744a..17a4706de0 100644
--- a/libraries/shared/src/Logging.cpp
+++ b/libraries/networking/src/Logging.cpp
@@ -1,6 +1,6 @@
 //
 //  Logging.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 6/11/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/Logging.h b/libraries/networking/src/Logging.h
similarity index 98%
rename from libraries/shared/src/Logging.h
rename to libraries/networking/src/Logging.h
index edbe8f62ee..b37962e931 100644
--- a/libraries/shared/src/Logging.h
+++ b/libraries/networking/src/Logging.h
@@ -1,6 +1,6 @@
 //
 //  Logging.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 6/11/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/NetworkPacket.cpp b/libraries/networking/src/NetworkPacket.cpp
similarity index 98%
rename from libraries/shared/src/NetworkPacket.cpp
rename to libraries/networking/src/NetworkPacket.cpp
index b948b10c96..bf18aa9b37 100644
--- a/libraries/shared/src/NetworkPacket.cpp
+++ b/libraries/networking/src/NetworkPacket.cpp
@@ -1,6 +1,6 @@
 //
 //  NetworkPacket.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/9/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/NetworkPacket.h b/libraries/networking/src/NetworkPacket.h
similarity index 98%
rename from libraries/shared/src/NetworkPacket.h
rename to libraries/networking/src/NetworkPacket.h
index 6c086e2f5a..94ddf8d56e 100644
--- a/libraries/shared/src/NetworkPacket.h
+++ b/libraries/networking/src/NetworkPacket.h
@@ -1,6 +1,6 @@
 //
 //  NetworkPacket.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/9/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/Node.cpp b/libraries/networking/src/Node.cpp
similarity index 99%
rename from libraries/shared/src/Node.cpp
rename to libraries/networking/src/Node.cpp
index 13f700ad5a..f6445de58d 100644
--- a/libraries/shared/src/Node.cpp
+++ b/libraries/networking/src/Node.cpp
@@ -1,6 +1,6 @@
 //
 //  Node.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/Node.h b/libraries/networking/src/Node.h
similarity index 99%
rename from libraries/shared/src/Node.h
rename to libraries/networking/src/Node.h
index e7ebbcfb13..6cc8d5bfaf 100644
--- a/libraries/shared/src/Node.h
+++ b/libraries/networking/src/Node.h
@@ -1,6 +1,6 @@
 //
 //  Node.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/NodeData.cpp b/libraries/networking/src/NodeData.cpp
similarity index 92%
rename from libraries/shared/src/NodeData.cpp
rename to libraries/networking/src/NodeData.cpp
index 6b71ef8f37..2e6fa9e8e1 100644
--- a/libraries/shared/src/NodeData.cpp
+++ b/libraries/networking/src/NodeData.cpp
@@ -1,6 +1,6 @@
 //
 //  NodeData.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/19/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/NodeData.h b/libraries/networking/src/NodeData.h
similarity index 95%
rename from libraries/shared/src/NodeData.h
rename to libraries/networking/src/NodeData.h
index 3b26d5b6d5..b865e444a9 100644
--- a/libraries/shared/src/NodeData.h
+++ b/libraries/networking/src/NodeData.h
@@ -1,6 +1,6 @@
 //
 //  NodeData.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/19/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
similarity index 99%
rename from libraries/shared/src/NodeList.cpp
rename to libraries/networking/src/NodeList.cpp
index cb4bacc5f9..93377c7763 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -1,6 +1,6 @@
 //
 //  NodeList.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/NodeList.h b/libraries/networking/src/NodeList.h
similarity index 99%
rename from libraries/shared/src/NodeList.h
rename to libraries/networking/src/NodeList.h
index 06505cc36c..1cc824c294 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -1,6 +1,6 @@
 //
 //  NodeList.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/15/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/OAuthAccessToken.cpp b/libraries/networking/src/OAuthAccessToken.cpp
similarity index 98%
rename from libraries/shared/src/OAuthAccessToken.cpp
rename to libraries/networking/src/OAuthAccessToken.cpp
index ab5ec6462a..365b07a935 100644
--- a/libraries/shared/src/OAuthAccessToken.cpp
+++ b/libraries/networking/src/OAuthAccessToken.cpp
@@ -1,6 +1,6 @@
 //
 //  OAuthAccessToken.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/OAuthAccessToken.h b/libraries/networking/src/OAuthAccessToken.h
similarity index 97%
rename from libraries/shared/src/OAuthAccessToken.h
rename to libraries/networking/src/OAuthAccessToken.h
index 7f7c621231..36859b79f8 100644
--- a/libraries/shared/src/OAuthAccessToken.h
+++ b/libraries/networking/src/OAuthAccessToken.h
@@ -1,6 +1,6 @@
 //
 //  OAuthAccessToken.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp
similarity index 99%
rename from libraries/shared/src/PacketHeaders.cpp
rename to libraries/networking/src/PacketHeaders.cpp
index 5916c542dd..fe999fed96 100644
--- a/libraries/shared/src/PacketHeaders.cpp
+++ b/libraries/networking/src/PacketHeaders.cpp
@@ -1,6 +1,6 @@
 //
 //  PacketHeaders.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 6/28/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h
similarity index 99%
rename from libraries/shared/src/PacketHeaders.h
rename to libraries/networking/src/PacketHeaders.h
index 924445e276..3e2ff3d8b0 100644
--- a/libraries/shared/src/PacketHeaders.h
+++ b/libraries/networking/src/PacketHeaders.h
@@ -1,6 +1,6 @@
 //
 //  PacketHeaders.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Stephen Birarda on 4/8/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/PacketSender.cpp b/libraries/networking/src/PacketSender.cpp
similarity index 99%
rename from libraries/shared/src/PacketSender.cpp
rename to libraries/networking/src/PacketSender.cpp
index 489b083d92..5f7502a738 100644
--- a/libraries/shared/src/PacketSender.cpp
+++ b/libraries/networking/src/PacketSender.cpp
@@ -1,6 +1,6 @@
 //
 //  PacketSender.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/PacketSender.h b/libraries/networking/src/PacketSender.h
similarity index 99%
rename from libraries/shared/src/PacketSender.h
rename to libraries/networking/src/PacketSender.h
index cc65564461..7d2c0dc8aa 100644
--- a/libraries/shared/src/PacketSender.h
+++ b/libraries/networking/src/PacketSender.h
@@ -1,6 +1,6 @@
 //
 //  PacketSender.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/ReceivedPacketProcessor.cpp b/libraries/networking/src/ReceivedPacketProcessor.cpp
similarity index 98%
rename from libraries/shared/src/ReceivedPacketProcessor.cpp
rename to libraries/networking/src/ReceivedPacketProcessor.cpp
index 8394559524..d54e165285 100644
--- a/libraries/shared/src/ReceivedPacketProcessor.cpp
+++ b/libraries/networking/src/ReceivedPacketProcessor.cpp
@@ -1,6 +1,6 @@
 //
 //  ReceivedPacketProcessor.cpp
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/ReceivedPacketProcessor.h b/libraries/networking/src/ReceivedPacketProcessor.h
similarity index 98%
rename from libraries/shared/src/ReceivedPacketProcessor.h
rename to libraries/networking/src/ReceivedPacketProcessor.h
index a34b43626c..f8306b4896 100644
--- a/libraries/shared/src/ReceivedPacketProcessor.h
+++ b/libraries/networking/src/ReceivedPacketProcessor.h
@@ -1,6 +1,6 @@
 //
 //  ReceivedPacketProcessor.h
-//  libraries/shared/src
+//  libraries/networking/src
 //
 //  Created by Brad Hefta-Gaub on 8/12/13.
 //  Copyright 2013 High Fidelity, Inc.
diff --git a/libraries/shared/src/Syssocket.h b/libraries/networking/src/Syssocket.h
similarity index 100%
rename from libraries/shared/src/Syssocket.h
rename to libraries/networking/src/Syssocket.h
diff --git a/libraries/shared/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp
similarity index 100%
rename from libraries/shared/src/ThreadedAssignment.cpp
rename to libraries/networking/src/ThreadedAssignment.cpp
diff --git a/libraries/shared/src/ThreadedAssignment.h b/libraries/networking/src/ThreadedAssignment.h
similarity index 100%
rename from libraries/shared/src/ThreadedAssignment.h
rename to libraries/networking/src/ThreadedAssignment.h
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 422089a57d..5f4e66ea11 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -22,6 +22,7 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 # link ZLIB
 find_package(ZLIB)
diff --git a/libraries/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt
index b483e3e479..e6c554dbdf 100644
--- a/libraries/particles/CMakeLists.txt
+++ b/libraries/particles/CMakeLists.txt
@@ -23,6 +23,7 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 # link ZLIB
 find_package(ZLIB)
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 6b4dafd8d4..7f9a34492d 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -11,7 +11,6 @@ set(TARGET_NAME shared)
 project(${TARGET_NAME})
 
 find_package(Qt5 COMPONENTS Network Widgets Xml)
-find_package(GnuTLS REQUIRED)
 
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
@@ -33,5 +32,4 @@ if (UNIX AND NOT APPLE)
     target_link_libraries(${TARGET_NAME} "${CMAKE_THREAD_LIBS_INIT}")
 endif (UNIX AND NOT APPLE)
 
-include_directories("${GNUTLS_INCLUDE_DIR}")
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets "${GNUTLS_LIBRARY}")
\ No newline at end of file
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets)
\ No newline at end of file
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index fc54c62d51..42aed77fcb 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -26,7 +26,6 @@
 #include <QtCore/QDebug>
 
 #include "OctalCode.h"
-#include "PacketHeaders.h"
 #include "SharedUtil.h"
 
 quint64 usecTimestamp(const timeval *time) {
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index c4abd4965f..f41c5b8aa2 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -30,8 +30,6 @@
 #include <sys/time.h>
 #endif
 
-#include "PacketHeaders.h"
-
 const int BYTES_PER_COLOR = 3;
 const int BYTES_PER_FLAGS = 1;
 typedef unsigned char rgbColor[BYTES_PER_COLOR];
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index afc0b34b64..1cb838a6f0 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -24,6 +24,7 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 # link ZLIB
 find_package(ZLIB)
diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt
index 0de8fd059e..ce3c542691 100644
--- a/voxel-edit/CMakeLists.txt
+++ b/voxel-edit/CMakeLists.txt
@@ -31,6 +31,9 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 # link in the hifi voxels library
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 
+# link in the hifi networking library
+link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
+
 IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
 ENDIF(WIN32)