diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h
index ecb14ed..4106a22 100644
--- a/FlippR-Driver/src/input/Detector.h
+++ b/FlippR-Driver/src/input/Detector.h
@@ -18,7 +18,7 @@
 #include <map>
 
 #include "../utilities/InputGPIOInterface.h"
-#include "InputEvent.h"
+#include "InputEvent.hpp"
 #include "InputEventNotifier.h"
 
 #define SLEEP_DURATION_NANO 900
diff --git a/FlippR-Driver/src/input/InputEvent.h b/FlippR-Driver/src/input/InputEvent.hpp
similarity index 100%
rename from FlippR-Driver/src/input/InputEvent.h
rename to FlippR-Driver/src/input/InputEvent.hpp
diff --git a/FlippR-Driver/src/input/InputEventHandler.h b/FlippR-Driver/src/input/InputEventHandler.hpp
similarity index 97%
rename from FlippR-Driver/src/input/InputEventHandler.h
rename to FlippR-Driver/src/input/InputEventHandler.hpp
index 8aa411c..98af782 100644
--- a/FlippR-Driver/src/input/InputEventHandler.h
+++ b/FlippR-Driver/src/input/InputEventHandler.hpp
@@ -12,8 +12,8 @@
 #ifndef INPUTEVENTHANDLER_H_
 #define INPUTEVENTHANDLER_H_
 
-#include "InputEvent.h"
 #include "Detector.h"
+#include "InputEvent.hpp"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/InputEventNotifier.h b/FlippR-Driver/src/input/InputEventNotifier.h
index 850e536..827028c 100644
--- a/FlippR-Driver/src/input/InputEventNotifier.h
+++ b/FlippR-Driver/src/input/InputEventNotifier.h
@@ -13,8 +13,8 @@
 #include <mutex>
 
 #include "../utilities/BlockingQueue.hpp"
-#include "InputEventHandler.h"
-#include "InputEvent.h"
+#include "InputEvent.hpp"
+#include "InputEventHandler.hpp"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/InputFactory.h b/FlippR-Driver/src/input/InputFactory.hpp
similarity index 100%
rename from FlippR-Driver/src/input/InputFactory.h
rename to FlippR-Driver/src/input/InputFactory.hpp
diff --git a/FlippR-Driver/src/input/main.cpp b/FlippR-Driver/src/input/main.cpp
index 2450b1f..62571d8 100644
--- a/FlippR-Driver/src/input/main.cpp
+++ b/FlippR-Driver/src/input/main.cpp
@@ -1,7 +1,8 @@
 #include <vector>
-#include "InputEvent.h"
 #include "Detector.h"
 #include <iostream>
+
+#include "InputEvent.hpp"
 int main()
 {
   return 0;
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
index e83d63d..56376f6 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
@@ -7,9 +7,6 @@
 #include "InputGPIOInterface.h"
 
 
-class InputGPIOInterface
-{
-
 bool InputGPIOInterface::read_input_data(char pin)
 {
   // setting address to read
@@ -33,4 +30,7 @@ void InputGPIOInterface::write_input_col(char data)
   write_pin(this->input_col_address, data & 0b100);
 }
 
-};
+
+InputGPIOInterface()
+{
+}
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.h b/FlippR-Driver/src/utilities/InputGPIOInterface.h
index 59124d8..3fda1eb 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.h
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.h
@@ -14,7 +14,8 @@
 class InputGPIOInterface : GPIOInterface
 {
 public:
-  bool read_input_data();
+  InputGPIOInterface();
+  bool read_input_data(char pin);
 
 private:
   void write_input_row(char data);