diff --git a/FlippR-Driver/networking/CMakeLists.txt b/FlippR-Driver/networking/CMakeLists.txt
index 02df3a7..634e1b1 100644
--- a/FlippR-Driver/networking/CMakeLists.txt
+++ b/FlippR-Driver/networking/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6.2)
 project(flippR_driver_networking)
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/${OUTPUT_PATH}/networking)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/${OUTPUT_PATH}/cli)
 set(SOURCES
         input/SocketHandler.cpp
         output/OutputRequestHandler.cpp
diff --git a/FlippR-Driver/networking/input/SocketHandler.cpp b/FlippR-Driver/networking/input/SocketHandler.cpp
index 57594be..57ae585 100644
--- a/FlippR-Driver/networking/input/SocketHandler.cpp
+++ b/FlippR-Driver/networking/input/SocketHandler.cpp
@@ -11,13 +11,11 @@
 using Poco::Net::StreamSocket;
 using Poco::Net::TCPServerConnection;
 using flippR_driver::input::InputDriver;
-using flippR_driver::input::detail::EventHandler;
+using flippR_driver::input::EventHandler;
 using flippR_driver::input::Event;
 
 namespace flippR_driver
 {
-namespace utility
-{
 namespace networking
 {
 namespace input
@@ -53,7 +51,7 @@ void SocketHandler::handle(Event &event)
   this->queue->push(event);
 }
 
+
 }
 }
 }
-}
\ No newline at end of file
diff --git a/FlippR-Driver/networking/input/SocketHandler.h b/FlippR-Driver/networking/input/SocketHandler.h
index 00a3147..d61f44a 100644
--- a/FlippR-Driver/networking/input/SocketHandler.h
+++ b/FlippR-Driver/networking/input/SocketHandler.h
@@ -14,16 +14,15 @@
 #include "input/InputDriver.h"
 #include "input/EventHandler.h"
 #include "input/Event.h"
+#include "utility/IBlockingQueue.h"
 
 namespace flippR_driver
 {
-namespace utility
-{
 namespace networking
 {
 namespace input
 {
-class SocketHandler : public Poco::Net::TCPServerConnection, flippR_driver::input::detail::EventHandler
+class SocketHandler : public Poco::Net::TCPServerConnection, flippR_driver::input::EventHandler
 {
 public:
   SocketHandler(Poco::Net::StreamSocket streamSocket, std::shared_ptr<flippR_driver::input::InputDriver> input_driver);
@@ -38,6 +37,5 @@ private:
 }
 }
 }
-}
 
 #endif //FLIPPR_CODE_INPUTSOCKETCONNECTION_H
diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp
index 56198f8..74b31d2 100644
--- a/FlippR-Driver/src/input/Event.cpp
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -24,7 +24,7 @@ Event::Event(uint8_t address, int priority, std::string name) :
 std::string Event::getJsonString()
 {
   nlohmann::json json;
-  
+
   json["name"] = this->name;
   json["address"] = this->address;
   json["priority"] = this->priority;