diff --git a/src/solar.cpp b/src/devices/solar.cpp
similarity index 100%
rename from src/solar.cpp
rename to src/devices/solar.cpp
diff --git a/src/solar.h b/src/devices/solar.h
similarity index 100%
rename from src/solar.h
rename to src/devices/solar.h
diff --git a/src/switch.cpp b/src/devices/switch.cpp
similarity index 100%
rename from src/switch.cpp
rename to src/devices/switch.cpp
diff --git a/src/switch.h b/src/devices/switch.h
similarity index 100%
rename from src/switch.h
rename to src/devices/switch.h
diff --git a/src/thermostat.cpp b/src/devices/thermostat.cpp
similarity index 100%
rename from src/thermostat.cpp
rename to src/devices/thermostat.cpp
diff --git a/src/thermostat.h b/src/devices/thermostat.h
similarity index 100%
rename from src/thermostat.h
rename to src/devices/thermostat.h