diff --git a/Arduino/Sensors/DigitalInput.cpp b/Arduino/Things/DigitalInput.cpp
similarity index 100%
rename from Arduino/Sensors/DigitalInput.cpp
rename to Arduino/Things/DigitalInput.cpp
diff --git a/Arduino/Sensors/DigitalInput.h b/Arduino/Things/DigitalInput.h
similarity index 90%
rename from Arduino/Sensors/DigitalInput.h
rename to Arduino/Things/DigitalInput.h
index f2559ac..9d89118 100644
--- a/Arduino/Sensors/DigitalInput.h
+++ b/Arduino/Things/DigitalInput.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Sensors/TouchSensor.h"
+#include "Things/TouchSensor.h"
 
 namespace RoboidControl {
 namespace Arduino {
diff --git a/Arduino/Sensors/UltrasonicSensor.cpp b/Arduino/Things/UltrasonicSensor.cpp
similarity index 100%
rename from Arduino/Sensors/UltrasonicSensor.cpp
rename to Arduino/Things/UltrasonicSensor.cpp
diff --git a/Arduino/Sensors/UltrasonicSensor.h b/Arduino/Things/UltrasonicSensor.h
similarity index 93%
rename from Arduino/Sensors/UltrasonicSensor.h
rename to Arduino/Things/UltrasonicSensor.h
index 5e820e9..2f5784e 100644
--- a/Arduino/Sensors/UltrasonicSensor.h
+++ b/Arduino/Things/UltrasonicSensor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Sensors/TouchSensor.h"
+#include "Things/TouchSensor.h"
 
 namespace RoboidControl {
 namespace Arduino {
diff --git a/SiteServer.cpp b/SiteServer.cpp
index e19c2ff..61d5eed 100644
--- a/SiteServer.cpp
+++ b/SiteServer.cpp
@@ -1,6 +1,6 @@
 #include "SiteServer.h"
 
-#include "Sensors/TemperatureSensor.h"
+#include "Things/TemperatureSensor.h"
 
 #include <functional>
 #include <memory>
diff --git a/Sensors/DigitalSensor.cpp b/Things/DigitalSensor.cpp
similarity index 100%
rename from Sensors/DigitalSensor.cpp
rename to Things/DigitalSensor.cpp
diff --git a/Sensors/DigitalSensor.h b/Things/DigitalSensor.h
similarity index 100%
rename from Sensors/DigitalSensor.h
rename to Things/DigitalSensor.h
diff --git a/Sensors/TemperatureSensor.cpp b/Things/TemperatureSensor.cpp
similarity index 100%
rename from Sensors/TemperatureSensor.cpp
rename to Things/TemperatureSensor.cpp
diff --git a/Sensors/TemperatureSensor.h b/Things/TemperatureSensor.h
similarity index 100%
rename from Sensors/TemperatureSensor.h
rename to Things/TemperatureSensor.h
diff --git a/Sensors/TouchSensor.cpp b/Things/TouchSensor.cpp
similarity index 100%
rename from Sensors/TouchSensor.cpp
rename to Things/TouchSensor.cpp
diff --git a/Sensors/TouchSensor.h b/Things/TouchSensor.h
similarity index 100%
rename from Sensors/TouchSensor.h
rename to Things/TouchSensor.h