diff --git a/compile_thrift.py b/compile_thrift.py
index b8e0090911..8cccac4384 100755
--- a/compile_thrift.py
+++ b/compile_thrift.py
@@ -79,10 +79,10 @@
     },
     {
         "name": "command",
-        "path": "src/dist/cmd",
+        "path": "src/remote_cmd",
         "file_move": {
-            "_types.h": "src/dist/cmd",
-            "_types.cpp": "src/dist/cmd"
+            "_types.h": "src/remote_cmd",
+            "_types.cpp": "src/remote_cmd"
         }
     }
 ]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03efd2eb3b..f89272efdf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,6 +4,7 @@ endif()
 add_subdirectory(core)
 add_subdirectory(aio)
 add_subdirectory(dist)
+add_subdirectory(remote_cmd)
 add_subdirectory(nfs)
 add_subdirectory(block_service)
 add_subdirectory(http)
diff --git a/src/dist/CMakeLists.txt b/src/dist/CMakeLists.txt
index d2a77fb120..30b877daaa 100644
--- a/src/dist/CMakeLists.txt
+++ b/src/dist/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_subdirectory(failure_detector)
 add_subdirectory(replication)
 add_subdirectory(failure_detector_multimaster)
-add_subdirectory(cmd)
diff --git a/src/dist/cmd/CMakeLists.txt b/src/remote_cmd/CMakeLists.txt
similarity index 100%
rename from src/dist/cmd/CMakeLists.txt
rename to src/remote_cmd/CMakeLists.txt
diff --git a/src/dist/cmd/command.thrift b/src/remote_cmd/command.thrift
similarity index 100%
rename from src/dist/cmd/command.thrift
rename to src/remote_cmd/command.thrift
diff --git a/src/dist/cmd/command_types.cpp b/src/remote_cmd/command_types.cpp
similarity index 100%
rename from src/dist/cmd/command_types.cpp
rename to src/remote_cmd/command_types.cpp
diff --git a/src/dist/cmd/command_types.h b/src/remote_cmd/command_types.h
similarity index 100%
rename from src/dist/cmd/command_types.h
rename to src/remote_cmd/command_types.h
diff --git a/src/dist/cmd/remote_command.cpp b/src/remote_cmd/remote_command.cpp
similarity index 100%
rename from src/dist/cmd/remote_command.cpp
rename to src/remote_cmd/remote_command.cpp