diff --git a/FlippR-Driver/cli/PrintHandler.cpp b/FlippR-Driver/cli/PrintHandler.cpp
index 4552cba..245a47e 100644
--- a/FlippR-Driver/cli/PrintHandler.cpp
+++ b/FlippR-Driver/cli/PrintHandler.cpp
@@ -6,8 +6,10 @@
 #include <iostream>
 
 PrintHandler::PrintHandler(std::shared_ptr<FlippR_Driver::Input::IInputDriver> driver) :
-  EventHandler(driver)
-  {}
+FlippR_Driver::Input::EventHandler(driver)
+  {
+
+  }
 
 
 void PrintHandler::handle(FlippR_Driver::Input::Event &event)
diff --git a/FlippR-Driver/cli/PrintHandler.h b/FlippR-Driver/cli/PrintHandler.h
index ed5e4af..c193bb0 100644
--- a/FlippR-Driver/cli/PrintHandler.h
+++ b/FlippR-Driver/cli/PrintHandler.h
@@ -6,9 +6,10 @@
 #define FLIPPR_DRIVER_PRINTHANDLER_H
 
 #include <memory>
-#include "IEventHandler.h"
+#include "EventHandler.h"
+#include "IInputDriver.h"
 
-class PrintHandler : public IEventHandler
+class PrintHandler : public FlippR_Driver::Input::EventHandler
 {
 public:
   PrintHandler(std::shared_ptr<FlippR_Driver::Input::IInputDriver> driver);
diff --git a/FlippR-Driver/src/input/EventHandler.h b/FlippR-Driver/include/EventHandler.h
similarity index 100%
rename from FlippR-Driver/src/input/EventHandler.h
rename to FlippR-Driver/include/EventHandler.h
diff --git a/FlippR-Driver/include/IInputDriver.h b/FlippR-Driver/include/IInputDriver.h
index f1491a2..3ed4562 100644
--- a/FlippR-Driver/include/IInputDriver.h
+++ b/FlippR-Driver/include/IInputDriver.h
@@ -11,10 +11,11 @@
 #include "IEventHandler.h"
 #include <memory>
 
-namespace FlippR_Driver {
-  namespace Input {
-
-    class IInputDriver {
+namespace FlippR_Driver
+{
+namespace Input
+{
+  class IInputDriver {
     public:
       virtual ~IInputDriver() {};
 
@@ -23,7 +24,7 @@ namespace FlippR_Driver {
       virtual void unregister_event_handler(IEventHandler *handler) = 0;
 
       virtual std::shared_ptr<Event> get_event(std::string name) = 0;
-    };
-  }
+  };
+}
 }
 #endif /* SRC_INPUT_IINPUTDRIVER_H_ */
diff --git a/FlippR-Driver/tests/input/TestEventHandler.cpp b/FlippR-Driver/tests/input/TestEventHandler.cpp
index 9467dd8..0fa5252 100644
--- a/FlippR-Driver/tests/input/TestEventHandler.cpp
+++ b/FlippR-Driver/tests/input/TestEventHandler.cpp
@@ -9,7 +9,7 @@
 #include "fakeit.hpp"
 
 #include "utilities/LoggerFactory.h"
-#include "input/EventHandler.h"
+#include "EventHandler.h"
 #include "IInputDriver.h"