diff --git a/FlippR-Driver/src/output/Display.h b/FlippR-Driver/src/output/output_items/Display.h
similarity index 100%
rename from FlippR-Driver/src/output/Display.h
rename to FlippR-Driver/src/output/output_items/Display.h
diff --git a/FlippR-Driver/src/output/Display.hpp b/FlippR-Driver/src/output/output_items/Display.hpp
similarity index 100%
rename from FlippR-Driver/src/output/Display.hpp
rename to FlippR-Driver/src/output/output_items/Display.hpp
diff --git a/FlippR-Driver/src/output/EightDigitDisplay.h b/FlippR-Driver/src/output/output_items/EightDigitDisplay.h
similarity index 100%
rename from FlippR-Driver/src/output/EightDigitDisplay.h
rename to FlippR-Driver/src/output/output_items/EightDigitDisplay.h
diff --git a/FlippR-Driver/src/output/IDisplay.h b/FlippR-Driver/src/output/output_items/IDisplay.h
similarity index 100%
rename from FlippR-Driver/src/output/IDisplay.h
rename to FlippR-Driver/src/output/output_items/IDisplay.h
diff --git a/FlippR-Driver/src/output/ILamp.h b/FlippR-Driver/src/output/output_items/ILamp.h
similarity index 100%
rename from FlippR-Driver/src/output/ILamp.h
rename to FlippR-Driver/src/output/output_items/ILamp.h
diff --git a/FlippR-Driver/src/output/IOutputDisplay.h b/FlippR-Driver/src/output/output_items/IOutputDisplay.h
similarity index 100%
rename from FlippR-Driver/src/output/IOutputDisplay.h
rename to FlippR-Driver/src/output/output_items/IOutputDisplay.h
diff --git a/FlippR-Driver/src/output/IOutputItem.h b/FlippR-Driver/src/output/output_items/IOutputItem.h
similarity index 100%
rename from FlippR-Driver/src/output/IOutputItem.h
rename to FlippR-Driver/src/output/output_items/IOutputItem.h
diff --git a/FlippR-Driver/src/output/ISolenoid.h b/FlippR-Driver/src/output/output_items/ISolenoid.h
similarity index 100%
rename from FlippR-Driver/src/output/ISolenoid.h
rename to FlippR-Driver/src/output/output_items/ISolenoid.h
diff --git a/FlippR-Driver/src/output/ISound.h b/FlippR-Driver/src/output/output_items/ISound.h
similarity index 100%
rename from FlippR-Driver/src/output/ISound.h
rename to FlippR-Driver/src/output/output_items/ISound.h
diff --git a/FlippR-Driver/src/output/Lamp.cpp b/FlippR-Driver/src/output/output_items/Lamp.cpp
similarity index 100%
rename from FlippR-Driver/src/output/Lamp.cpp
rename to FlippR-Driver/src/output/output_items/Lamp.cpp
diff --git a/FlippR-Driver/src/output/Lamp.h b/FlippR-Driver/src/output/output_items/Lamp.h
similarity index 100%
rename from FlippR-Driver/src/output/Lamp.h
rename to FlippR-Driver/src/output/output_items/Lamp.h
diff --git a/FlippR-Driver/src/output/OutputItem.h b/FlippR-Driver/src/output/output_items/OutputItem.h
similarity index 100%
rename from FlippR-Driver/src/output/OutputItem.h
rename to FlippR-Driver/src/output/output_items/OutputItem.h
diff --git a/FlippR-Driver/src/output/SevenDigitDisplay.h b/FlippR-Driver/src/output/output_items/SevenDigitDisplay.h
similarity index 100%
rename from FlippR-Driver/src/output/SevenDigitDisplay.h
rename to FlippR-Driver/src/output/output_items/SevenDigitDisplay.h
diff --git a/FlippR-Driver/src/output/Solenoid.cpp b/FlippR-Driver/src/output/output_items/Solenoid.cpp
similarity index 100%
rename from FlippR-Driver/src/output/Solenoid.cpp
rename to FlippR-Driver/src/output/output_items/Solenoid.cpp
diff --git a/FlippR-Driver/src/output/Solenoid.h b/FlippR-Driver/src/output/output_items/Solenoid.h
similarity index 100%
rename from FlippR-Driver/src/output/Solenoid.h
rename to FlippR-Driver/src/output/output_items/Solenoid.h
diff --git a/FlippR-Driver/src/output/Sound.cpp b/FlippR-Driver/src/output/output_items/Sound.cpp
similarity index 100%
rename from FlippR-Driver/src/output/Sound.cpp
rename to FlippR-Driver/src/output/output_items/Sound.cpp
diff --git a/FlippR-Driver/src/output/Sound.h b/FlippR-Driver/src/output/output_items/Sound.h
similarity index 100%
rename from FlippR-Driver/src/output/Sound.h
rename to FlippR-Driver/src/output/output_items/Sound.h