diff --git a/FlippR-Driver/include/output/output_items/IEightDigitDisplay.h b/FlippR-Driver/include/output/items/IEightDigitDisplay.h
similarity index 95%
rename from FlippR-Driver/include/output/output_items/IEightDigitDisplay.h
rename to FlippR-Driver/include/output/items/IEightDigitDisplay.h
index 8f3806d..7693d90 100644
--- a/FlippR-Driver/include/output/output_items/IEightDigitDisplay.h
+++ b/FlippR-Driver/include/output/items/IEightDigitDisplay.h
@@ -13,6 +13,8 @@ namespace flippr_driver
 {
 namespace output
 {
+namespace items
+{
 
 class IEightDigitDisplay : public IOutputDisplay
 {
@@ -20,6 +22,7 @@ public:
   virtual void write_content(std::array<char, 8> content) = 0;
 };
 
+}
 }
 }
 #endif //FLIPPR_DRIVER_IEIGHTDIGITDISPLAY_H
diff --git a/FlippR-Driver/include/output/output_items/ILamp.h b/FlippR-Driver/include/output/items/ILamp.h
similarity index 86%
rename from FlippR-Driver/include/output/output_items/ILamp.h
rename to FlippR-Driver/include/output/items/ILamp.h
index 37238b5..83af780 100644
--- a/FlippR-Driver/include/output/output_items/ILamp.h
+++ b/FlippR-Driver/include/output/items/ILamp.h
@@ -12,17 +12,21 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class ILamp
 {
 public:
-  ~ILamp(){};
+  ~ILamp()
+  {};
 
   void activate();
   void deactivate();
   bool is_activated();
 };
 
+}
 }
 }
 
diff --git a/FlippR-Driver/include/output/output_items/IOutputDisplay.h b/FlippR-Driver/include/output/items/IOutputDisplay.h
similarity index 87%
rename from FlippR-Driver/include/output/output_items/IOutputDisplay.h
rename to FlippR-Driver/include/output/items/IOutputDisplay.h
index b3ffb40..68b551e 100644
--- a/FlippR-Driver/include/output/output_items/IOutputDisplay.h
+++ b/FlippR-Driver/include/output/items/IOutputDisplay.h
@@ -12,18 +12,22 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class IDisplay
 {
 
 public:
-  virtual ~IDisplay() {};
+  virtual ~IDisplay()
+  {};
 
   virtual void write_score(int score) = 0;
 };
 
 }
 }
+}
 
 
 #endif /* SRC_OUTPUT_IOUTPUTDISPLAY_H_ */
diff --git a/FlippR-Driver/include/output/output_items/ISevenDigitDisplay.h b/FlippR-Driver/include/output/items/ISevenDigitDisplay.h
similarity index 95%
rename from FlippR-Driver/include/output/output_items/ISevenDigitDisplay.h
rename to FlippR-Driver/include/output/items/ISevenDigitDisplay.h
index b51cc81..c669944 100644
--- a/FlippR-Driver/include/output/output_items/ISevenDigitDisplay.h
+++ b/FlippR-Driver/include/output/items/ISevenDigitDisplay.h
@@ -13,6 +13,8 @@ namespace flippr_driver
 {
 namespace output
 {
+namespace items
+{
 
 class ISevenDigitDisplay : public IOutputDisplay
 {
@@ -20,6 +22,7 @@ public:
   virtual void write_content(std::array<char, 7> content) = 0;
 };
 
+}
 }
 }
 #endif //FLIPPR_DRIVER_ISEVENDIGITDISPLAY_H
diff --git a/FlippR-Driver/include/output/output_items/ISolenoid.h b/FlippR-Driver/include/output/items/ISolenoid.h
similarity index 83%
rename from FlippR-Driver/include/output/output_items/ISolenoid.h
rename to FlippR-Driver/include/output/items/ISolenoid.h
index f69f2be..16625d8 100644
--- a/FlippR-Driver/include/output/output_items/ISolenoid.h
+++ b/FlippR-Driver/include/output/items/ISolenoid.h
@@ -12,14 +12,18 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class ISolenoid
 {
 public:
-  ~ISolenoid() {};
+  ~ISolenoid()
+  {};
   void trigger();
 };
 
+}
 }
 }
 
diff --git a/FlippR-Driver/include/output/output_items/ISound.h b/FlippR-Driver/include/output/items/ISound.h
similarity index 91%
rename from FlippR-Driver/include/output/output_items/ISound.h
rename to FlippR-Driver/include/output/items/ISound.h
index 8c0676a..cc7b9a4 100644
--- a/FlippR-Driver/include/output/output_items/ISound.h
+++ b/FlippR-Driver/include/output/items/ISound.h
@@ -12,6 +12,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class ISound
 {
@@ -22,6 +24,7 @@ public:
 	virtual void play() = 0;
 };
 
+}
 } /* namespace output */
 }
 #endif
\ No newline at end of file
diff --git a/FlippR-Driver/src/output/output_items/Display.h b/FlippR-Driver/src/output/items/Display.h
similarity index 86%
rename from FlippR-Driver/src/output/output_items/Display.h
rename to FlippR-Driver/src/output/items/Display.h
index 86ee80a..78b4745 100644
--- a/FlippR-Driver/src/output/output_items/Display.h
+++ b/FlippR-Driver/src/output/items/Display.h
@@ -16,8 +16,10 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
-template <int DigitCount>
+template<int DigitCount>
 class Display : public IDisplay<DigitCount>
 {
 public:
@@ -36,9 +38,10 @@ private:
   int address;
   int id;
 
-  std::string fit_string(std::string& score_string);
+  std::string fit_string(std::string &score_string);
 };
 
+}
 } /* namespace output */
 }
 
diff --git a/FlippR-Driver/src/output/output_items/Display.hpp b/FlippR-Driver/src/output/items/Display.hpp
similarity index 98%
rename from FlippR-Driver/src/output/output_items/Display.hpp
rename to FlippR-Driver/src/output/items/Display.hpp
index 8845a06..d6e62a4 100644
--- a/FlippR-Driver/src/output/output_items/Display.hpp
+++ b/FlippR-Driver/src/output/items/Display.hpp
@@ -12,6 +12,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 template<int DigitCount>
 Display<DigitCount>::Display(int address, int id) :
@@ -61,3 +63,4 @@ void Display<DigitCount>::write_content( std::array<char, DigitCount> content)
 
 }
 }
+}
diff --git a/FlippR-Driver/src/output/output_items/EightDigitDisplay.h b/FlippR-Driver/src/output/items/EightDigitDisplay.h
similarity index 94%
rename from FlippR-Driver/src/output/output_items/EightDigitDisplay.h
rename to FlippR-Driver/src/output/items/EightDigitDisplay.h
index 98d977b..f1c96f9 100644
--- a/FlippR-Driver/src/output/output_items/EightDigitDisplay.h
+++ b/FlippR-Driver/src/output/items/EightDigitDisplay.h
@@ -11,9 +11,12 @@ namespace flippr_driver
 {
 namespace output
 {
+namespace items
+{
 
 class EightDigitDisplay : public Display<8>, IEightDigitDisplay;
 
+}
 }
 }
 #endif //FLIPPR_DRIVER_EIGHTDIGITDISPLAY_H
diff --git a/FlippR-Driver/src/output/output_items/IDisplay.h b/FlippR-Driver/src/output/items/IDisplay.h
similarity index 94%
rename from FlippR-Driver/src/output/output_items/IDisplay.h
rename to FlippR-Driver/src/output/items/IDisplay.h
index 0ebc805..34794d5 100644
--- a/FlippR-Driver/src/output/output_items/IDisplay.h
+++ b/FlippR-Driver/src/output/items/IDisplay.h
@@ -14,6 +14,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class IDisplay
 {
@@ -23,10 +25,9 @@ public:
 	virtual ~IDisplay();
 
 	virtual int getID() = 0;
-
-	virtual
 };
 
+}
 } /* namespace output */
 }
 #endif
diff --git a/FlippR-Driver/src/output/output_items/IOutputDisplay.h b/FlippR-Driver/src/output/items/IOutputDisplay.h
similarity index 95%
rename from FlippR-Driver/src/output/output_items/IOutputDisplay.h
rename to FlippR-Driver/src/output/items/IOutputDisplay.h
index bddd0b0..ffeb66b 100644
--- a/FlippR-Driver/src/output/output_items/IOutputDisplay.h
+++ b/FlippR-Driver/src/output/items/IOutputDisplay.h
@@ -12,6 +12,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class IDisplay
 {
@@ -26,6 +28,7 @@ public:
 
 }
 }
+}
 
 
 #endif /* SRC_OUTPUT_IOUTPUTDISPLAY_H_ */
diff --git a/FlippR-Driver/src/output/output_items/IOutputItem.h b/FlippR-Driver/src/output/items/IOutputItem.h
similarity index 93%
rename from FlippR-Driver/src/output/output_items/IOutputItem.h
rename to FlippR-Driver/src/output/items/IOutputItem.h
index fe9f7d3..846ba35 100644
--- a/FlippR-Driver/src/output/output_items/IOutputItem.h
+++ b/FlippR-Driver/src/output/items/IOutputItem.h
@@ -13,6 +13,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class IOutputItem
 {
@@ -22,6 +24,7 @@ class IOutputItem
   virtual bool deactivate() = 0;
 };
 
+}
 }
 }
 
diff --git a/FlippR-Driver/src/output/output_items/Lamp.cpp b/FlippR-Driver/src/output/items/Lamp.cpp
similarity index 76%
rename from FlippR-Driver/src/output/output_items/Lamp.cpp
rename to FlippR-Driver/src/output/items/Lamp.cpp
index f36c88c..c157682 100644
--- a/FlippR-Driver/src/output/output_items/Lamp.cpp
+++ b/FlippR-Driver/src/output/items/Lamp.cpp
@@ -11,13 +11,13 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
-Lamp::Lamp(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name, bool activated) :
-  OutputItem(output_gpio_interface, i2c_address, data_pin, name),
-  activated(activated)
-{}
-
-Lamp::~Lamp()
+Lamp::Lamp(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name, bool activated)
+:
+OutputItem(output_gpio_interface, i2c_address, data_pin, name),
+activated(activated)
 {}
 
 void Lamp::activate()
@@ -25,12 +25,11 @@ void Lamp::activate()
   OutputItem::activate();
 }
 
-
 void Lamp::deactivate()
 {
   OutputItem::deactivate();
 }
 
-
+}
 } /* namespace output */
 }
diff --git a/FlippR-Driver/src/output/output_items/Lamp.h b/FlippR-Driver/src/output/items/Lamp.h
similarity index 92%
rename from FlippR-Driver/src/output/output_items/Lamp.h
rename to FlippR-Driver/src/output/items/Lamp.h
index 847235a..3dbaced 100644
--- a/FlippR-Driver/src/output/output_items/Lamp.h
+++ b/FlippR-Driver/src/output/items/Lamp.h
@@ -15,12 +15,14 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class Lamp : public OutputItem, ILamp
 {
 public:
   Lamp(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name, bool activated = false);
-  virtual ~Lamp();
+  virtual ~Lamp() = default;
 
   void activate();
   void deactivate();
@@ -30,6 +32,7 @@ private:
   bool activated;
 };
 
+}
 } /* namespace output */
 }
 #endif
diff --git a/FlippR-Driver/src/output/output_items/OutputItem.h b/FlippR-Driver/src/output/items/OutputItem.h
similarity index 97%
rename from FlippR-Driver/src/output/output_items/OutputItem.h
rename to FlippR-Driver/src/output/items/OutputItem.h
index 4f53131..68447d9 100644
--- a/FlippR-Driver/src/output/output_items/OutputItem.h
+++ b/FlippR-Driver/src/output/items/OutputItem.h
@@ -19,6 +19,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class OutputItem : public IOutputItem
 {
@@ -36,6 +38,7 @@ protected:
   void deactivate();
 };
 
+}
 } /* namespace output */
 }
 #endif
diff --git a/FlippR-Driver/src/output/output_items/SevenDigitDisplay.h b/FlippR-Driver/src/output/items/SevenDigitDisplay.h
similarity index 93%
rename from FlippR-Driver/src/output/output_items/SevenDigitDisplay.h
rename to FlippR-Driver/src/output/items/SevenDigitDisplay.h
index e23dac6..25ec01f 100644
--- a/FlippR-Driver/src/output/output_items/SevenDigitDisplay.h
+++ b/FlippR-Driver/src/output/items/SevenDigitDisplay.h
@@ -9,9 +9,12 @@ namespace flippr_driver
 {
 namespace output
 {
+namespace items
+{
 
 class SevenDigitDisplay : public Display<7>, ISevenDigitDisplay;
 
+}
 }
 }
 #endif //FLIPPR_DRIVER_SEVENDIGITDISPLAY_H
diff --git a/FlippR-Driver/src/output/output_items/Solenoid.cpp b/FlippR-Driver/src/output/items/Solenoid.cpp
similarity index 64%
rename from FlippR-Driver/src/output/output_items/Solenoid.cpp
rename to FlippR-Driver/src/output/items/Solenoid.cpp
index e65342c..d3f1fc5 100644
--- a/FlippR-Driver/src/output/output_items/Solenoid.cpp
+++ b/FlippR-Driver/src/output/items/Solenoid.cpp
@@ -9,20 +9,15 @@
 
 namespace flippR_driver
 {
-namespace output {
-
-Solenoid::Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name, std::chrono::milliseconds deactivation_time) :
-  OutputItem(output_gpio_interface, i2c_address, data_pin, name),
-  deactivation_time(deactivation_time)
+namespace output
 {
-	// TODO Auto-generated constructor stub
-
-}
-
-Solenoid::~Solenoid()
+namespace items
 {
-	// TODO Auto-generated destructor stub
-}
+Solenoid::Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name, std::chrono::milliseconds deactivation_time)
+:
+OutputItem(output_gpio_interface, i2c_address, data_pin, name),
+deactivation_time(deactivation_time)
+{}
 
 void Solenoid::triggerTask()
 {
@@ -37,5 +32,6 @@ void Solenoid::trigger()
   std::async(std::launch::async, &Solenoid::triggerTask);
 }
 
+}
 } /* namespace output */
 }
diff --git a/FlippR-Driver/src/output/output_items/Solenoid.h b/FlippR-Driver/src/output/items/Solenoid.h
similarity index 92%
rename from FlippR-Driver/src/output/output_items/Solenoid.h
rename to FlippR-Driver/src/output/items/Solenoid.h
index 3e1790d..183282c 100644
--- a/FlippR-Driver/src/output/output_items/Solenoid.h
+++ b/FlippR-Driver/src/output/items/Solenoid.h
@@ -19,18 +19,21 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class Solenoid : public ISolenoid, OutputItem
 {
 public:
   Solenoid(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name, std::chrono::milliseconds deactivation_time);
-  virtual ~Solenoid();
+  virtual ~Solenoid() = default;
 
   void trigger();
 
 private:
   virtual void triggerTask();
 
+}
 } /* namespace output */
 }
 #endif
diff --git a/FlippR-Driver/src/output/output_items/Sound.cpp b/FlippR-Driver/src/output/items/Sound.cpp
similarity index 85%
rename from FlippR-Driver/src/output/output_items/Sound.cpp
rename to FlippR-Driver/src/output/items/Sound.cpp
index 9855bea..96ad1ec 100644
--- a/FlippR-Driver/src/output/output_items/Sound.cpp
+++ b/FlippR-Driver/src/output/items/Sound.cpp
@@ -13,9 +13,12 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
-Sound::Sound(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name) :
-  OutputItem(output_gpio_interface, i2c_address, data_pin, name)
+Sound::Sound(std::shared_ptr<utility::IOutputGPIOInterface> output_gpio_interface, int i2c_address, int data_pin, std::string name)
+:
+OutputItem(output_gpio_interface, i2c_address, data_pin, name)
 {}
 
 void Sound::play()
@@ -32,5 +35,6 @@ void Sound::playTask()
   OutputItem::deactivate();
 }
 
+}
 } /* namespace output */
 }
diff --git a/FlippR-Driver/src/output/output_items/Sound.h b/FlippR-Driver/src/output/items/Sound.h
similarity index 96%
rename from FlippR-Driver/src/output/output_items/Sound.h
rename to FlippR-Driver/src/output/items/Sound.h
index ec32535..08eebff 100644
--- a/FlippR-Driver/src/output/output_items/Sound.h
+++ b/FlippR-Driver/src/output/items/Sound.h
@@ -19,6 +19,8 @@ namespace flippR_driver
 {
 namespace output
 {
+namespace items
+{
 
 class Sound : public ISound, OutputItem
 {
@@ -32,6 +34,7 @@ private:
 	virtual void playTask();
 };
 
+}
 } /* namespace output */
 }
 #endif