diff --git a/cpp/Makefile b/cpp/Makefile
index 869f46b0..fd7e5327 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -117,7 +117,7 @@ ifeq ($(CONNECT_TYPE), FULLSPEC)
 	BIN_ALL += $(BINDIR)/$(S2PEXEC)
 endif
 
-SRC_PROTOC = command_interface.proto
+SRC_PROTOC = ../proto/command_interface.proto
 
 SRC_GENERATED = $(GENERATED_DIR)/command_interface.pb.cpp
 
@@ -236,7 +236,7 @@ ifeq ($(CONNECT_TYPE), FULLSPEC)
 	BINARIES += $(INSTALL_BIN)/$(S2PEXEC)
 endif
 
-GENERATED_DIR := generated
+GENERATED_DIR := ../generated
 
 # The following will include all of the auto-generated dependency files (*.d)
 # if they exist. This will trigger a rebuild of a source file if a header changes
diff --git a/cpp/command_interface.proto b/proto/command_interface.proto
similarity index 100%
rename from cpp/command_interface.proto
rename to proto/command_interface.proto