diff --git a/FlippR-Driver/src/input/Event.cpp b/FlippR-Driver/src/input/Event.cpp
new file mode 100644
index 0000000..3e7d0ac
--- /dev/null
+++ b/FlippR-Driver/src/input/Event.cpp
@@ -0,0 +1,10 @@
+/*
+ * Event.cpp
+ *
+ *  Created on: Jun 15, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+
+
+
diff --git a/FlippR-Driver/src/input/Event.hpp b/FlippR-Driver/src/input/Event.h
similarity index 100%
rename from FlippR-Driver/src/input/Event.hpp
rename to FlippR-Driver/src/input/Event.h
diff --git a/FlippR-Driver/src/input/EventHandler.cpp b/FlippR-Driver/src/input/EventHandler.cpp
new file mode 100644
index 0000000..a400050
--- /dev/null
+++ b/FlippR-Driver/src/input/EventHandler.cpp
@@ -0,0 +1,10 @@
+/*
+ * EventHandler.cpp
+ *
+ *  Created on: Jun 14, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+
+
+
diff --git a/FlippR-Driver/src/input/EventHandler.hpp b/FlippR-Driver/src/input/EventHandler.h
similarity index 98%
rename from FlippR-Driver/src/input/EventHandler.hpp
rename to FlippR-Driver/src/input/EventHandler.h
index e915545..00af7dd 100644
--- a/FlippR-Driver/src/input/EventHandler.hpp
+++ b/FlippR-Driver/src/input/EventHandler.h
@@ -12,11 +12,11 @@
 #ifndef INPUTEVENTHANDLER_H_
 #define INPUTEVENTHANDLER_H_
 
-#include "Event.hpp"
 #include "IInputDriver.h"
 
 #include "../utilities/IEventHandler.h"
 #include "../utilities/config.h"
+#include "Event.h"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h
index 9f4431d..0942894 100644
--- a/FlippR-Driver/src/input/EventNotifier.h
+++ b/FlippR-Driver/src/input/EventNotifier.h
@@ -14,9 +14,9 @@
 #include <thread>
 #include <mutex>
 
-#include "../utilities/BlockingQueue.hpp"
-#include "Event.hpp"
-#include "EventHandler.hpp"
+#include "../utilities/BlockingQueue.h"
+#include "Event.h"
+#include "EventHandler.h"
 
 #define HANDLER_TIMEOUT 2000
 
diff --git a/FlippR-Driver/src/input/IDetector.h b/FlippR-Driver/src/input/IDetector.h
index dba89d9..ab7ad9d 100644
--- a/FlippR-Driver/src/input/IDetector.h
+++ b/FlippR-Driver/src/input/IDetector.h
@@ -12,7 +12,7 @@
 #include <map>
 
 #include "../utilities/InputGPIOInterface.h"
-#include "Event.hpp"
+#include "Event.h"
 #include "EventNotifier.h"
 
 namespace Input
diff --git a/FlippR-Driver/src/input/IEventNotifier.h b/FlippR-Driver/src/input/IEventNotifier.h
index 35b0827..72beb0a 100644
--- a/FlippR-Driver/src/input/IEventNotifier.h
+++ b/FlippR-Driver/src/input/IEventNotifier.h
@@ -8,8 +8,8 @@
 #ifndef SRC_INPUT_IEVENTNOTIFIER_H_
 #define SRC_INPUT_IEVENTNOTIFIER_H_
 
+#include "Event.h"
 #include "IEventHandler.h"
-#include "Event.hpp"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/InputDriver.cpp b/FlippR-Driver/src/input/InputDriver.cpp
new file mode 100644
index 0000000..b082379
--- /dev/null
+++ b/FlippR-Driver/src/input/InputDriver.cpp
@@ -0,0 +1,10 @@
+/*
+ * InputDriver.cpp
+ *
+ *  Created on: Jun 15, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+
+
+
diff --git a/FlippR-Driver/src/input/InputDriver.hpp b/FlippR-Driver/src/input/InputDriver.h
similarity index 89%
rename from FlippR-Driver/src/input/InputDriver.hpp
rename to FlippR-Driver/src/input/InputDriver.h
index ed87623..886c374 100644
--- a/FlippR-Driver/src/input/InputDriver.hpp
+++ b/FlippR-Driver/src/input/InputDriver.h
@@ -4,8 +4,8 @@
  *  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_
+#ifndef SRC_INPUT_INPUTDRIVER_H_
+#define SRC_INPUT_INPUTDRIVER_H_
 
 #include "../utilities/config.h"
 
@@ -51,4 +51,4 @@ private:
 
 }
 
-#endif /* SRC_INPUT_INPUTDRIVER_HPP_ */
+#endif /* SRC_INPUT_INPUTDRIVER_H_ */
diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp
new file mode 100644
index 0000000..3074f0d
--- /dev/null
+++ b/FlippR-Driver/src/input/InputDriverFactory.cpp
@@ -0,0 +1,10 @@
+/*
+ * InputDriverFactory.cpp
+ *
+ *  Created on: Jun 14, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+
+
+
diff --git a/FlippR-Driver/src/input/InputDriverFactory.hpp b/FlippR-Driver/src/input/InputDriverFactory.h
similarity index 100%
rename from FlippR-Driver/src/input/InputDriverFactory.hpp
rename to FlippR-Driver/src/input/InputDriverFactory.h
diff --git a/FlippR-Driver/src/utilities/BlockingQueue.cpp b/FlippR-Driver/src/utilities/BlockingQueue.cpp
new file mode 100644
index 0000000..6355c04
--- /dev/null
+++ b/FlippR-Driver/src/utilities/BlockingQueue.cpp
@@ -0,0 +1,10 @@
+/*
+ * BlockingQueue.cpp
+ *
+ *  Created on: Jun 15, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+
+
+
diff --git a/FlippR-Driver/src/utilities/BlockingQueue.hpp b/FlippR-Driver/src/utilities/BlockingQueue.h
similarity index 86%
rename from FlippR-Driver/src/utilities/BlockingQueue.hpp
rename to FlippR-Driver/src/utilities/BlockingQueue.h
index 2ba177f..1d38aec 100644
--- a/FlippR-Driver/src/utilities/BlockingQueue.hpp
+++ b/FlippR-Driver/src/utilities/BlockingQueue.h
@@ -5,8 +5,8 @@
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
 
-#ifndef SRC_UTILITIES_BLOCKINGQUEUE_HPP_
-#define SRC_UTILITIES_BLOCKINGQUEUE_HPP_
+#ifndef SRC_UTILITIES_BLOCKINGQUEUE_H_
+#define SRC_UTILITIES_BLOCKINGQUEUE_H_
 
 #include <mutex>
 #include <condition_variable>
@@ -42,4 +42,4 @@ public:
 
 
 
-#endif /* SRC_UTILITIES_BLOCKINGQUEUE_HPP_ */
+#endif /* SRC_UTILITIES_BLOCKINGQUEUE_H_ */
diff --git a/FlippR-Driver/src/utilities/GPIOInterface.cpp b/FlippR-Driver/src/utilities/GPIOInterface.cpp
new file mode 100644
index 0000000..7a5d373
--- /dev/null
+++ b/FlippR-Driver/src/utilities/GPIOInterface.cpp
@@ -0,0 +1,10 @@
+/*
+ * GPIOInterface.cpp
+ *
+ *  Created on: Jun 15, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
+ */
+
+
+
+
diff --git a/FlippR-Driver/src/utilities/GPIOInterface.hpp b/FlippR-Driver/src/utilities/GPIOInterface.h
similarity index 83%
rename from FlippR-Driver/src/utilities/GPIOInterface.hpp
rename to FlippR-Driver/src/utilities/GPIOInterface.h
index c098c81..eea0979 100644
--- a/FlippR-Driver/src/utilities/GPIOInterface.hpp
+++ b/FlippR-Driver/src/utilities/GPIOInterface.h
@@ -10,8 +10,8 @@
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
 
-#ifndef SRC_UTILITIES_GPIOINTERFACE_HPP_
-#define SRC_UTILITIES_GPIOINTERFACE_HPP_
+#ifndef SRC_UTILITIES_GPIOINTERFACE_H_
+#define SRC_UTILITIES_GPIOINTERFACE_H_
 
 #include <fstream>
 #include "config.h"
@@ -39,4 +39,4 @@ public:
 
 
 
-#endif /* SRC_UTILITIES_GPIOINTERFACE_HPP_ */
+#endif /* SRC_UTILITIES_GPIOINTERFACE_H_ */
diff --git a/FlippR-Driver/src/utilities/IEventHandler.h b/FlippR-Driver/src/utilities/IEventHandler.h
index 00f6b03..6503f30 100644
--- a/FlippR-Driver/src/utilities/IEventHandler.h
+++ b/FlippR-Driver/src/utilities/IEventHandler.h
@@ -8,7 +8,7 @@
 #ifndef SRC_IEVENTHANDLER_H_
 #define SRC_IEVENTHANDLER_H_
 
-#include "../input/Event.hpp"
+#include "../input/Event.h"
 
 class IEventHandler
 {
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.h b/FlippR-Driver/src/utilities/InputGPIOInterface.h
index b375c48..4029d1e 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.h
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.h
@@ -8,9 +8,8 @@
 #ifndef SRC_UTILITIES_INPUTGPIOINTERFACE_H_
 #define SRC_UTILITIES_INPUTGPIOINTERFACE_H_
 
-#include "GPIOInterface.hpp"
-
 #include <exception>
+#include "GPIOInterface.h"
 
 class InputGPIOInterface : GPIOInterface
 {
diff --git a/FlippR-Driver/src/utilities/OutputGPIOInterface.h b/FlippR-Driver/src/utilities/OutputGPIOInterface.h
index 3b64b6e..705ccdc 100644
--- a/FlippR-Driver/src/utilities/OutputGPIOInterface.h
+++ b/FlippR-Driver/src/utilities/OutputGPIOInterface.h
@@ -8,7 +8,7 @@
 #ifndef SRC_UTILITIES_OUTPUTGPIOINTERFACE_H_
 #define SRC_UTILITIES_OUTPUTGPIOINTERFACE_H_
 
-#include "GPIOInterface.hpp"
+#include "GPIOInterface.h"
 
 class OutputGPIOInterface : GPIOInterface
 {
diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp
index cb044ac..b3f5066 100644
--- a/FlippR-Driver/tests/input/TestInputDriver.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriver.cpp
@@ -10,7 +10,7 @@
 
 #define private public
 
-#include "../../src/input/InputDriver.hpp"
+#include "../../src/input/InputDriver.h"
 
 #include "../../src/input/Event.hpp"
 #include "../../src/input/IEventNotifier.h"