diff --git a/.gitignore b/.gitignore
index 05db4cd..8423e54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 .idea*
 cmake-build-debug/*
-CMakeLists.*
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb52da8..5f99440 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,59 +12,36 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/items/EightDigitDisplay.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/EightDigitDisplay.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/items/SevenDigitDisplay.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/items/SevenDigitDisplay.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/InputSocketConnection.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/InputSocketConnection.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/InputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/InputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputHTTPServer.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputHTTPServer.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputRequestHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputRequestHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputRequestHandlerFactory.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeCCompiler.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeCCompiler.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeCXXCompiler.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeCXXCompiler.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeDetermineCompilerABI_C.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeDetermineCompilerABI_C.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeDetermineCompilerABI_CXX.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeDetermineCompilerABI_CXX.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeSystem.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CMakeSystem.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CompilerIdC/a.out" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CompilerIdC/a.out" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CompilerIdCXX/a.out" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.13.2/CompilerIdCXX/a.out" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/input/detail/EventNotifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/input/detail/EventNotifier.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestDetector.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestDetector.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/1" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/2" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/3" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/4" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/count.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/feature_tests.bin" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/feature_tests.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/C.includecache" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/CXX.includecache" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/lib/easylogging/easylogging++.cc.o" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/depend.internal" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/depend.make" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/flags.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/flags.make" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/cmake-build-debug/flippr_code.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/flippr_code.cbp" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
@@ -77,22 +54,47 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="8" selection-start-line="8" selection-end-line="8" />
+            <state relative-caret-position="680">
+              <caret line="147" column="30" selection-start-line="147" selection-start-column="30" selection-end-line="147" selection-end-column="30" />
+              <folding>
+                <element signature="e#252#282#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/PinController.cpp">
-          <provider selected="true" editor-type-id="text-editor" />
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="480">
+              <caret line="34" column="53" selection-start-line="34" selection-start-column="53" selection-end-line="34" selection-end-column="53" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/Event.h">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="225">
+              <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+            </state>
+          </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>IEventNotifier</find>
+    </findStrings>
+    <replaceStrings>
+      <replace>InputPinController</replace>
+      <replace>EventNotifier</replace>
+    </replaceStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -104,9 +106,7 @@
         <option value="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output_socket_solenoid.json" />
         <option value="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Sound_Config.json" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketHandler.h" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketConnection.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/InputSocketConnection.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/InputSocketHandler.h" />
@@ -130,14 +130,25 @@
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/PinController.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestDetector.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/input/detail/EventNotifier.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="620" />
-    <option name="y" value="220" />
-    <option name="width" value="1400" />
-    <option name="height" value="1000" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="8" />
+    <option name="width" value="1354" />
+    <option name="height" value="752" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -162,34 +173,6 @@
               <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
               <item name="cli" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="contrib" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="contrib" type="462c0819:PsiDirectoryNode" />
-              <item name="json_example" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="contrib" type="462c0819:PsiDirectoryNode" />
-              <item name="json_example" type="462c0819:PsiDirectoryNode" />
-              <item name="output" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="contrib" type="462c0819:PsiDirectoryNode" />
-              <item name="uml" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
               <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -203,21 +186,6 @@
               <item name="include" type="462c0819:PsiDirectoryNode" />
               <item name="input" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-              <item name="output" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-              <item name="output" type="462c0819:PsiDirectoryNode" />
-              <item name="items" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
               <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -230,6 +198,49 @@
               <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="input" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="input" type="462c0819:PsiDirectoryNode" />
+              <item name="detail" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="utility" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="utility" type="462c0819:PsiDirectoryNode" />
+              <item name="networking" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="input" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -239,9 +250,13 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C/C++" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection" />
+      <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility" />
     </key>
@@ -296,12 +311,16 @@
       <workItem from="1553099703873" duration="19000" />
       <workItem from="1555328797931" duration="1612000" />
       <workItem from="1555342450204" duration="1819000" />
-      <workItem from="1556125460506" duration="990000" />
+      <workItem from="1556125460506" duration="1947000" />
+      <workItem from="1556127692532" duration="710000" />
+      <workItem from="1556129966500" duration="735000" />
+      <workItem from="1556134046744" duration="615000" />
+      <workItem from="1556134690177" duration="3655000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="38148000" />
+    <option name="totallyTimeSpent" value="44820000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -313,10 +332,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1920" height="1058" extended-state="6" />
+    <frame x="-4" y="0" width="1928" height="1062" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29348987" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20010673" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -330,150 +349,40 @@
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.32983023" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="10" weight="0.32983023" />
-      <window_info anchor="bottom" id="CMake" order="11" visible="true" weight="0.27096775" />
+      <window_info anchor="bottom" id="CMake" order="11" weight="0.26881722" />
       <window_info anchor="bottom" id="Messages" order="12" weight="0.32983023" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Database" order="3" />
     </layout>
+    <layout-to-restore>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20010673" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32983023" />
+      <window_info anchor="bottom" id="Database Changes" order="7" />
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.32983023" />
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="10" weight="0.32983023" />
+      <window_info anchor="bottom" id="CMake" order="11" visible="true" weight="0.26881722" />
+      <window_info anchor="bottom" id="Messages" order="12" weight="0.32983023" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Database" order="3" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/DriverFactory.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Sound_Config.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="40" selection-start-line="7" selection-start-column="40" selection-end-line="7" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/DriverBoardPinController.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/OutputDriverFactory.cpp">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/BlockingQueue.hpp">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3190">
-          <caret line="145" column="57" selection-start-line="145" selection-start-column="57" selection-end-line="145" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketConnection.cpp" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketConnection.h" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/Item.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/ItemRequestHandler.cpp" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/ItemRequestHandler.h" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/LampRequestHandler.h" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/SolenoidRequestHandler.h" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/SolenoidRequestHandler.cpp" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/LampRequestHandler.cpp" />
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="18" column="77" selection-start-line="18" selection-start-column="77" selection-end-line="18" selection-end-column="77" />
-          <folding>
-            <element signature="e#132#158#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="49" lean-forward="true" selection-start-line="4" selection-start-column="49" selection-end-line="4" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="118">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/LoggerFactory.cpp">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/LoggerFactory.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/DisplayController.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/DisplayBoardPinController.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Sound.h">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -522,6 +431,61 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#43#79#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+          <folding>
+            <element signature="e#164#207#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/BlockingQueue.hpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#210#226#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/DisplayBoardPinController.h">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/OutputPinController.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#131#163#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/SoundBoardPinController.h">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/OutputPinController.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#222#248#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.cpp">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -534,7 +498,7 @@
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
-          <caret line="10" selection-start-line="10" selection-end-line="11" selection-end-column="17" />
+          <caret line="10" selection-start-line="10" selection-end-line="16" selection-end-column="45" />
           <folding>
             <element signature="e#211#228#0" expanded="true" />
           </folding>
@@ -557,6 +521,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="118">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -564,54 +535,218 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp">
+    <entry file="file:///usr/local/include/Poco/Net/HTTPServerParams.h">
       <provider selected="true" editor-type-id="text-editor">
         <state>
-          <folding>
-            <element signature="e#43#79#0" expanded="true" />
-          </folding>
+          <caret selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.h">
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-          <folding>
-            <element signature="e#164#207#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="135">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp">
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" selection-start-line="28" selection-end-line="28" />
-          <folding>
-            <element signature="e#43#74#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="60">
+          <caret line="4" column="25" lean-forward="true" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.cpp">
+    <entry file="file:///usr/local/include/Poco/Net/Socket.h">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/PinController.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="48" selection-start-line="17" selection-start-column="48" selection-end-line="17" selection-end-column="48" />
+          <folding>
+            <element signature="e#130#161#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="17" column="35" lean-forward="true" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
+          <folding>
+            <element signature="e#120#148#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2520">
+          <caret line="168" column="5" selection-start-line="168" selection-start-column="5" selection-end-line="168" selection-end-column="5" />
+          <folding>
+            <element signature="e#42#82#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5">
+          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/DriverFactory.cpp">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/InputPinController.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputPinController.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="24" column="52" lean-forward="true" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/EventHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/EventNotifier.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="21" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/Detector.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-215" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/EventNotifier.h">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/EventHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="28" column="42" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+          <folding>
+            <element signature="e#132#152#0" expanded="true" />
+            <element signature="e#220#254#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
+          <folding>
+            <element signature="e#130#150#0" expanded="true" />
+            <element signature="e#217#251#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestDetector.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1920">
+          <caret line="128" column="14" selection-start-line="128" selection-start-column="14" selection-end-line="128" selection-end-column="14" />
+          <folding>
+            <element signature="e#127#147#0" expanded="true" />
+            <element signature="e#250#282#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/include/boost/optional/optional.hpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="714" column="2" selection-start-line="714" selection-start-column="2" selection-end-line="714" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/Event.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="34" column="53" selection-start-line="34" selection-start-column="53" selection-end-line="34" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="680">
+          <caret line="147" column="30" selection-start-line="147" selection-start-column="30" selection-end-line="147" selection-end-column="30" />
+          <folding>
+            <element signature="e#252#282#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cd4679..d00218b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,12 +172,12 @@ add_executable(flippr_code
         FlippR-Driver/src/utility/BlockingQueue.hpp
         FlippR-Driver/src/utility/config.h
         FlippR-Driver/src/utility/IBlockingQueue.h
-        FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp
-        FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h
+        FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
+        FlippR-Driver/src/utility/networking/input/InputSocketHandler.h
         FlippR-Driver/src/utility/LoggerFactory.cpp
         FlippR-Driver/src/utility/LoggerFactory.h
-        FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp
-        FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h
+        FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
+        FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h
         FlippR-Driver/src/utility/SocketHandler.cpp
         FlippR-Driver/src/utility/SocketHandler.h
         FlippR-Driver/src/DriverFactory.cpp
@@ -197,4 +197,4 @@ add_executable(flippr_code
         FlippR-Driver/tests/catch.hpp
         FlippR-Driver/tests/fakeit.hpp
         FlippR-Driver/tests/main.cpp
-        FlippR-Driver/CMakeLists.txt FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h)
+        FlippR-Driver/CMakeLists.txt FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h)
diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt
index 90d042b..9373a55 100644
--- a/FlippR-Driver/CMakeLists.txt
+++ b/FlippR-Driver/CMakeLists.txt
@@ -143,7 +143,8 @@ endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE ${Threads_LIBRARIES})
 
 ####################### POCO ##############################
-find_package(Poco REQUIRED COMPONENTS Foundation Net JSON )
+include(${CMAKE_SOURCE_DIR}/lib/PocoConfig.cmake)
+#find_package(Poco REQUIRED COMPONENTS Foundation Net JSON )
 if(NOT Poco_FOUND)
     message(FATAL_ERROR, "Could not find libPoco")
 endif()
diff --git a/FlippR-Driver/src/input/detail/EventNotifier.h b/FlippR-Driver/src/input/detail/EventNotifier.h
index 8915871..715cb9d 100644
--- a/FlippR-Driver/src/input/detail/EventNotifier.h
+++ b/FlippR-Driver/src/input/detail/EventNotifier.h
@@ -8,6 +8,10 @@
 #ifndef INPUT_IMPL_EVENTNOTIFIER_H_
 #define INPUT_IMPL_EVENTNOTIFIER_H_
 
+#include <set>
+#include <thread>
+#include <mutex>
+
 #include "input/EventNotifier.h"
 
 #include "input/Event.h"
@@ -16,10 +20,6 @@
 #include "utility/BlockingQueue.hpp"
 #include "utility/IBlockingQueue.h"
 
-#include <set>
-#include <thread>
-#include <mutex>
-
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/src/utility/SocketHandler.cpp b/FlippR-Driver/src/utility/SocketHandler.cpp
index c580841..cc4e197 100644
--- a/FlippR-Driver/src/utility/SocketHandler.cpp
+++ b/FlippR-Driver/src/utility/SocketHandler.cpp
@@ -8,13 +8,13 @@ namespace flippR_driver
 {
 namespace utility
 {
-using namespace nlohmann;
+//using namespace nlohmann;
 
-SocketHandler::SocketHandler(boost::asio::io_service &service, std::string socket_file) : socket(boost::asio::io_service{})
+SocketHandler::SocketHandler(std::string socket_file)
 {
-  this->socket.connect(socket_file);
+  //this->socket.connect(socket_file);
 }
-
+/*
 SocketHandler::create_client(const std::string& socket_file)
 {
     this->socket.connect(socket_file);
@@ -31,6 +31,6 @@ void SocketHandler::write_to_socket(json &json)
 
   boost::asio::write(this->socket, boost::asio::buffer(json_data, json_data.length()));
 }
-
+*/
 }
 }
\ No newline at end of file
diff --git a/FlippR-Driver/src/utility/SocketHandler.h b/FlippR-Driver/src/utility/SocketHandler.h
index 5f49819..b8d76c8 100644
--- a/FlippR-Driver/src/utility/SocketHandler.h
+++ b/FlippR-Driver/src/utility/SocketHandler.h
@@ -18,7 +18,7 @@ public:
   SocketHandler(std::string socket_file);
 
 protected:
-  boost::asio::local::stream_protocol::socket socket;
+  Poco::Net::Socket socket;
 
 protected:
   void write_to_socket(std::string &data);
diff --git a/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.cpp b/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp
similarity index 100%
rename from FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.cpp
rename to FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp
diff --git a/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.h b/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h
similarity index 100%
rename from FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.h
rename to FlippR-Driver/src/utility/networking/input/InputSocketConnection.h
diff --git a/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp b/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
new file mode 100644
index 0000000..a07d9c4
--- /dev/null
+++ b/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
@@ -0,0 +1,44 @@
+//
+// Created by rhetenor on 27.11.18.
+//
+
+#include "InputSocketHandler.h"
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+#include "json/json.hpp"
+
+namespace flippR_driver
+{
+namespace utility
+{
+using namespace nlohmann;
+
+InputSocketHandler::InputSocketHandler()
+{}
+
+void InputSocketHandler::handle(flippR_driver::input::Event &event)
+{
+  json event_serialization = serialize_event(event);
+
+//  write_to_socket(event_serialization);
+}
+
+//json InputSocketHandler::serialize_event(input::Event &event)
+//{
+//  json serialized_event = json("event");
+//
+//  serialized_event["name"] = event.name;
+//
+//  std::time_t activation_time = std::chrono::system_clock::to_time_t(event.last_activation);
+//  boost::posix_time::ptime posix_time = boost::posix_time::from_time_t(activation_time);
+//  serialized_event["activation_time"] = boost::posix_time::to_simple_string(posix_time); // todo learn to write time right
+//
+//  serialized_event["priority"] = event.priority;
+//
+//  return serialized_event;
+//}
+
+
+}
+}
diff --git a/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h b/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h
similarity index 100%
rename from FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h
rename to FlippR-Driver/src/utility/networking/input/InputSocketHandler.h
diff --git a/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp b/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp
deleted file mode 100644
index c2538ee..0000000
--- a/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Created by rhetenor on 27.11.18.
-//
-
-#include "InputSocketHandler.h"
-
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-#include "json.hpp"
-
-namespace flippR_driver
-{
-namespace utility
-{
-using namespace nlohmann;
-
-InputSocketHandler::InputSocketHandler(boost::asio::io_service &service, std::string socket_file) : SocketHandler(service, std::move(socket_file)) {}
-
-void InputSocketHandler::handle(flippR_driver::input::Event &event)
-{
-  json event_serialization = serialize_event(event);
-
-  write_to_socket(event_serialization);
-}
-
-json InputSocketHandler::serialize_event(input::Event &event)
-{
-  json serialized_event = json("event");
-
-  serialized_event["name"] = event.name;
-
-  std::time_t activation_time = std::chrono::system_clock::to_time_t(event.last_activation);
-  boost::posix_time::ptime posix_time = boost::posix_time::from_time_t(activation_time);
-  serialized_event["activation_time"] = boost::posix_time::to_simple_string(posix_time); // todo learn to write time right
-
-  serialized_event["priority"] = event.priority;
-
-  return serialized_event;
-}
-
-
-}
-}
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp b/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp
similarity index 100%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp
rename to FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h b/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h
similarity index 100%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h
rename to FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp b/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp
similarity index 94%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp
rename to FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp
index 0263e73..53f665a 100644
--- a/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp
+++ b/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp
@@ -50,7 +50,8 @@ void OutputRequestHandler::handleRequest(HTTPServerRequest &request,
   }
   catch(const Poco::InvalidArgumentException &e)
   {
-    response.setStatusAndReason(HTTPServerResponse::HTTP_REASON_BAD_REQUEST, e.displayText());
+//    TODO not compiling
+//    response.setStatusAndReason(HTTPServerResponse::HTTP_REASON_BAD_REQUEST, e.displayText());
   }
 }
 
@@ -162,8 +163,9 @@ void OutputRequestHandler::parseDisplay(const std::string& item_name, const std:
   {
     try
     {
-        unsigned int score = std::stoi(score);
-        display->write_score(score);
+      //TODO not compiling
+//        unsigned int score = std::stoi(score);
+//        display->write_score(score);
     }
     catch(std::invalid_argument &e)
     {
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h b/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h
similarity index 100%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h
rename to FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp b/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp
similarity index 100%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp
rename to FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h b/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h
similarity index 88%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h
rename to FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h
index 31df1d7..56380d4 100644
--- a/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h
+++ b/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h
@@ -15,7 +15,7 @@ namespace flippR_driver
 namespace utility
 {
 
-class OutputRequestHandlerFactory :: public Poco::Net::HTTPRequestHandlerFactory
+class OutputRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory
 {
 public:
   explicit OutputRequestHandlerFactory(std::shared_ptr<output::OutputDriver> output_driver);
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp b/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
similarity index 100%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp
rename to FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
diff --git a/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h b/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h
similarity index 91%
rename from FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h
rename to FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h
index 9e8c9b0..25cbf61 100644
--- a/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h
+++ b/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h
@@ -5,7 +5,7 @@
 #ifndef FLIPPR_DRIVER_OUTPUTSOCKETHANDLER_H
 #define FLIPPR_DRIVER_OUTPUTSOCKETHANDLER_H
 
-#include "SocketHandler.h"
+#include "utility/SocketHandler.h"
 #include "output/OutputDriver.h"
 
 namespace flippR_driver
diff --git a/FlippR-Driver/tests/input/TestDetector.cpp b/FlippR-Driver/tests/input/TestDetector.cpp
index ab3a167..40cce88 100644
--- a/FlippR-Driver/tests/input/TestDetector.cpp
+++ b/FlippR-Driver/tests/input/TestDetector.cpp
@@ -11,14 +11,15 @@
 
 #include <map>
 #include <typeinfo>
+#include <thread>
 
 
 #define private public
 
-#include "input/IEventNotifier.h"
+#include "input/EventNotifier.h"
 #include "input/DistributingEvent.h"
-#include "input/Detector.h"
-#include "input/IInputGPIOInterface.h"
+#include "input/detail/Detector.h"
+#include "input/detail/InputPinController.h"
 #include "utility/LoggerFactory.h"
 
 
@@ -34,8 +35,8 @@ SCENARIO("Creating a Detector object", "")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<IEventNotifier> event_notifier_mock;
-    Mock<IInputGPIOInterface> gpio_interface_mock;
+    Mock<EventNotifier> event_notifier_mock;
+    Mock<InputPinController> gpio_interface_mock;
 
     Fake(Dtor(gpio_interface_mock));
     When(Method(gpio_interface_mock, read_data)).AlwaysReturn(false);
@@ -47,7 +48,7 @@ SCENARIO("Creating a Detector object", "")
 
     WHEN("Detector is created")
     {
-      Detector detector(std::unique_ptr<IInputGPIOInterface>(&gpio_interface_mock.get()), events);
+      detail::Detector detector(std::unique_ptr<InputPinController>(&gpio_interface_mock.get()), events);
       THEN("a thread should be created")
       {
         REQUIRE(typeid(detector.detect_thread).hash_code() == typeid(std::thread).hash_code());
@@ -58,12 +59,12 @@ SCENARIO("Creating a Detector object", "")
 
 SCENARIO("There are events at the input", "")
 {
-  GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface")
+  GIVEN("An IEventNofifier, three Events and an InputPinController")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<IEventNotifier> event_notifier_mock;
-    Mock<IInputGPIOInterface> gpio_interface_mock;
+    Mock<EventNotifier> event_notifier_mock;
+    Mock<InputPinController> gpio_interface_mock;
 
     Fake(Dtor(gpio_interface_mock));
     When(Method(gpio_interface_mock, read_data)).AlwaysDo([](char c){return c==2;});
@@ -71,7 +72,7 @@ SCENARIO("There are events at the input", "")
     Fake(Dtor(event_notifier_mock));
     When(Method(event_notifier_mock, distribute_event)).AlwaysReturn();
 
-    std::shared_ptr<IEventNotifier> event_notifier;
+    std::shared_ptr<EventNotifier> event_notifier;
     DistributingEvent event1(1, '1', "event 1", std::chrono::milliseconds(0), event_notifier);
     DistributingEvent event2(2, '2', "event 2", std::chrono::milliseconds(0), event_notifier);
     DistributingEvent event3(3, '3', "event 3", std::chrono::milliseconds(0), event_notifier);
@@ -85,7 +86,7 @@ SCENARIO("There are events at the input", "")
 
     WHEN("an event can be found at gpio interface")
     {
-      Detector detector(std::unique_ptr<IInputGPIOInterface>(&gpio_interface_mock.get()), events);
+      detail::Detector detector(std::unique_ptr<InputPinController>(&gpio_interface_mock.get()), events);
       std::this_thread::sleep_for(std::chrono::milliseconds(50));
       THEN("the event should be distributed")
       {
@@ -99,12 +100,12 @@ SCENARIO("There are events at the input", "")
 
 SCENARIO("There are events at the input but no suitable event in map", "")
 {
-  GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface")
+  GIVEN("An IEventNofifier, three Events and an InputPinController")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<IEventNotifier> event_notifier_mock;
-    Mock<IInputGPIOInterface> gpio_interface_mock;
+    Mock<EventNotifier> event_notifier_mock;
+    Mock<InputPinController> gpio_interface_mock;
 
     Fake(Dtor(gpio_interface_mock));
     When(Method(gpio_interface_mock, read_data)).AlwaysDo([](char c){return c==4;});
@@ -112,7 +113,7 @@ SCENARIO("There are events at the input but no suitable event in map", "")
     Fake(Dtor(event_notifier_mock));
     When(Method(event_notifier_mock, distribute_event)).AlwaysReturn();
 
-    std::shared_ptr<IEventNotifier> event_notifier;
+    std::shared_ptr<EventNotifier> event_notifier;
     DistributingEvent event1(1, '1', "event 1", std::chrono::milliseconds(0), event_notifier);
     DistributingEvent event2(2, '2', "event 2", std::chrono::milliseconds(0), event_notifier);
     DistributingEvent event3(3, '3', "event 3", std::chrono::milliseconds(0), event_notifier);
@@ -125,7 +126,7 @@ SCENARIO("There are events at the input but no suitable event in map", "")
 
     WHEN("an event can be found at gpio interface")
     {
-      Detector detector(std::unique_ptr<IInputGPIOInterface>(&gpio_interface_mock.get()), events);
+      detail::Detector detector(std::unique_ptr<InputPinController>(&gpio_interface_mock.get()), events);
       std::this_thread::sleep_for(std::chrono::milliseconds(10));
       THEN("the event should be distributed")
       {
diff --git a/FlippR-Driver/tests/input/TestEventHandler.cpp b/FlippR-Driver/tests/input/TestEventHandler.cpp
index 10de7d9..1084860 100644
--- a/FlippR-Driver/tests/input/TestEventHandler.cpp
+++ b/FlippR-Driver/tests/input/TestEventHandler.cpp
@@ -8,14 +8,13 @@
 #include "catch.hpp"
 #include "fakeit.hpp"
 
-#include "utility/LoggerFactory.h"
-#include "input/EventHandler.h"
-#include "input/IInputDriver.h"
-
-
 // testing purposes
 #define private public
 
+#include "utility/LoggerFactory.h"
+#include "input/detail/EventHandler.h"
+#include "input/InputDriver.h"
+
 
 using namespace fakeit;
 using namespace flippR_driver::utility;
@@ -26,15 +25,15 @@ SCENARIO("An EventHandler gets created", "[construction}")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<flippR_driver::input::IInputDriver> input_driver_mock;
+    Mock<flippR_driver::input::InputDriver> input_driver_mock;
     Fake(Dtor(input_driver_mock));
     When(Method(input_driver_mock, register_event_handler)).AlwaysReturn();
     When(Method(input_driver_mock, unregister_event_handler)).AlwaysReturn();
 
     WHEN("the event handler gets created")
     {
-      std::shared_ptr<flippR_driver::input::IInputDriver> driver_ptr(&input_driver_mock.get());
-      flippR_driver::input::EventHandler handler(driver_ptr);
+      std::shared_ptr<flippR_driver::input::InputDriver> driver_ptr(&input_driver_mock.get());
+      flippR_driver::input::detail::EventHandler handler(driver_ptr);
 
       THEN("It should register itself at the input_driver")
       {
diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp
index 6032695..fb8681f 100644
--- a/FlippR-Driver/tests/input/TestEventNotifier.cpp
+++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp
@@ -9,17 +9,17 @@
 #include "catch.hpp"
 #include "fakeit.hpp"
 
-
-#include "utility/LoggerFactory.h"
-#include "input/IEventHandler.h"
-#include "utility/IBlockingQueue.h"
-
-
 // testing purposes
 #define private public
 
+#include "utility/LoggerFactory.h"
+#include "input/EventHandler.h"
+#include "utility/IBlockingQueue.h"
+#include "input/detail/EventNotifier.h"
+
 #include "input/EventNotifier.h"
 
+
 using namespace flippR_driver;
 using namespace input;
 using namespace fakeit;
@@ -38,7 +38,7 @@ SCENARIO("An EventNotifier gets created", "[construction]")
     When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
     Fake(Dtor(queue_mock));
 
-    EventNotifier notifier(&(queue_mock.get()));
+    input::detail::EventNotifier notifier(&(queue_mock.get()));
     THEN("It sets the running variable to true")
     {
       REQUIRE(notifier.is_running);
@@ -63,11 +63,11 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no
     When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
     Fake(Dtor(queue_mock));
 
-    Mock<IEventHandler> event_handler_mock;
+    Mock<input::EventHandler> event_handler_mock;
     Fake(Method(event_handler_mock, handle));
     Fake(Dtor(event_handler_mock));
 
-    EventNotifier notifier(&(queue_mock.get()));
+    input::detail::EventNotifier notifier(&(queue_mock.get()));
 
     WHEN("The EventHandler gets registered at the eventNotifier")
     {
@@ -105,7 +105,7 @@ SCENARIO("An event should be distributed", "[distribute]")
     When(Method(queue_mock, pop)).AlwaysDo([event](){return event;});
     Fake(Dtor(queue_mock));
 
-    EventNotifier notifier(&(queue_mock.get()));
+    input::detail::EventNotifier notifier(&(queue_mock.get()));
 
     WHEN("The event comes in")
     {
@@ -126,7 +126,7 @@ SCENARIO("The EventHandler gets notified")
   {
     Event event(0, 0, "test");
 
-    Mock<IEventHandler> event_handler_mock;
+    Mock<input::EventHandler> event_handler_mock;
     When(Method(event_handler_mock, handle)).AlwaysReturn();
     Fake(Dtor(event_handler_mock));
 
@@ -137,7 +137,7 @@ SCENARIO("The EventHandler gets notified")
     When(Method(queue_mock, pop)).AlwaysDo([test_event](void){return test_event;});
     Fake(Dtor(queue_mock));
 
-    EventNotifier notifier(&(queue_mock.get()));
+    input::detail::EventNotifier notifier(&(queue_mock.get()));
 
     notifier.event_handlers.insert(&(event_handler_mock.get()));
 
diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp
index daa858f..91aeef7 100644
--- a/FlippR-Driver/tests/input/TestInputDriver.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriver.cpp
@@ -12,10 +12,10 @@
 // testing purposes
 #define private public
 
-#include "input/InputDriver.h"
+#include "input/detail/InputDriver.h"
 
-#include "input/IEventNotifier.h"
-#include "input/IDetector.h"
+#include "input/EventNotifier.h"
+#include "input/Detector.h"
 
 
 using namespace fakeit;
@@ -29,19 +29,17 @@ SCENARIO("An InputDriver gets created", "[construction}")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<IDetector> detector_mock;
+    Mock<Detector> detector_mock;
     Fake(Dtor(detector_mock));
 
-    Mock<IEventNotifier> event_notifier_mock;
+    Mock<EventNotifier> event_notifier_mock;
     Fake(Dtor(event_notifier_mock));
-    Mock<IEventHandler> event_handler_mock;
-    Fake(Dtor(event_handler_mock));
     WHEN("The InputDriver gets created")
     {
-      std::shared_ptr<IEventNotifier> event_notifier_ptr(&event_notifier_mock.get());
+      std::shared_ptr<EventNotifier> event_notifier_ptr(&event_notifier_mock.get());
       std::map<std::string, std::shared_ptr<Event>> events;
 
-      InputDriver input_driver(event_notifier_ptr, std::unique_ptr<IDetector>(&detector_mock.get()), events);
+      input::detail::InputDriver input_driver(event_notifier_ptr, std::unique_ptr<Detector>(&detector_mock.get()), events);
 
       THEN("It saves the EventNotifier and the Detector")
       {
@@ -58,23 +56,23 @@ SCENARIO("An EventHandler [un]registers at the driver", "[un-register]")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<flippR_driver::input::IDetector> detector_mock;
+    Mock<flippR_driver::input::Detector> detector_mock;
     Fake(Dtor(detector_mock));
 
-    Mock<IEventHandler> event_handler_mock;
+    Mock<input::EventHandler> event_handler_mock;
     Fake(Method(event_handler_mock, handle));
     Fake(Dtor(event_handler_mock));
 
-    Mock<flippR_driver::input::IEventNotifier> event_notifier_mock;
+    Mock<flippR_driver::input::EventNotifier> event_notifier_mock;
     Fake(Method(event_notifier_mock, register_event_handler));
     Fake(Method(event_notifier_mock, unregister_event_handler));
     Fake(Dtor(event_notifier_mock));
 
-    std::shared_ptr<IEventNotifier> event_notifier_ptr(&event_notifier_mock.get());
+    std::shared_ptr<EventNotifier> event_notifier_ptr(&event_notifier_mock.get());
 
     std::map<std::string, std::shared_ptr<Event>> events;
 
-    InputDriver input_driver(event_notifier_ptr, std::unique_ptr<IDetector>(&detector_mock.get()), events);
+    input::detail::InputDriver input_driver(event_notifier_ptr, std::unique_ptr<Detector>(&detector_mock.get()), events);
 
     WHEN("The EventHandler registers at the driver")
     {
@@ -105,16 +103,16 @@ SCENARIO("An Input Driver is created normally", "")
   {
     LoggerFactory::CreateInputTestLogger();
 
-    Mock<flippR_driver::input::IDetector> detector_mock;
+    Mock<flippR_driver::input::Detector> detector_mock;
     Fake(Dtor(detector_mock));
 
-    Mock<IEventHandler> event_handler_mock;
+    Mock<input::EventHandler> event_handler_mock;
     Fake(Dtor(event_handler_mock));
 
-    Mock<flippR_driver::input::IEventNotifier> event_notifier_mock;
+    Mock<flippR_driver::input::EventNotifier> event_notifier_mock;
     Fake(Dtor(event_notifier_mock));
 
-    std::shared_ptr<IEventNotifier> event_notifier_ptr(&event_notifier_mock.get());
+    std::shared_ptr<EventNotifier> event_notifier_ptr(&event_notifier_mock.get());
 
     Event event1('a', 2, "e1");
     auto event1_ptr = std::make_shared<Event>(event1  );
@@ -129,7 +127,7 @@ SCENARIO("An Input Driver is created normally", "")
     events.emplace("e4", std::make_shared<Event>(event4));
 
 
-    InputDriver input_driver(event_notifier_ptr, std::unique_ptr<IDetector>(&detector_mock.get()), events);
+    input::detail::InputDriver input_driver(event_notifier_ptr, std::unique_ptr<Detector>(&detector_mock.get()), events);
 
     WHEN("Someone asks for an event that is registered")
     {
@@ -147,7 +145,7 @@ SCENARIO("An Input Driver is created normally", "")
 
       THEN("the obtained event should be null")
       {
-        REQUIRE(event->name == "ERROR");
+        REQUIRE(event->get()->name == "ERROR");
       }
     }
   }
diff --git a/cmake-build-debug/CMakeFiles/Makefile.cmake b/cmake-build-debug/CMakeFiles/Makefile.cmake
index fbe822b..d6b702e 100644
--- a/cmake-build-debug/CMakeFiles/Makefile.cmake
+++ b/cmake-build-debug/CMakeFiles/Makefile.cmake
@@ -7,85 +7,20 @@ set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
 # The top level Makefile was generated from the following files:
 set(CMAKE_MAKEFILE_DEPENDS
   "CMakeCache.txt"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCCompiler.cmake.in"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCCompilerABI.c"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCInformation.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCXXCompiler.cmake.in"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCXXCompilerABI.cpp"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCXXInformation.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCommonLanguageInclude.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeCompilerIdDetection.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineCCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineCXXCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineCompileFeatures.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineCompilerABI.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineCompilerId.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeDetermineSystem.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeFindBinUtils.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeFindCodeBlocks.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeGenericSystem.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeInitializeConfigs.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeLanguageInformation.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeParseImplicitLinkInfo.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeSystem.cmake.in"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeSystemSpecificInformation.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeSystemSpecificInitialize.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeTestCCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeTestCXXCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeTestCompilerCommon.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/CMakeUnixFindMake.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/ADSP-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Borland-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Clang-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Cray-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GHS-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-C-FeatureTests.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-C.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-CXX-FeatureTests.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-CXX.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU-FindBinUtils.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/GNU.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/HP-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/IAR-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Intel-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/MIPSpro-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/MSVC-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/PGI-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/PathScale-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/SCO-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/TI-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/Watcom-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/XL-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Internal/FeatureTesting.cmake"
-  "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Platform/Linux-Determine-CXX.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Platform/Linux-GNU-C.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Platform/Linux-GNU-CXX.cmake"
   "/home/johannes/bin/clion-2018.3.4/bin/cmake/linux/share/cmake-3.13/Modules/Platform/Linux-GNU.cmake"
@@ -96,8 +31,6 @@ set(CMAKE_MAKEFILE_DEPENDS
   "CMakeFiles/3.13.2/CMakeCCompiler.cmake"
   "CMakeFiles/3.13.2/CMakeCXXCompiler.cmake"
   "CMakeFiles/3.13.2/CMakeSystem.cmake"
-  "CMakeFiles/feature_tests.c"
-  "CMakeFiles/feature_tests.cxx"
   )
 
 # The corresponding makefile is:
@@ -108,11 +41,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
 
 # Byproducts of CMake generate step:
 set(CMAKE_MAKEFILE_PRODUCTS
-  "CMakeFiles/3.13.2/CMakeSystem.cmake"
-  "CMakeFiles/3.13.2/CMakeCCompiler.cmake"
-  "CMakeFiles/3.13.2/CMakeCXXCompiler.cmake"
-  "CMakeFiles/3.13.2/CMakeCCompiler.cmake"
-  "CMakeFiles/3.13.2/CMakeCXXCompiler.cmake"
   "CMakeFiles/CMakeDirectoryInformation.cmake"
   )
 
diff --git a/cmake-build-debug/CMakeFiles/clion-log.txt b/cmake-build-debug/CMakeFiles/clion-log.txt
index b1a006a..fb8b662 100644
--- a/cmake-build-debug/CMakeFiles/clion-log.txt
+++ b/cmake-build-debug/CMakeFiles/clion-log.txt
@@ -1,18 +1,4 @@
 /home/johannes/bin/clion-2018.3.4/bin/cmake/linux/bin/cmake -DCMAKE_BUILD_TYPE=Debug -G "CodeBlocks - Unix Makefiles" /home/johannes/git/flippr-code
--- The C compiler identification is GNU 7.3.0
--- The CXX compiler identification is GNU 7.3.0
--- Check for working C compiler: /usr/bin/cc
--- Check for working C compiler: /usr/bin/cc -- works
--- Detecting C compiler ABI info
--- Detecting C compiler ABI info - done
--- Detecting C compile features
--- Detecting C compile features - done
--- Check for working CXX compiler: /usr/bin/c++
--- Check for working CXX compiler: /usr/bin/c++ -- works
--- Detecting CXX compiler ABI info
--- Detecting CXX compiler ABI info - done
--- Detecting CXX compile features
--- Detecting CXX compile features - done
 -- Configuring done
 -- Generating done
 -- Build files have been written to: /home/johannes/git/flippr-code/cmake-build-debug
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake b/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
index d229707..ad2103b 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
@@ -87,13 +87,13 @@ set(CMAKE_DEPENDS_CHECK_CXX
   "/home/johannes/git/flippr-code/FlippR-Driver/src/output/items/detail/Lamp.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Lamp.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/output/items/detail/Solenoid.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Solenoid.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/output/items/detail/Sound.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o"
-  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/InputSocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/LoggerFactory.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o"
-  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputHTTPServer.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o"
-  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o"
-  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o"
-  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputSocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/SocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/tests/input/TestDetector.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestDetector.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/tests/input/TestEventHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventHandler.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/tests/input/TestEventNotifier.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventNotifier.cpp.o"
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make b/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
index db20093..7caf8d5 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
@@ -798,18 +798,18 @@ CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.s: c
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.s"
 	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/output/OutputPinController.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.s
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o: ../FlippR-Driver/src/utility/InputSocketHandler.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_58) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/InputSocketHandler.cpp
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o: ../FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_58) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/InputSocketHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.i
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/InputSocketHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.s
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
 
 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o: CMakeFiles/flippr_code.dir/flags.make
 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o: ../FlippR-Driver/src/utility/LoggerFactory.cpp
@@ -824,18 +824,18 @@ CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.s: cmake_
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.s"
 	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/LoggerFactory.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.s
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o: ../FlippR-Driver/src/utility/OutputSocketHandler.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_60) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputSocketHandler.cpp
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o: ../FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_60) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputSocketHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.i
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputSocketHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.s
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s
 
 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o: ../FlippR-Driver/src/utility/SocketHandler.cpp
@@ -1032,44 +1032,44 @@ CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.s: cmake_force
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.s"
 	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/tests/main.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.s
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o: ../FlippR-Driver/src/utility/OutputRequestHandler.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_76) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandler.cpp
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o: ../FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_76) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.i
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.s
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o: CMakeFiles/flippr_code.dir/flags.make
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o: ../FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_77) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o: ../FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_77) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o: CMakeFiles/flippr_code.dir/flags.make
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o: ../FlippR-Driver/src/utility/OutputHTTPServer.cpp
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_78) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputHTTPServer.cpp
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o: ../FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_78) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputHTTPServer.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.i
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputHTTPServer.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.s
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s
 
 # Object files for target flippr_code
 flippr_code_OBJECTS = \
@@ -1130,9 +1130,9 @@ flippr_code_OBJECTS = \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o" \
-"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o" \
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o" \
-"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o" \
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o" \
@@ -1148,9 +1148,9 @@ flippr_code_OBJECTS = \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o" \
-"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o" \
-"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o" \
-"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o"
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o" \
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o" \
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
 
 # External object files for target flippr_code
 flippr_code_EXTERNAL_OBJECTS =
@@ -1212,9 +1212,9 @@ flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/So
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o
-flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o
-flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o
@@ -1230,9 +1230,9 @@ flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputIte
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o
-flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o
-flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o
-flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/build.make
 flippr_code: CMakeFiles/flippr_code.dir/link.txt
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_79) "Linking CXX executable flippr_code"
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake b/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
index fdfcfe5..c0937d1 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
@@ -56,9 +56,9 @@ file(REMOVE_RECURSE
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o"
-  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o"
-  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o"
@@ -74,9 +74,9 @@ file(REMOVE_RECURSE
   "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o"
-  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o"
-  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o"
-  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
   "flippr_code.pdb"
   "flippr_code"
 )
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt b/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt
index 01289eb..40368bf 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt
@@ -1 +1 @@
-/usr/bin/c++  -g   CMakeFiles/flippr_code.dir/FlippR-Driver/cli/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/cli/PrintHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/easylogging/easylogging++.cc.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ads1115.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/bmp180.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcNet.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ds18b20.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/htu21d.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max31855.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max5322.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23008.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23016.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23017.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s08.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s17.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3002.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3004.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3422.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp4802.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8574.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8591.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piHiPri.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piThread.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pseudoPins.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/rht03.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sn3218.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softPwm.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softServo.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softTone.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sr595.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPi.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiI2C.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiSPI.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringShift.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wpiExtensions.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/Detector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/DistributingEvent.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/Event.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/InputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/OutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Display.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Item.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Lamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Solenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestDetector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestInputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplay.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestLamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputItem.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o  -o flippr_code 
+/usr/bin/c++  -g   CMakeFiles/flippr_code.dir/FlippR-Driver/cli/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/cli/PrintHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/easylogging/easylogging++.cc.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ads1115.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/bmp180.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcNet.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ds18b20.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/htu21d.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max31855.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max5322.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23008.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23016.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23017.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s08.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s17.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3002.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3004.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3422.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp4802.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8574.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8591.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piHiPri.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piThread.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pseudoPins.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/rht03.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sn3218.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softPwm.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softServo.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softTone.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sr595.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPi.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiI2C.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiSPI.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringShift.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wpiExtensions.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/Detector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/DistributingEvent.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/Event.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/InputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/OutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Display.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Item.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Lamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Solenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestDetector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestInputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplay.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestLamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputItem.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o  -o flippr_code 
diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile
index a7d37df..c13104f 100644
--- a/cmake-build-debug/Makefile
+++ b/cmake-build-debug/Makefile
@@ -1716,33 +1716,6 @@ FlippR-Driver/src/output/items/detail/Sound.cpp.s:
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.s
 .PHONY : FlippR-Driver/src/output/items/detail/Sound.cpp.s
 
-FlippR-Driver/src/utility/InputSocketHandler.o: FlippR-Driver/src/utility/InputSocketHandler.cpp.o
-
-.PHONY : FlippR-Driver/src/utility/InputSocketHandler.o
-
-# target to build an object file
-FlippR-Driver/src/utility/InputSocketHandler.cpp.o:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.o
-.PHONY : FlippR-Driver/src/utility/InputSocketHandler.cpp.o
-
-FlippR-Driver/src/utility/InputSocketHandler.i: FlippR-Driver/src/utility/InputSocketHandler.cpp.i
-
-.PHONY : FlippR-Driver/src/utility/InputSocketHandler.i
-
-# target to preprocess a source file
-FlippR-Driver/src/utility/InputSocketHandler.cpp.i:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.i
-.PHONY : FlippR-Driver/src/utility/InputSocketHandler.cpp.i
-
-FlippR-Driver/src/utility/InputSocketHandler.s: FlippR-Driver/src/utility/InputSocketHandler.cpp.s
-
-.PHONY : FlippR-Driver/src/utility/InputSocketHandler.s
-
-# target to generate assembly for a file
-FlippR-Driver/src/utility/InputSocketHandler.cpp.s:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/InputSocketHandler.cpp.s
-.PHONY : FlippR-Driver/src/utility/InputSocketHandler.cpp.s
-
 FlippR-Driver/src/utility/LoggerFactory.o: FlippR-Driver/src/utility/LoggerFactory.cpp.o
 
 .PHONY : FlippR-Driver/src/utility/LoggerFactory.o
@@ -1770,114 +1743,6 @@ FlippR-Driver/src/utility/LoggerFactory.cpp.s:
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.s
 .PHONY : FlippR-Driver/src/utility/LoggerFactory.cpp.s
 
-FlippR-Driver/src/utility/OutputHTTPServer.o: FlippR-Driver/src/utility/OutputHTTPServer.cpp.o
-
-.PHONY : FlippR-Driver/src/utility/OutputHTTPServer.o
-
-# target to build an object file
-FlippR-Driver/src/utility/OutputHTTPServer.cpp.o:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.o
-.PHONY : FlippR-Driver/src/utility/OutputHTTPServer.cpp.o
-
-FlippR-Driver/src/utility/OutputHTTPServer.i: FlippR-Driver/src/utility/OutputHTTPServer.cpp.i
-
-.PHONY : FlippR-Driver/src/utility/OutputHTTPServer.i
-
-# target to preprocess a source file
-FlippR-Driver/src/utility/OutputHTTPServer.cpp.i:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.i
-.PHONY : FlippR-Driver/src/utility/OutputHTTPServer.cpp.i
-
-FlippR-Driver/src/utility/OutputHTTPServer.s: FlippR-Driver/src/utility/OutputHTTPServer.cpp.s
-
-.PHONY : FlippR-Driver/src/utility/OutputHTTPServer.s
-
-# target to generate assembly for a file
-FlippR-Driver/src/utility/OutputHTTPServer.cpp.s:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputHTTPServer.cpp.s
-.PHONY : FlippR-Driver/src/utility/OutputHTTPServer.cpp.s
-
-FlippR-Driver/src/utility/OutputRequestHandler.o: FlippR-Driver/src/utility/OutputRequestHandler.cpp.o
-
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandler.o
-
-# target to build an object file
-FlippR-Driver/src/utility/OutputRequestHandler.cpp.o:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.o
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandler.cpp.o
-
-FlippR-Driver/src/utility/OutputRequestHandler.i: FlippR-Driver/src/utility/OutputRequestHandler.cpp.i
-
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandler.i
-
-# target to preprocess a source file
-FlippR-Driver/src/utility/OutputRequestHandler.cpp.i:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.i
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandler.cpp.i
-
-FlippR-Driver/src/utility/OutputRequestHandler.s: FlippR-Driver/src/utility/OutputRequestHandler.cpp.s
-
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandler.s
-
-# target to generate assembly for a file
-FlippR-Driver/src/utility/OutputRequestHandler.cpp.s:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandler.cpp.s
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandler.cpp.s
-
-FlippR-Driver/src/utility/OutputRequestHandlerFactory.o: FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o
-
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandlerFactory.o
-
-# target to build an object file
-FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.o
-
-FlippR-Driver/src/utility/OutputRequestHandlerFactory.i: FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i
-
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandlerFactory.i
-
-# target to preprocess a source file
-FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.i
-
-FlippR-Driver/src/utility/OutputRequestHandlerFactory.s: FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s
-
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandlerFactory.s
-
-# target to generate assembly for a file
-FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s
-.PHONY : FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp.s
-
-FlippR-Driver/src/utility/OutputSocketHandler.o: FlippR-Driver/src/utility/OutputSocketHandler.cpp.o
-
-.PHONY : FlippR-Driver/src/utility/OutputSocketHandler.o
-
-# target to build an object file
-FlippR-Driver/src/utility/OutputSocketHandler.cpp.o:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.o
-.PHONY : FlippR-Driver/src/utility/OutputSocketHandler.cpp.o
-
-FlippR-Driver/src/utility/OutputSocketHandler.i: FlippR-Driver/src/utility/OutputSocketHandler.cpp.i
-
-.PHONY : FlippR-Driver/src/utility/OutputSocketHandler.i
-
-# target to preprocess a source file
-FlippR-Driver/src/utility/OutputSocketHandler.cpp.i:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.i
-.PHONY : FlippR-Driver/src/utility/OutputSocketHandler.cpp.i
-
-FlippR-Driver/src/utility/OutputSocketHandler.s: FlippR-Driver/src/utility/OutputSocketHandler.cpp.s
-
-.PHONY : FlippR-Driver/src/utility/OutputSocketHandler.s
-
-# target to generate assembly for a file
-FlippR-Driver/src/utility/OutputSocketHandler.cpp.s:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/OutputSocketHandler.cpp.s
-.PHONY : FlippR-Driver/src/utility/OutputSocketHandler.cpp.s
-
 FlippR-Driver/src/utility/SocketHandler.o: FlippR-Driver/src/utility/SocketHandler.cpp.o
 
 .PHONY : FlippR-Driver/src/utility/SocketHandler.o
@@ -1905,6 +1770,141 @@ FlippR-Driver/src/utility/SocketHandler.cpp.s:
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.s
 .PHONY : FlippR-Driver/src/utility/SocketHandler.cpp.s
 
+FlippR-Driver/src/utility/networking/input/InputSocketHandler.o: FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
+
+FlippR-Driver/src/utility/networking/input/InputSocketHandler.i: FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
+
+FlippR-Driver/src/utility/networking/input/InputSocketHandler.s: FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
+
+FlippR-Driver/src/utility/networking/output/OutputHTTPServer.o: FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o
+
+FlippR-Driver/src/utility/networking/output/OutputHTTPServer.i: FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.i
+
+FlippR-Driver/src/utility/networking/output/OutputHTTPServer.s: FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s
+
+FlippR-Driver/src/utility/networking/output/OutputRequestHandler.o: FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandler.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o
+
+FlippR-Driver/src/utility/networking/output/OutputRequestHandler.i: FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandler.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.i
+
+FlippR-Driver/src/utility/networking/output/OutputRequestHandler.s: FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandler.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.s
+
+FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.o: FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o
+
+FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.i: FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.i
+
+FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.s: FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.s
+
+FlippR-Driver/src/utility/networking/output/OutputSocketHandler.o: FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputSocketHandler.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o
+
+FlippR-Driver/src/utility/networking/output/OutputSocketHandler.i: FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputSocketHandler.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.i
+
+FlippR-Driver/src/utility/networking/output/OutputSocketHandler.s: FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputSocketHandler.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.s
+
 FlippR-Driver/tests/input/TestDetector.o: FlippR-Driver/tests/input/TestDetector.cpp.o
 
 .PHONY : FlippR-Driver/tests/input/TestDetector.o
@@ -2415,27 +2415,27 @@ help:
 	@echo "... FlippR-Driver/src/output/items/detail/Sound.o"
 	@echo "... FlippR-Driver/src/output/items/detail/Sound.i"
 	@echo "... FlippR-Driver/src/output/items/detail/Sound.s"
-	@echo "... FlippR-Driver/src/utility/InputSocketHandler.o"
-	@echo "... FlippR-Driver/src/utility/InputSocketHandler.i"
-	@echo "... FlippR-Driver/src/utility/InputSocketHandler.s"
 	@echo "... FlippR-Driver/src/utility/LoggerFactory.o"
 	@echo "... FlippR-Driver/src/utility/LoggerFactory.i"
 	@echo "... FlippR-Driver/src/utility/LoggerFactory.s"
-	@echo "... FlippR-Driver/src/utility/OutputHTTPServer.o"
-	@echo "... FlippR-Driver/src/utility/OutputHTTPServer.i"
-	@echo "... FlippR-Driver/src/utility/OutputHTTPServer.s"
-	@echo "... FlippR-Driver/src/utility/OutputRequestHandler.o"
-	@echo "... FlippR-Driver/src/utility/OutputRequestHandler.i"
-	@echo "... FlippR-Driver/src/utility/OutputRequestHandler.s"
-	@echo "... FlippR-Driver/src/utility/OutputRequestHandlerFactory.o"
-	@echo "... FlippR-Driver/src/utility/OutputRequestHandlerFactory.i"
-	@echo "... FlippR-Driver/src/utility/OutputRequestHandlerFactory.s"
-	@echo "... FlippR-Driver/src/utility/OutputSocketHandler.o"
-	@echo "... FlippR-Driver/src/utility/OutputSocketHandler.i"
-	@echo "... FlippR-Driver/src/utility/OutputSocketHandler.s"
 	@echo "... FlippR-Driver/src/utility/SocketHandler.o"
 	@echo "... FlippR-Driver/src/utility/SocketHandler.i"
 	@echo "... FlippR-Driver/src/utility/SocketHandler.s"
+	@echo "... FlippR-Driver/src/utility/networking/input/InputSocketHandler.o"
+	@echo "... FlippR-Driver/src/utility/networking/input/InputSocketHandler.i"
+	@echo "... FlippR-Driver/src/utility/networking/input/InputSocketHandler.s"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputHTTPServer.o"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputHTTPServer.i"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputHTTPServer.s"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputRequestHandler.o"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputRequestHandler.i"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputRequestHandler.s"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.o"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.i"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.s"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputSocketHandler.o"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputSocketHandler.i"
+	@echo "... FlippR-Driver/src/utility/networking/output/OutputSocketHandler.s"
 	@echo "... FlippR-Driver/tests/input/TestDetector.o"
 	@echo "... FlippR-Driver/tests/input/TestDetector.i"
 	@echo "... FlippR-Driver/tests/input/TestDetector.s"
diff --git a/cmake-build-debug/flippr_code.cbp b/cmake-build-debug/flippr_code.cbp
index 99445d7..a20004a 100644
--- a/cmake-build-debug/flippr_code.cbp
+++ b/cmake-build-debug/flippr_code.cbp
@@ -578,42 +578,12 @@
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/IBlockingQueue.h">
 			<Option target="flippr_code"/>
 		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/InputSocketHandler.cpp">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/InputSocketHandler.h">
-			<Option target="flippr_code"/>
-		</Unit>
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/LoggerFactory.cpp">
 			<Option target="flippr_code"/>
 		</Unit>
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/LoggerFactory.h">
 			<Option target="flippr_code"/>
 		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputHTTPServer.cpp">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputHTTPServer.h">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandler.cpp">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandler.h">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandlerFactory.cpp">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputRequestHandlerFactory.h">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputSocketHandler.cpp">
-			<Option target="flippr_code"/>
-		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/OutputSocketHandler.h">
-			<Option target="flippr_code"/>
-		</Unit>
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/SocketHandler.cpp">
 			<Option target="flippr_code"/>
 		</Unit>
@@ -623,6 +593,36 @@
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/config.h">
 			<Option target="flippr_code"/>
 		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h">
+			<Option target="flippr_code"/>
+		</Unit>
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/tests/catch.hpp">
 			<Option target="flippr_code"/>
 		</Unit>