diff --git a/FlippR-Driver/src/output/IOutputDriver.h b/FlippR-Driver/include/output/IOutputDriver.h
similarity index 100%
rename from FlippR-Driver/src/output/IOutputDriver.h
rename to FlippR-Driver/include/output/IOutputDriver.h
diff --git a/FlippR-Driver/include/output/IEightDigitDisplay.h b/FlippR-Driver/include/output/output_items/IEightDigitDisplay.h
similarity index 100%
rename from FlippR-Driver/include/output/IEightDigitDisplay.h
rename to FlippR-Driver/include/output/output_items/IEightDigitDisplay.h
diff --git a/FlippR-Driver/src/output/output_items/ILamp.h b/FlippR-Driver/include/output/output_items/ILamp.h
similarity index 69%
rename from FlippR-Driver/src/output/output_items/ILamp.h
rename to FlippR-Driver/include/output/output_items/ILamp.h
index 0484183..37238b5 100644
--- a/FlippR-Driver/src/output/output_items/ILamp.h
+++ b/FlippR-Driver/include/output/output_items/ILamp.h
@@ -15,7 +15,12 @@ namespace output
 
 class ILamp
 {
+public:
+  ~ILamp(){};
 
+  void activate();
+  void deactivate();
+  bool is_activated();
 };
 
 }
diff --git a/FlippR-Driver/include/output/IOutputDisplay.h b/FlippR-Driver/include/output/output_items/IOutputDisplay.h
similarity index 89%
rename from FlippR-Driver/include/output/IOutputDisplay.h
rename to FlippR-Driver/include/output/output_items/IOutputDisplay.h
index 59f414e..b3ffb40 100644
--- a/FlippR-Driver/include/output/IOutputDisplay.h
+++ b/FlippR-Driver/include/output/output_items/IOutputDisplay.h
@@ -17,8 +17,7 @@ class IDisplay
 {
 
 public:
-  IDisplay();
-  virtual ~IDisplay();
+  virtual ~IDisplay() {};
 
   virtual void write_score(int score) = 0;
 };
diff --git a/FlippR-Driver/include/output/ISevenDigitDisplay.h b/FlippR-Driver/include/output/output_items/ISevenDigitDisplay.h
similarity index 100%
rename from FlippR-Driver/include/output/ISevenDigitDisplay.h
rename to FlippR-Driver/include/output/output_items/ISevenDigitDisplay.h
diff --git a/FlippR-Driver/src/output/output_items/ISolenoid.h b/FlippR-Driver/include/output/output_items/ISolenoid.h
similarity index 81%
rename from FlippR-Driver/src/output/output_items/ISolenoid.h
rename to FlippR-Driver/include/output/output_items/ISolenoid.h
index 8c69c48..f69f2be 100644
--- a/FlippR-Driver/src/output/output_items/ISolenoid.h
+++ b/FlippR-Driver/include/output/output_items/ISolenoid.h
@@ -15,7 +15,9 @@ namespace output
 
 class ISolenoid
 {
-
+public:
+  ~ISolenoid() {};
+  void trigger();
 };
 
 }
diff --git a/FlippR-Driver/src/output/output_items/ISound.h b/FlippR-Driver/include/output/output_items/ISound.h
similarity index 100%
rename from FlippR-Driver/src/output/output_items/ISound.h
rename to FlippR-Driver/include/output/output_items/ISound.h
diff --git a/FlippR-Driver/src/output/OutputDriver.h b/FlippR-Driver/src/output/OutputDriver.h
index be2c454..f5af5e2 100644
--- a/FlippR-Driver/src/output/OutputDriver.h
+++ b/FlippR-Driver/src/output/OutputDriver.h
@@ -8,7 +8,7 @@
 #ifndef _SRC_OUTPUT_OUTPUTDRIVER_H_
 #define _SRC_OUTPUT_OUTPUTDRIVER_H_
 
-#include "IOutputDriver.h"
+#include "output/IOutputDriver.h"
 #include <vector>
 #include <map>
 #include <memory>
diff --git a/FlippR-Driver/src/output/output_items/Lamp.h b/FlippR-Driver/src/output/output_items/Lamp.h
index a9f5b99..847235a 100644
--- a/FlippR-Driver/src/output/output_items/Lamp.h
+++ b/FlippR-Driver/src/output/output_items/Lamp.h
@@ -9,7 +9,7 @@
 #define _SRC_OUTPUT_LAMP_H_
 
 #include "OutputItem.h"
-#include "ILamp.h"
+#include "../../../include/output/output_items/ILamp.h"
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/src/output/output_items/Solenoid.h b/FlippR-Driver/src/output/output_items/Solenoid.h
index 1306921..c09cbb5 100644
--- a/FlippR-Driver/src/output/output_items/Solenoid.h
+++ b/FlippR-Driver/src/output/output_items/Solenoid.h
@@ -9,7 +9,7 @@
 #define _SRC_OUTPUT_SOLENOID_H_
 
 #include "OutputItem.h"
-#include "ISolenoid.h"
+#include "../../../include/output/output_items/ISolenoid.h"
 
 #include <future>
 #include <thread>
diff --git a/FlippR-Driver/src/output/output_items/Sound.h b/FlippR-Driver/src/output/output_items/Sound.h
index 52cd1eb..1138d46 100644
--- a/FlippR-Driver/src/output/output_items/Sound.h
+++ b/FlippR-Driver/src/output/output_items/Sound.h
@@ -8,7 +8,7 @@
 #ifndef _SRC_OUTPUT_SOUND_H_
 #define _SRC_OUTPUT_SOUND_H_
 
-#include "ISound.h"
+#include "../../../include/output/output_items/ISound.h"
 
 #include <memory>
 #include <string>