diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h
index 4106a22..0fdba63 100644
--- a/FlippR-Driver/src/input/Detector.h
+++ b/FlippR-Driver/src/input/Detector.h
@@ -18,8 +18,8 @@
 #include <map>
 
 #include "../utilities/InputGPIOInterface.h"
-#include "InputEvent.hpp"
-#include "InputEventNotifier.h"
+#include "Event.hpp"
+#include "EventNotifier.h"
 
 #define SLEEP_DURATION_NANO 900
 
diff --git a/FlippR-Driver/src/input/InputEvent.hpp b/FlippR-Driver/src/input/Event.hpp
similarity index 100%
rename from FlippR-Driver/src/input/InputEvent.hpp
rename to FlippR-Driver/src/input/Event.hpp
diff --git a/FlippR-Driver/src/input/InputEventHandler.hpp b/FlippR-Driver/src/input/EventHandler.hpp
similarity index 97%
rename from FlippR-Driver/src/input/InputEventHandler.hpp
rename to FlippR-Driver/src/input/EventHandler.hpp
index 98af782..bb97913 100644
--- a/FlippR-Driver/src/input/InputEventHandler.hpp
+++ b/FlippR-Driver/src/input/EventHandler.hpp
@@ -13,7 +13,7 @@
 #define INPUTEVENTHANDLER_H_
 
 #include "Detector.h"
-#include "InputEvent.hpp"
+#include "Event.hpp"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/InputEventNotifier.cpp b/FlippR-Driver/src/input/EventNotifier.cpp
similarity index 97%
rename from FlippR-Driver/src/input/InputEventNotifier.cpp
rename to FlippR-Driver/src/input/EventNotifier.cpp
index 4bed545..4e20f64 100644
--- a/FlippR-Driver/src/input/InputEventNotifier.cpp
+++ b/FlippR-Driver/src/input/EventNotifier.cpp
@@ -5,7 +5,7 @@
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
 
-#include "InputEventNotifier.h"
+#include "EventNotifier.h"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/InputEventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h
similarity index 80%
rename from FlippR-Driver/src/input/InputEventNotifier.h
rename to FlippR-Driver/src/input/EventNotifier.h
index 827028c..b0c5c28 100644
--- a/FlippR-Driver/src/input/InputEventNotifier.h
+++ b/FlippR-Driver/src/input/EventNotifier.h
@@ -5,16 +5,16 @@
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
 
-#ifndef SRC_INPUT_INPUTEVENTNOTIFIER_H_
-#define SRC_INPUT_INPUTEVENTNOTIFIER_H_
+#ifndef SRC_INPUT_EVENTNOTIFIER_H_
+#define SRC_INPUT_EVENTNOTIFIER_H_
 
 #include <set>
 #include <thread>
 #include <mutex>
 
 #include "../utilities/BlockingQueue.hpp"
-#include "InputEvent.hpp"
-#include "InputEventHandler.hpp"
+#include "Event.hpp"
+#include "EventHandler.hpp"
 
 namespace Input
 {
@@ -44,4 +44,4 @@ private:
 
 
 
-#endif /* SRC_INPUT_INPUTEVENTNOTIFIER_H_ */
+#endif /* SRC_INPUT_EVENTNOTIFIER_H_ */
diff --git a/FlippR-Driver/src/input/InputDriver.hpp b/FlippR-Driver/src/input/InputDriver.hpp
new file mode 100644
index 0000000..ba0c520
--- /dev/null
+++ b/FlippR-Driver/src/input/InputDriver.hpp
@@ -0,0 +1,15 @@
+/*
+ * InputDriver.hpp
+ *
+ *  Created on: May 31, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+#ifndef SRC_INPUT_INPUTDRIVER_HPP_
+#define SRC_INPUT_INPUTDRIVER_HPP_
+
+
+
+
+
+#endif /* SRC_INPUT_INPUTDRIVER_HPP_ */
diff --git a/FlippR-Driver/src/input/InputFactory.hpp b/FlippR-Driver/src/input/InputDriverFactory.hpp
similarity index 89%
rename from FlippR-Driver/src/input/InputFactory.hpp
rename to FlippR-Driver/src/input/InputDriverFactory.hpp
index 99e5ede..1289273 100644
--- a/FlippR-Driver/src/input/InputFactory.hpp
+++ b/FlippR-Driver/src/input/InputDriverFactory.hpp
@@ -13,9 +13,8 @@
 #include "Detector.h"
 
 #include "../utilities/InputGPIOInterface.h"
-#include "InputEventNotifier.h"
-
 #include "../lib/json/json.hpp"
+#include "EventNotifier.h"
 
 using namespace nlohmann;
 
@@ -32,9 +31,6 @@ public:
     json input_config;
     input_config << input_config_stream;
 
-    std::ifstream matrix_config_stream(input_config_path);
-    json matrix_config;
-    matrix_config << matrix_config_stream;
 
     auto input_gpio_interface = new InputGPIOInterface();
     auto input_notifier = new InputEventNotifier();
diff --git a/FlippR-Driver/src/input/main.cpp b/FlippR-Driver/src/input/main.cpp
index 62571d8..308ff5b 100644
--- a/FlippR-Driver/src/input/main.cpp
+++ b/FlippR-Driver/src/input/main.cpp
@@ -2,7 +2,7 @@
 #include "Detector.h"
 #include <iostream>
 
-#include "InputEvent.hpp"
+#include "Event.hpp"
 int main()
 {
   return 0;
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
index 56376f6..c40a087 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
@@ -4,8 +4,10 @@
  *  Created on: May 31, 2018
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
-#include "InputGPIOInterface.h"
 
+#include <fstream>
+
+#include "InputGPIOInterface.h"
 
 bool InputGPIOInterface::read_input_data(char pin)
 {
@@ -31,6 +33,9 @@ void InputGPIOInterface::write_input_col(char data)
 }
 
 
-InputGPIOInterface()
+InputGPIOInterface::InputGPIOInterface()
 {
+    std::ifstream matrix_config_stream(matrix_config_path);
+    json matrix_config;
+    matrix_config << matrix_config_stream;
 }
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.h b/FlippR-Driver/src/utilities/InputGPIOInterface.h
index 3fda1eb..1650d3e 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.h
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.h
@@ -10,7 +10,10 @@
 
 #include "GPIOInterface.hpp"
 
+#include <exception>
+
 #define MATRIX_SIZE 8
+
 class InputGPIOInterface : GPIOInterface
 {
 public: