diff --git a/Makefile b/Makefile
index ea9d1ad..3f8893c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ OBJS = $(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(SRC) $(HTML_SRC)))
 
 all: $(TARGET)
 
-%: cmd/%.c $(filter-out cmd/%, $(OBJS))
-	$(CCACHE) $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS)
+%: cmd/% $(OBJS)
+	$(CCACHE) $(CXX) $(CFLAGS) -o $@ $(filter-out cmd/%, $^) $(filter $</%, $^) $(LDLIBS)
 
 install: $(TARGET)
 	install $(TARGET) /usr/local/bin/
diff --git a/cmd/camera-streamer.c b/cmd/camera-streamer/camera-streamer.c
similarity index 100%
rename from cmd/camera-streamer.c
rename to cmd/camera-streamer/camera-streamer.c