diff --git a/Makefile b/Makefile
index 201a10c410fda37d482d89a1a1ab3a1bb3a89388..2183beb0bf7259711c5073b577a81b8eb6320d22 100644
--- a/Makefile
+++ b/Makefile
@@ -1574,7 +1574,7 @@ LIBGRPC++_SRC = \
     src/cpp/client/credentials.cc \
     src/cpp/client/internal_stub.cc \
     src/cpp/proto/proto_utils.cc \
-    src/cpp/rpc_method.cc \
+    src/cpp/common/rpc_method.cc \
     src/cpp/server/async_server.cc \
     src/cpp/server/async_server_context.cc \
     src/cpp/server/completion_queue.cc \
diff --git a/build.json b/build.json
index 968c1dfadec3a8fc12846dc924297aea77e674cf..219ff23fe137ddeca8dfd0924cf8a08bdf7ad24b 100644
--- a/build.json
+++ b/build.json
@@ -335,7 +335,7 @@
         "src/cpp/client/credentials.cc",
         "src/cpp/client/internal_stub.cc",
         "src/cpp/proto/proto_utils.cc",
-        "src/cpp/rpc_method.cc",
+        "src/cpp/common/rpc_method.cc",
         "src/cpp/server/async_server.cc",
         "src/cpp/server/async_server_context.cc",
         "src/cpp/server/completion_queue.cc",