Index: modules/NRPEServer/CMakeLists.txt
===================================================================
--- modules/NRPEServer/CMakeLists.txt	(revision 86632db2e184c2c3c77ebf1b6708c5c1e3356300)
+++ modules/NRPEServer/CMakeLists.txt	(revision 294b37b35f1a7106a9ca956e60755b8d88ebc64a)
@@ -11,8 +11,10 @@
 	stdafx.cpp
 	"${TARGET}.cpp"
-	nrpe_server.cpp
-	nrpe_connection.cpp
-	nrpe_handler.cpp
-	${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.cpp
+	"handler_impl.cpp"
+	${NSCP_INCLUDEDIR}/nrpe/server/server.cpp
+	${NSCP_INCLUDEDIR}/nrpe/server/connection.cpp
+	${NSCP_INCLUDEDIR}/nrpe/server/tcp_connection.cpp
+	${NSCP_INCLUDEDIR}/nrpe/server/ssl_connection.cpp
+	${NSCP_INCLUDEDIR}/nrpe/packet.cpp
 
 	${NSCP_DEF_PLUGIN_CPP}
@@ -26,10 +28,13 @@
 		"${TARGET}.h"
 		"${TARGET}.def"
-		nrpe_server.hpp
-		nrpe_connection.hpp
-		nrpe_handler.hpp
-		nrpe_parser.hpp
+		"handler_impl.hpp"
+		${NSCP_INCLUDEDIR}/nrpe/server/server.hpp
+		${NSCP_INCLUDEDIR}/nrpe/server/connection.hpp
+		${NSCP_INCLUDEDIR}/nrpe/server/tcp_connection.hpp
+		${NSCP_INCLUDEDIR}/nrpe/server/ssl_connection.hpp
+		${NSCP_INCLUDEDIR}/nrpe/server/handler.hpp
+		${NSCP_INCLUDEDIR}/nrpe/server/parser.hpp
 		${NSCP_INCLUDEDIR}/socket_helpers.hpp
-		${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.hpp
+		${NSCP_INCLUDEDIR}/nrpe/packet.hpp
 		${NSCP_INCLUDEDIR}/swap_bytes.hpp