diff --git a/watch-faces.mk b/watch-faces.mk
index c07c9aa6..d3c21598 100644
--- a/watch-faces.mk
+++ b/watch-faces.mk
@@ -9,9 +9,10 @@ SRCS += \
   ./watch-faces/complication/sunrise_sunset_face.c \
   ./watch-faces/complication/moon_phase_face.c \
   ./watch-faces/complication/days_since_face.c \
-  ./watch-faces/demo/accelerometer_status_face.c \
   ./watch-faces/demo/all_segments_face.c \
   ./watch-faces/demo/character_set_face.c \
+  ./watch-faces/sensor/accelerometer_status_face.c \
+  ./watch-faces/sensor/light_sensor_face.c \
   ./watch-faces/sensor/temperature_display_face.c \
   ./watch-faces/sensor/temperature_logging_face.c \
   ./watch-faces/sensor/activity_logging_face.c \
@@ -19,7 +20,6 @@ SRCS += \
   ./watch-faces/settings/set_time_face.c \
   ./watch-faces/settings/preferences_face.c \
   ./watch-faces/settings/settings_face.c \
-  ./watch-faces/demo/light_sensor_face.c \
   ./watch-faces/io/chirpy_demo_face.c \
   ./watch-faces/io/irda_upload_face.c \
 # New watch faces go above this line.
diff --git a/watch-faces/demo/accelerometer_status_face.c b/watch-faces/sensor/accelerometer_status_face.c
similarity index 100%
rename from watch-faces/demo/accelerometer_status_face.c
rename to watch-faces/sensor/accelerometer_status_face.c
diff --git a/watch-faces/demo/accelerometer_status_face.h b/watch-faces/sensor/accelerometer_status_face.h
similarity index 100%
rename from watch-faces/demo/accelerometer_status_face.h
rename to watch-faces/sensor/accelerometer_status_face.h
diff --git a/watch-faces/demo/light_sensor_face.c b/watch-faces/sensor/light_sensor_face.c
similarity index 100%
rename from watch-faces/demo/light_sensor_face.c
rename to watch-faces/sensor/light_sensor_face.c
diff --git a/watch-faces/demo/light_sensor_face.h b/watch-faces/sensor/light_sensor_face.h
similarity index 100%
rename from watch-faces/demo/light_sensor_face.h
rename to watch-faces/sensor/light_sensor_face.h