diff --git a/FlippR-Driver/.gitignore b/FlippR-Driver/.gitignore
index 74d27fe..975711f 100644
--- a/FlippR-Driver/.gitignore
+++ b/FlippR-Driver/.gitignore
@@ -1,9 +1,9 @@
 build
-src/Debug
-/Debug/
-.settings/*
+CMakeFiles
 CMakeCache.txt
+bin
+*.log
+.settings/*
 *.bin
 *.cmake
 *.out
-FlippR-Driver/CMakeFiles/*
diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt
new file mode 100644
index 0000000..c0f5b36
--- /dev/null
+++ b/FlippR-Driver/CMakeLists.txt
@@ -0,0 +1,61 @@
+#################### CONFIGURATION ######################
+set(OUTPUT_PATH bin)
+set(LIB_DIR lib)
+set(DEFAULT_BUILD_TYPE Debug)
+
+set(CMAKE_CXX_STANDARD 17)
+
+# Boost configuration
+set(BOOST_COMPONENTS program_options)
+
+###################### START_CMAKE #######################
+cmake_minimum_required(VERSION 3.9.1)
+project(FlippR-Driver VERSION 0.1.0 LANGUAGES CXX)
+
+# Compile library to output_path
+set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/${OUTPUT_PATH})
+
+
+
+# Default to Release build
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE})
+endif(NOT CMAKE_BUILD_TYPE)
+
+option(BUILD_SHARED_LIB "Build a shared lib instead of a static." OFF)
+option(ENABLE_TESTING "Enables testing." ON)
+
+#################### Adding Library #####################
+file(GLOB_RECURSE SOURCES src/*.cpp)
+
+if(BUILD_SHARED_LIB)
+  add_library(${PROJECT_NAME} SHARED ${SOURCES})
+else()
+  add_library(${PROJECT_NAME} STATIC ${SOURCES})
+endif(BUILD_SHARED_LIB)
+
+######################### BOOST #########################
+find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+if(Boost_FOUND)
+  # Include and link with boost
+  target_include_directories(${PROJECT_NAME} PUBLIC ${Boost_INCLUDE_DIRS})
+  target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
+  message ("Boost found and linked.")
+else()
+    message (FATAL_ERROR "Can't find Boost.")
+endif(Boost_FOUND)
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src)
+
+# Set libraries include path
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/${LIB_DIR})
+
+##################### WIRING_PI ##########################
+find_library(wiringPi NAMES libwiringPi)
+target_link_libraries(${PROJECT_NAME} PRIVATE wiringPi)
+
+
+if(ENABLE_TESTING)
+  add_subdirectory(tests)
+endif(ENABLE_TESTING)
+####################### END_CMAKE ########################
diff --git a/FlippR-Driver/build/CMakeLists.txt b/FlippR-Driver/build/CMakeLists.txt
deleted file mode 100644
index 531ecdb..0000000
--- a/FlippR-Driver/build/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-cmake_minimum_required(VERSION 3.9.1)
-project(flippr-driver)
-
-set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")  # enable C++11 standard
-
-add_definitions(-lcrypt)
-set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
-set(SOURCE_DIR ../src)
-set(LIB_DIR ${SOURCE_DIR}/lib)
-
-set(EASYLOGGING_INCLUDE_DIR ${LIB_DIR}/easylogging)
-add_library(Easylogging STATIC ${EASYLOGGING_INCLUDE_DIR}/easylogging++.cc)
-include_directories(${EASYLOGGING_INCLUDE_DIR})
-
-add_library(libwiringPi SHARED IMPORTED )
-set_property(TARGET libwiringPi PROPERTY IMPORTED_LOCATION ${LIB_DIR}/libwiringPi.so.2.44)
-#set_property(TARGET libwiringPi PROPERTY INTERFACE_INCLUDE_DIRECTORIES ../src/lib/wiringPi)
-
-find_package(Threads REQUIRED)
-find_package(Boost COMPONENTS system thread timer chrono REQUIRED)
-
-include_directories(${SOURCE_DIR}/input)
-include_directories(${SOURCE_DIR}/output)
-include_directories(${SOURCE_DIR}/lib)
-include_directories(${SOURCE_DIR}/utilities)
-include_directories(${Boost_INCLUDE_DIRS})
-
-file(GLOB SOURCES ${SOURCE_DIR}/*/*.cpp)
-
-add_library(flippr_driver STATIC ${SOURCES})
-
-target_link_libraries(flippr_driver ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(flippr_driver ${Boost_LIBRARIES})
-target_link_libraries(flippr_driver libwiringPi)
-target_link_libraries(flippr_driver Easylogging)
-
-enable_testing(TRUE)
-
-#Prepare "Catch" library for other executables
-set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/tests)
-add_library(Catch INTERFACE)
-target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR}/*)
-
-#Make test executable
-set(TEST_SOURCES ${SOURCE_DIR}/../tests)
-include_directories(${TEST_SOURCES})
-
-file(GLOB SOURCES ${TEST_SOURCES}/*/*.cpp)
-file(GLOB HEADER_SOURCES ${TEST_SOURCES}/*/*.hpp)
-
-add_executable(tests ${SOURCES} ${HEADER_SOURCES})
-
-target_link_libraries(tests Easylogging)
-target_link_libraries(tests flippr_driver)
-target_link_libraries(tests Catch)
diff --git a/FlippR-Driver/build/bak/json_example/gpio_config.json b/FlippR-Driver/build/bak/json_example/gpio_config.json
deleted file mode 100644
index cdb88e2..0000000
--- a/FlippR-Driver/build/bak/json_example/gpio_config.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "input":
-    {
-      "row":
-      {
-        "A":"GPIO_13",
-        "B":"GPIO_14",
-        "C":"GPIO_15",
-      },
-      "column":
-      {
-        "A":"GPIO_17",
-        "B":"GPIO_18",
-        "C":"GPIO_19",
-        "input":"GPIO_20"
-      }
-    },
-    "output":
-    {
-    }
-}
diff --git a/FlippR-Driver/etc/Input_Config.json b/FlippR-Driver/contrib/Input_Config.json
similarity index 100%
rename from FlippR-Driver/etc/Input_Config.json
rename to FlippR-Driver/contrib/Input_Config.json
diff --git a/FlippR-Driver/etc/Input_Matrix_Config.json b/FlippR-Driver/contrib/Input_Matrix_Config.json
similarity index 100%
rename from FlippR-Driver/etc/Input_Matrix_Config.json
rename to FlippR-Driver/contrib/Input_Matrix_Config.json
diff --git a/FlippR-Driver/json_example/Makefile b/FlippR-Driver/contrib/json_example/Makefile
similarity index 100%
rename from FlippR-Driver/json_example/Makefile
rename to FlippR-Driver/contrib/json_example/Makefile
diff --git a/FlippR-Driver/json_example/CMakeFiles/CMakeDirectoryInformation.cmake b/FlippR-Driver/json_example/CMakeFiles/CMakeDirectoryInformation.cmake
deleted file mode 100644
index 2f41a06..0000000
--- a/FlippR-Driver/json_example/CMakeFiles/CMakeDirectoryInformation.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.9
-
-# Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/johannes/git/flippr-code/FlippR-Driver")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/johannes/git/flippr-code/FlippR-Driver")
-
-# Force unix paths in dependencies.
-set(CMAKE_FORCE_UNIX_PATHS 1)
-
-
-# The C and CXX include file regular expressions for this directory.
-set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
-set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
-set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
-set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/FlippR-Driver/json_example/CMakeFiles/progress.marks b/FlippR-Driver/json_example/CMakeFiles/progress.marks
deleted file mode 100644
index 573541a..0000000
--- a/FlippR-Driver/json_example/CMakeFiles/progress.marks
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/FlippR-Driver/json_example/cmake_install.cmake b/FlippR-Driver/json_example/cmake_install.cmake
deleted file mode 100644
index d0823d6..0000000
--- a/FlippR-Driver/json_example/cmake_install.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# Install script for directory: /home/johannes/git/flippr-code/FlippR-Driver/json_example
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "/usr/local")
-endif()
-string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  if(BUILD_TYPE)
-    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  else()
-    set(CMAKE_INSTALL_CONFIG_NAME "")
-  endif()
-  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-endif()
-
-# Set the component getting installed.
-if(NOT CMAKE_INSTALL_COMPONENT)
-  if(COMPONENT)
-    message(STATUS "Install component: \"${COMPONENT}\"")
-    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  else()
-    set(CMAKE_INSTALL_COMPONENT)
-  endif()
-endif()
-
-# Install shared libraries without execute permission?
-if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  set(CMAKE_INSTALL_SO_NO_EXE "1")
-endif()
-
diff --git a/FlippR-Driver/src/lib/easylogging/easylogging++.cc b/FlippR-Driver/lib/easylogging/easylogging++.cc
similarity index 100%
rename from FlippR-Driver/src/lib/easylogging/easylogging++.cc
rename to FlippR-Driver/lib/easylogging/easylogging++.cc
diff --git a/FlippR-Driver/src/lib/easylogging/easylogging++.h b/FlippR-Driver/lib/easylogging/easylogging++.h
similarity index 100%
rename from FlippR-Driver/src/lib/easylogging/easylogging++.h
rename to FlippR-Driver/lib/easylogging/easylogging++.h
diff --git a/FlippR-Driver/src/lib/json/json.hpp b/FlippR-Driver/lib/json/json.hpp
similarity index 100%
rename from FlippR-Driver/src/lib/json/json.hpp
rename to FlippR-Driver/lib/json/json.hpp
diff --git a/FlippR-Driver/src/lib/libwiringPi.so.2.44 b/FlippR-Driver/lib/libwiringPi.so.2.44
similarity index 100%
rename from FlippR-Driver/src/lib/libwiringPi.so.2.44
rename to FlippR-Driver/lib/libwiringPi.so.2.44
diff --git a/FlippR-Driver/src/lib/wiringPi/COPYING.LESSER b/FlippR-Driver/lib/wiringPi/COPYING.LESSER
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/COPYING.LESSER
rename to FlippR-Driver/lib/wiringPi/COPYING.LESSER
diff --git a/FlippR-Driver/src/lib/wiringPi/Makefile b/FlippR-Driver/lib/wiringPi/Makefile
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/Makefile
rename to FlippR-Driver/lib/wiringPi/Makefile
diff --git a/FlippR-Driver/src/lib/wiringPi/ads1115.c b/FlippR-Driver/lib/wiringPi/ads1115.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/ads1115.c
rename to FlippR-Driver/lib/wiringPi/ads1115.c
diff --git a/FlippR-Driver/src/lib/wiringPi/ads1115.h b/FlippR-Driver/lib/wiringPi/ads1115.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/ads1115.h
rename to FlippR-Driver/lib/wiringPi/ads1115.h
diff --git a/FlippR-Driver/src/lib/wiringPi/bmp180.c b/FlippR-Driver/lib/wiringPi/bmp180.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/bmp180.c
rename to FlippR-Driver/lib/wiringPi/bmp180.c
diff --git a/FlippR-Driver/src/lib/wiringPi/bmp180.h b/FlippR-Driver/lib/wiringPi/bmp180.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/bmp180.h
rename to FlippR-Driver/lib/wiringPi/bmp180.h
diff --git a/FlippR-Driver/src/lib/wiringPi/drcNet.c b/FlippR-Driver/lib/wiringPi/drcNet.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/drcNet.c
rename to FlippR-Driver/lib/wiringPi/drcNet.c
diff --git a/FlippR-Driver/src/lib/wiringPi/drcNet.h b/FlippR-Driver/lib/wiringPi/drcNet.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/drcNet.h
rename to FlippR-Driver/lib/wiringPi/drcNet.h
diff --git a/FlippR-Driver/src/lib/wiringPi/drcSerial.c b/FlippR-Driver/lib/wiringPi/drcSerial.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/drcSerial.c
rename to FlippR-Driver/lib/wiringPi/drcSerial.c
diff --git a/FlippR-Driver/src/lib/wiringPi/drcSerial.h b/FlippR-Driver/lib/wiringPi/drcSerial.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/drcSerial.h
rename to FlippR-Driver/lib/wiringPi/drcSerial.h
diff --git a/FlippR-Driver/src/lib/wiringPi/ds18b20.c b/FlippR-Driver/lib/wiringPi/ds18b20.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/ds18b20.c
rename to FlippR-Driver/lib/wiringPi/ds18b20.c
diff --git a/FlippR-Driver/src/lib/wiringPi/ds18b20.h b/FlippR-Driver/lib/wiringPi/ds18b20.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/ds18b20.h
rename to FlippR-Driver/lib/wiringPi/ds18b20.h
diff --git a/FlippR-Driver/src/lib/wiringPi/htu21d.c b/FlippR-Driver/lib/wiringPi/htu21d.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/htu21d.c
rename to FlippR-Driver/lib/wiringPi/htu21d.c
diff --git a/FlippR-Driver/src/lib/wiringPi/htu21d.h b/FlippR-Driver/lib/wiringPi/htu21d.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/htu21d.h
rename to FlippR-Driver/lib/wiringPi/htu21d.h
diff --git a/FlippR-Driver/src/lib/wiringPi/max31855.c b/FlippR-Driver/lib/wiringPi/max31855.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/max31855.c
rename to FlippR-Driver/lib/wiringPi/max31855.c
diff --git a/FlippR-Driver/src/lib/wiringPi/max31855.h b/FlippR-Driver/lib/wiringPi/max31855.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/max31855.h
rename to FlippR-Driver/lib/wiringPi/max31855.h
diff --git a/FlippR-Driver/src/lib/wiringPi/max5322.c b/FlippR-Driver/lib/wiringPi/max5322.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/max5322.c
rename to FlippR-Driver/lib/wiringPi/max5322.c
diff --git a/FlippR-Driver/src/lib/wiringPi/max5322.h b/FlippR-Driver/lib/wiringPi/max5322.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/max5322.h
rename to FlippR-Driver/lib/wiringPi/max5322.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23008.c b/FlippR-Driver/lib/wiringPi/mcp23008.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23008.c
rename to FlippR-Driver/lib/wiringPi/mcp23008.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23008.h b/FlippR-Driver/lib/wiringPi/mcp23008.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23008.h
rename to FlippR-Driver/lib/wiringPi/mcp23008.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23016.c b/FlippR-Driver/lib/wiringPi/mcp23016.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23016.c
rename to FlippR-Driver/lib/wiringPi/mcp23016.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23016.h b/FlippR-Driver/lib/wiringPi/mcp23016.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23016.h
rename to FlippR-Driver/lib/wiringPi/mcp23016.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23016reg.h b/FlippR-Driver/lib/wiringPi/mcp23016reg.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23016reg.h
rename to FlippR-Driver/lib/wiringPi/mcp23016reg.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23017.c b/FlippR-Driver/lib/wiringPi/mcp23017.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23017.c
rename to FlippR-Driver/lib/wiringPi/mcp23017.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23017.h b/FlippR-Driver/lib/wiringPi/mcp23017.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23017.h
rename to FlippR-Driver/lib/wiringPi/mcp23017.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23s08.c b/FlippR-Driver/lib/wiringPi/mcp23s08.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23s08.c
rename to FlippR-Driver/lib/wiringPi/mcp23s08.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23s08.h b/FlippR-Driver/lib/wiringPi/mcp23s08.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23s08.h
rename to FlippR-Driver/lib/wiringPi/mcp23s08.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23s17.c b/FlippR-Driver/lib/wiringPi/mcp23s17.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23s17.c
rename to FlippR-Driver/lib/wiringPi/mcp23s17.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23s17.h b/FlippR-Driver/lib/wiringPi/mcp23s17.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23s17.h
rename to FlippR-Driver/lib/wiringPi/mcp23s17.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23x08.h b/FlippR-Driver/lib/wiringPi/mcp23x08.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23x08.h
rename to FlippR-Driver/lib/wiringPi/mcp23x08.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp23x0817.h b/FlippR-Driver/lib/wiringPi/mcp23x0817.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp23x0817.h
rename to FlippR-Driver/lib/wiringPi/mcp23x0817.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp3002.c b/FlippR-Driver/lib/wiringPi/mcp3002.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp3002.c
rename to FlippR-Driver/lib/wiringPi/mcp3002.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp3002.h b/FlippR-Driver/lib/wiringPi/mcp3002.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp3002.h
rename to FlippR-Driver/lib/wiringPi/mcp3002.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp3004.c b/FlippR-Driver/lib/wiringPi/mcp3004.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp3004.c
rename to FlippR-Driver/lib/wiringPi/mcp3004.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp3004.h b/FlippR-Driver/lib/wiringPi/mcp3004.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp3004.h
rename to FlippR-Driver/lib/wiringPi/mcp3004.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp3422.c b/FlippR-Driver/lib/wiringPi/mcp3422.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp3422.c
rename to FlippR-Driver/lib/wiringPi/mcp3422.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp3422.h b/FlippR-Driver/lib/wiringPi/mcp3422.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp3422.h
rename to FlippR-Driver/lib/wiringPi/mcp3422.h
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp4802.c b/FlippR-Driver/lib/wiringPi/mcp4802.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp4802.c
rename to FlippR-Driver/lib/wiringPi/mcp4802.c
diff --git a/FlippR-Driver/src/lib/wiringPi/mcp4802.h b/FlippR-Driver/lib/wiringPi/mcp4802.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/mcp4802.h
rename to FlippR-Driver/lib/wiringPi/mcp4802.h
diff --git a/FlippR-Driver/src/lib/wiringPi/pcf8574.c b/FlippR-Driver/lib/wiringPi/pcf8574.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/pcf8574.c
rename to FlippR-Driver/lib/wiringPi/pcf8574.c
diff --git a/FlippR-Driver/src/lib/wiringPi/pcf8574.h b/FlippR-Driver/lib/wiringPi/pcf8574.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/pcf8574.h
rename to FlippR-Driver/lib/wiringPi/pcf8574.h
diff --git a/FlippR-Driver/src/lib/wiringPi/pcf8591.c b/FlippR-Driver/lib/wiringPi/pcf8591.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/pcf8591.c
rename to FlippR-Driver/lib/wiringPi/pcf8591.c
diff --git a/FlippR-Driver/src/lib/wiringPi/pcf8591.h b/FlippR-Driver/lib/wiringPi/pcf8591.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/pcf8591.h
rename to FlippR-Driver/lib/wiringPi/pcf8591.h
diff --git a/FlippR-Driver/src/lib/wiringPi/piHiPri.c b/FlippR-Driver/lib/wiringPi/piHiPri.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/piHiPri.c
rename to FlippR-Driver/lib/wiringPi/piHiPri.c
diff --git a/FlippR-Driver/src/lib/wiringPi/piThread.c b/FlippR-Driver/lib/wiringPi/piThread.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/piThread.c
rename to FlippR-Driver/lib/wiringPi/piThread.c
diff --git a/FlippR-Driver/src/lib/wiringPi/pseudoPins.c b/FlippR-Driver/lib/wiringPi/pseudoPins.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/pseudoPins.c
rename to FlippR-Driver/lib/wiringPi/pseudoPins.c
diff --git a/FlippR-Driver/src/lib/wiringPi/pseudoPins.h b/FlippR-Driver/lib/wiringPi/pseudoPins.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/pseudoPins.h
rename to FlippR-Driver/lib/wiringPi/pseudoPins.h
diff --git a/FlippR-Driver/src/lib/wiringPi/rht03.c b/FlippR-Driver/lib/wiringPi/rht03.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/rht03.c
rename to FlippR-Driver/lib/wiringPi/rht03.c
diff --git a/FlippR-Driver/src/lib/wiringPi/rht03.h b/FlippR-Driver/lib/wiringPi/rht03.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/rht03.h
rename to FlippR-Driver/lib/wiringPi/rht03.h
diff --git a/FlippR-Driver/src/lib/wiringPi/sn3218.c b/FlippR-Driver/lib/wiringPi/sn3218.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/sn3218.c
rename to FlippR-Driver/lib/wiringPi/sn3218.c
diff --git a/FlippR-Driver/src/lib/wiringPi/sn3218.h b/FlippR-Driver/lib/wiringPi/sn3218.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/sn3218.h
rename to FlippR-Driver/lib/wiringPi/sn3218.h
diff --git a/FlippR-Driver/src/lib/wiringPi/softPwm.c b/FlippR-Driver/lib/wiringPi/softPwm.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/softPwm.c
rename to FlippR-Driver/lib/wiringPi/softPwm.c
diff --git a/FlippR-Driver/src/lib/wiringPi/softPwm.h b/FlippR-Driver/lib/wiringPi/softPwm.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/softPwm.h
rename to FlippR-Driver/lib/wiringPi/softPwm.h
diff --git a/FlippR-Driver/src/lib/wiringPi/softServo.c b/FlippR-Driver/lib/wiringPi/softServo.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/softServo.c
rename to FlippR-Driver/lib/wiringPi/softServo.c
diff --git a/FlippR-Driver/src/lib/wiringPi/softServo.h b/FlippR-Driver/lib/wiringPi/softServo.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/softServo.h
rename to FlippR-Driver/lib/wiringPi/softServo.h
diff --git a/FlippR-Driver/src/lib/wiringPi/softTone.c b/FlippR-Driver/lib/wiringPi/softTone.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/softTone.c
rename to FlippR-Driver/lib/wiringPi/softTone.c
diff --git a/FlippR-Driver/src/lib/wiringPi/softTone.h b/FlippR-Driver/lib/wiringPi/softTone.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/softTone.h
rename to FlippR-Driver/lib/wiringPi/softTone.h
diff --git a/FlippR-Driver/src/lib/wiringPi/sr595.c b/FlippR-Driver/lib/wiringPi/sr595.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/sr595.c
rename to FlippR-Driver/lib/wiringPi/sr595.c
diff --git a/FlippR-Driver/src/lib/wiringPi/sr595.h b/FlippR-Driver/lib/wiringPi/sr595.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/sr595.h
rename to FlippR-Driver/lib/wiringPi/sr595.h
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringPi.c b/FlippR-Driver/lib/wiringPi/wiringPi.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringPi.c
rename to FlippR-Driver/lib/wiringPi/wiringPi.c
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringPi.h b/FlippR-Driver/lib/wiringPi/wiringPi.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringPi.h
rename to FlippR-Driver/lib/wiringPi/wiringPi.h
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringPiI2C.c b/FlippR-Driver/lib/wiringPi/wiringPiI2C.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringPiI2C.c
rename to FlippR-Driver/lib/wiringPi/wiringPiI2C.c
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringPiI2C.h b/FlippR-Driver/lib/wiringPi/wiringPiI2C.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringPiI2C.h
rename to FlippR-Driver/lib/wiringPi/wiringPiI2C.h
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringPiSPI.c b/FlippR-Driver/lib/wiringPi/wiringPiSPI.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringPiSPI.c
rename to FlippR-Driver/lib/wiringPi/wiringPiSPI.c
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringPiSPI.h b/FlippR-Driver/lib/wiringPi/wiringPiSPI.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringPiSPI.h
rename to FlippR-Driver/lib/wiringPi/wiringPiSPI.h
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringSerial.c b/FlippR-Driver/lib/wiringPi/wiringSerial.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringSerial.c
rename to FlippR-Driver/lib/wiringPi/wiringSerial.c
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringSerial.h b/FlippR-Driver/lib/wiringPi/wiringSerial.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringSerial.h
rename to FlippR-Driver/lib/wiringPi/wiringSerial.h
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringShift.c b/FlippR-Driver/lib/wiringPi/wiringShift.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringShift.c
rename to FlippR-Driver/lib/wiringPi/wiringShift.c
diff --git a/FlippR-Driver/src/lib/wiringPi/wiringShift.h b/FlippR-Driver/lib/wiringPi/wiringShift.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wiringShift.h
rename to FlippR-Driver/lib/wiringPi/wiringShift.h
diff --git a/FlippR-Driver/src/lib/wiringPi/wpiExtensions.c b/FlippR-Driver/lib/wiringPi/wpiExtensions.c
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wpiExtensions.c
rename to FlippR-Driver/lib/wiringPi/wpiExtensions.c
diff --git a/FlippR-Driver/src/lib/wiringPi/wpiExtensions.h b/FlippR-Driver/lib/wiringPi/wpiExtensions.h
similarity index 100%
rename from FlippR-Driver/src/lib/wiringPi/wpiExtensions.h
rename to FlippR-Driver/lib/wiringPi/wpiExtensions.h
diff --git a/FlippR-Driver/src/Debug/FlippR-Driver b/FlippR-Driver/src/Debug/FlippR-Driver
new file mode 100755
index 0000000..a46a2b7
Binary files /dev/null and b/FlippR-Driver/src/Debug/FlippR-Driver differ
diff --git a/FlippR-Driver/src/Debug/Input/Detector.d b/FlippR-Driver/src/Debug/Input/Detector.d
new file mode 100644
index 0000000..0b3a2d4
--- /dev/null
+++ b/FlippR-Driver/src/Debug/Input/Detector.d
@@ -0,0 +1,8 @@
+Input/Detector.o: ../Input/Detector.cpp ../Input/Detector.h \
+ ../Input/InputEvent.h ../Input/InputEventHandler.h
+
+../Input/Detector.h:
+
+../Input/InputEvent.h:
+
+../Input/InputEventHandler.h:
diff --git a/FlippR-Driver/src/Debug/Input/Detector.o b/FlippR-Driver/src/Debug/Input/Detector.o
new file mode 100644
index 0000000..5695f5c
Binary files /dev/null and b/FlippR-Driver/src/Debug/Input/Detector.o differ
diff --git a/FlippR-Driver/src/Debug/Input/main.d b/FlippR-Driver/src/Debug/Input/main.d
new file mode 100644
index 0000000..c0762fc
--- /dev/null
+++ b/FlippR-Driver/src/Debug/Input/main.d
@@ -0,0 +1,8 @@
+Input/main.o: ../Input/main.cpp ../Input/InputEvent.h \
+ ../Input/InputEventHandler.h ../Input/Detector.h
+
+../Input/InputEvent.h:
+
+../Input/InputEventHandler.h:
+
+../Input/Detector.h:
diff --git a/FlippR-Driver/src/Debug/Input/main.o b/FlippR-Driver/src/Debug/Input/main.o
new file mode 100644
index 0000000..726af63
Binary files /dev/null and b/FlippR-Driver/src/Debug/Input/main.o differ
diff --git a/FlippR-Driver/src/Debug/Input/subdir.mk b/FlippR-Driver/src/Debug/Input/subdir.mk
new file mode 100644
index 0000000..e3d9270
--- /dev/null
+++ b/FlippR-Driver/src/Debug/Input/subdir.mk
@@ -0,0 +1,27 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+CPP_SRCS += \
+../Input/Detector.cpp \
+../Input/main.cpp 
+
+OBJS += \
+./Input/Detector.o \
+./Input/main.o 
+
+CPP_DEPS += \
+./Input/Detector.d \
+./Input/main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Input/%.o: ../Input/%.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C++ Compiler'
+	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/FlippR-Driver/src/Debug/makefile b/FlippR-Driver/src/Debug/makefile
new file mode 100644
index 0000000..4478750
--- /dev/null
+++ b/FlippR-Driver/src/Debug/makefile
@@ -0,0 +1,58 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include Input/subdir.mk
+-include subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(CC_DEPS)),)
+-include $(CC_DEPS)
+endif
+ifneq ($(strip $(C++_DEPS)),)
+-include $(C++_DEPS)
+endif
+ifneq ($(strip $(C_UPPER_DEPS)),)
+-include $(C_UPPER_DEPS)
+endif
+ifneq ($(strip $(CXX_DEPS)),)
+-include $(CXX_DEPS)
+endif
+ifneq ($(strip $(CPP_DEPS)),)
+-include $(CPP_DEPS)
+endif
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: FlippR-Driver
+
+# Tool invocations
+FlippR-Driver: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: GCC C++ Linker'
+	g++  -o "FlippR-Driver" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(C_UPPER_DEPS)$(CXX_DEPS)$(OBJS)$(CPP_DEPS)$(C_DEPS) FlippR-Driver
+	-@echo ' '
+
+.PHONY: all clean dependents
+
+-include ../makefile.targets
diff --git a/FlippR-Driver/src/Debug/objects.mk b/FlippR-Driver/src/Debug/objects.mk
new file mode 100644
index 0000000..9895eb6
--- /dev/null
+++ b/FlippR-Driver/src/Debug/objects.mk
@@ -0,0 +1,8 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS := -lpthread
+
diff --git a/FlippR-Driver/src/Debug/sources.mk b/FlippR-Driver/src/Debug/sources.mk
new file mode 100644
index 0000000..06373b5
--- /dev/null
+++ b/FlippR-Driver/src/Debug/sources.mk
@@ -0,0 +1,27 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+C_UPPER_SRCS := 
+CXX_SRCS := 
+C++_SRCS := 
+OBJ_SRCS := 
+CC_SRCS := 
+ASM_SRCS := 
+CPP_SRCS := 
+C_SRCS := 
+O_SRCS := 
+S_UPPER_SRCS := 
+CC_DEPS := 
+C++_DEPS := 
+EXECUTABLES := 
+C_UPPER_DEPS := 
+CXX_DEPS := 
+OBJS := 
+CPP_DEPS := 
+C_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+Input \
+
diff --git a/FlippR-Driver/src/input/IEventNotifier.h b/FlippR-Driver/src/input/IEventNotifier.h
index fadc304..265a047 100644
--- a/FlippR-Driver/src/input/IEventNotifier.h
+++ b/FlippR-Driver/src/input/IEventNotifier.h
@@ -9,7 +9,7 @@
 #define SRC_INPUT_IEVENTNOTIFIER_H_
 
 #include "Event.h"
-#include "IEventHandler.h"
+#include "utilities/IEventHandler.h"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/IInputDriver.h b/FlippR-Driver/src/input/IInputDriver.h
index d5737e4..3b8f867 100644
--- a/FlippR-Driver/src/input/IInputDriver.h
+++ b/FlippR-Driver/src/input/IInputDriver.h
@@ -8,7 +8,7 @@
 #ifndef SRC_INPUT_IINPUTDRIVER_H_
 #define SRC_INPUT_IINPUTDRIVER_H_
 
-#include "IEventHandler.h"
+#include "utilities/IEventHandler.h"
 #include "IEventNotifier.h"
 
 namespace Input {
diff --git a/FlippR-Driver/tests/CMakeLists.txt b/FlippR-Driver/tests/CMakeLists.txt
new file mode 100644
index 0000000..e69de29