diff --git a/FlippR-Driver/.settings/language.settings.xml b/FlippR-Driver/.settings/language.settings.xml
index c7e504e..d3526a4 100644
--- a/FlippR-Driver/.settings/language.settings.xml
+++ b/FlippR-Driver/.settings/language.settings.xml
@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-    	
-    <configuration id="cdt.managedbuild.toolchain.gnu.base.1201473626" name="Default">
-        		
-        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-            			
-            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-            			
-            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-            			
-            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-            			
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="709603775115835139" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-                				
-                <language-scope id="org.eclipse.cdt.core.gcc"/>
-                				
-                <language-scope id="org.eclipse.cdt.core.g++"/>
-                			
-            </provider>
-            			
-            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-            		
-        </extension>
-        	
-    </configuration>
-    
+	<configuration id="cdt.managedbuild.toolchain.gnu.base.1201473626" name="Default">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-525411911894964134" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+		</extension>
+	</configuration>
 </project>
diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp
index 6e0e8a8..c9f125c 100644
--- a/FlippR-Driver/src/input/Detector.cpp
+++ b/FlippR-Driver/src/input/Detector.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <math.h>
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h
index 172fa97..66cbbbf 100644
--- a/FlippR-Driver/src/input/Detector.h
+++ b/FlippR-Driver/src/input/Detector.h
@@ -19,7 +19,7 @@
 #include <thread>
 #include <map>
 
-#include "../utilities/IInputGPIOInterface.h"
+#include "utilities/IInputGPIOInterface.h"
 #include "Event.h"
 #include "IEventNotifier.h"
 
diff --git a/FlippR-Driver/src/input/Event.h b/FlippR-Driver/src/input/Event.h
index ee370a4..99972a1 100644
--- a/FlippR-Driver/src/input/Event.h
+++ b/FlippR-Driver/src/input/Event.h
@@ -11,7 +11,7 @@
 #include <set>
 #include <string>
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 namespace Input
 {
diff --git a/FlippR-Driver/src/input/EventHandler.h b/FlippR-Driver/src/input/EventHandler.h
index 95760ae..db0bfdd 100644
--- a/FlippR-Driver/src/input/EventHandler.h
+++ b/FlippR-Driver/src/input/EventHandler.h
@@ -14,8 +14,8 @@
 
 #include "IInputDriver.h"
 
-#include "../utilities/IEventHandler.h"
-#include "../utilities/config.h"
+#include "utilities/IEventHandler.h"
+#include "utilities/config.h"
 #include "Event.h"
 
 namespace Input
diff --git a/FlippR-Driver/src/input/EventNotifier.cpp b/FlippR-Driver/src/input/EventNotifier.cpp
index 485d078..29d8449 100644
--- a/FlippR-Driver/src/input/EventNotifier.cpp
+++ b/FlippR-Driver/src/input/EventNotifier.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/thread.hpp>
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 #include "EventNotifier.h"
 
diff --git a/FlippR-Driver/src/input/EventNotifier.h b/FlippR-Driver/src/input/EventNotifier.h
index 610f1c9..d9d2f80 100644
--- a/FlippR-Driver/src/input/EventNotifier.h
+++ b/FlippR-Driver/src/input/EventNotifier.h
@@ -14,7 +14,7 @@
 #include <thread>
 #include <mutex>
 
-#include "../utilities/BlockingQueue.hpp"
+#include "utilities/BlockingQueue.hpp"
 #include "Event.h"
 #include "EventHandler.h"
 
diff --git a/FlippR-Driver/src/input/InputDriver.cpp b/FlippR-Driver/src/input/InputDriver.cpp
index f2f9124..fd1e4b1 100644
--- a/FlippR-Driver/src/input/InputDriver.cpp
+++ b/FlippR-Driver/src/input/InputDriver.cpp
@@ -6,7 +6,8 @@
  */
 #include "InputDriver.h"
 
-using namespace Input;
+namespace Input
+{
 
 InputDriver::InputDriver(IEventNotifier* event_notifier, IDetector* detector) :
   event_notifier(event_notifier), detector(detector)
@@ -33,4 +34,6 @@ void InputDriver::unregister_event_handler(IEventHandler* handler)
   event_notifier->unregister_event_handler(handler);
 }
 
+}
+
 
diff --git a/FlippR-Driver/src/input/InputDriver.h b/FlippR-Driver/src/input/InputDriver.h
index 9ae7687..6660f1c 100644
--- a/FlippR-Driver/src/input/InputDriver.h
+++ b/FlippR-Driver/src/input/InputDriver.h
@@ -7,7 +7,7 @@
 #ifndef SRC_INPUT_INPUTDRIVER_H_
 #define SRC_INPUT_INPUTDRIVER_H_
 
-#include "../utilities/config.h"
+#include "utilities/config.h"
 
 #include "IInputDriver.h"
 #include "IDetector.h"
diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp
index 4bede47..9240f3c 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.cpp
+++ b/FlippR-Driver/src/input/InputDriverFactory.cpp
@@ -13,7 +13,10 @@
 #include "EventNotifier.h"
 
 using namespace nlohmann;
-using namespace Input;
+
+
+namespace Input
+{
 
 std::shared_ptr<InputDriver> InputDriverFactory::get_InputDriver(std::string& input_config_path, std::string& matrix_config_path)
 {
@@ -70,3 +73,6 @@ void InputDriverFactory::ConfigureLogger()
 {
   LoggerFactory::CreateInputLogger();
 }
+
+
+}
diff --git a/FlippR-Driver/src/input/InputDriverFactory.h b/FlippR-Driver/src/input/InputDriverFactory.h
index ed09f13..1479853 100644
--- a/FlippR-Driver/src/input/InputDriverFactory.h
+++ b/FlippR-Driver/src/input/InputDriverFactory.h
@@ -14,10 +14,10 @@
 #include "Detector.h"
 #include "InputDriver.h"
 
-#include "../utilities/InputGPIOInterface.h"
-#include "../utilities/config.h"
-#include "../lib/json/json.hpp"
-#include "../lib/easylogging/easylogging++.h"
+#include "utilities/InputGPIOInterface.h"
+#include "utilities/config.h"
+#include "lib/json/json.hpp"
+#include "lib/easylogging/easylogging++.h"
 #include "IEventNotifier.h"
 
 
diff --git a/FlippR-Driver/src/utilities/GPIOInterface.cpp b/FlippR-Driver/src/utilities/GPIOInterface.cpp
index 29be310..a58b32b 100644
--- a/FlippR-Driver/src/utilities/GPIOInterface.cpp
+++ b/FlippR-Driver/src/utilities/GPIOInterface.cpp
@@ -7,8 +7,8 @@
 
 #include "GPIOInterface.h"
 
-//#include "../lib/wiringPi/wiringPi.h"
-#include "../lib/json/json.hpp"
+//#include "lib/wiringPi/wiringPi.h"
+#include "lib/json/json.hpp"
 
 
 void GPIOInterface::write_pin(char address, char data)
diff --git a/FlippR-Driver/src/utilities/IEventHandler.h b/FlippR-Driver/src/utilities/IEventHandler.h
index c0c6c61..6ec9759 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.h"
+#include "input/Event.h"
 
 class IEventHandler
 {
diff --git a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
index 5724d60..987f7cd 100644
--- a/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
+++ b/FlippR-Driver/src/utilities/InputGPIOInterface.cpp
@@ -9,8 +9,8 @@
 #include <thread>
 
 #include "InputGPIOInterface.h"
-#include "../lib/json/json.hpp"
-#include "../lib/easylogging/easylogging++.h"
+#include "lib/json/json.hpp"
+#include "lib/easylogging/easylogging++.h"
 #include "config.h"
 #include <string>
 using namespace nlohmann;
diff --git a/FlippR-Driver/src/utilities/config.h b/FlippR-Driver/src/utilities/config.h
index 148461c..f8d41a2 100644
--- a/FlippR-Driver/src/utilities/config.h
+++ b/FlippR-Driver/src/utilities/config.h
@@ -5,7 +5,7 @@
  *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert, Rafael Vinci, Dr. Franca Rupprecht
  */
 
-#include "../lib/easylogging/easylogging++.h"
+#include "lib/easylogging/easylogging++.h"
 
 #define INPUT_LOGGER "driver_logger"
 #define DRIVER_LOG_FILE "/var/log/flippr_driver.conf"