diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index 7d87407663..3ca7b31adc 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -21,6 +21,7 @@ function(configure_fdbserver_target_includes target_name)
 endfunction()
 
 add_subdirectory(core)
+add_subdirectory(commitproxy)
 add_subdirectory(grvproxy)
 add_subdirectory(ratekeeper)
 
@@ -145,7 +146,7 @@ if (WITH_SWIFT)
 endif()
 
 configure_fdbserver_target_includes(fdbserver)
-target_link_libraries(fdbserver PRIVATE fdbserver_grvproxy fdbserver_ratekeeper fdbserver_core)
+target_link_libraries(fdbserver PRIVATE fdbserver_commitproxy fdbserver_grvproxy fdbserver_ratekeeper fdbserver_core)
 if (WITH_ROCKSDB)
   add_dependencies(fdbserver rocksdb)
   if(WITH_LIBURING)
diff --git a/fdbserver/commitproxy/CMakeLists.txt b/fdbserver/commitproxy/CMakeLists.txt
new file mode 100644
index 0000000000..036e53294c
--- /dev/null
+++ b/fdbserver/commitproxy/CMakeLists.txt
@@ -0,0 +1,12 @@
+fdb_find_sources(FDBSERVER_COMMITPROXY_SRCS)
+
+add_flow_target(STATIC_LIBRARY NAME fdbserver_commitproxy SRCS ${FDBSERVER_COMMITPROXY_SRCS})
+
+configure_fdbserver_common_includes(fdbserver_commitproxy)
+target_include_directories(fdbserver_commitproxy
+  PUBLIC
+    ${CMAKE_SOURCE_DIR}/fdbserver/include
+    ${CMAKE_BINARY_DIR}/fdbserver/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}/include)
+target_link_libraries(fdbserver_commitproxy PRIVATE fdbclient fdbserver_core)
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/commitproxy/CommitProxyServer.actor.cpp
similarity index 99%
rename from fdbserver/CommitProxyServer.actor.cpp
rename to fdbserver/commitproxy/CommitProxyServer.actor.cpp
index c39ad4b445..582ab774ef 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/commitproxy/CommitProxyServer.actor.cpp
@@ -49,7 +49,7 @@
 #include "fdbserver/LogSystemDiskQueueAdapter.h"
 #include "fdbserver/MasterInterface.h"
 #include "fdbserver/MutationTracking.h"
-#include "fdbserver/ProxyCommitData.actor.h"
+#include "fdbserver/commitproxy/ProxyCommitData.actor.h"
 #include "fdbserver/RatekeeperInterface.h"
 #include "fdbserver/RecoveryState.h"
 #include "fdbserver/RestoreUtil.h"
diff --git a/fdbserver/include/fdbserver/ProxyCommitData.actor.h b/fdbserver/commitproxy/include/fdbserver/commitproxy/ProxyCommitData.actor.h
similarity index 97%
rename from fdbserver/include/fdbserver/ProxyCommitData.actor.h
rename to fdbserver/commitproxy/include/fdbserver/commitproxy/ProxyCommitData.actor.h
index 3ecf25a619..6d38735576 100644
--- a/fdbserver/include/fdbserver/ProxyCommitData.actor.h
+++ b/fdbserver/commitproxy/include/fdbserver/commitproxy/ProxyCommitData.actor.h
@@ -19,11 +19,11 @@
  */
 
 #pragma once
-#if defined(NO_INTELLISENSE) && !defined(FDBSERVER_PROXYCOMMITDATA_ACTOR_G_H)
-#define FDBSERVER_PROXYCOMMITDATA_ACTOR_G_H
-#include "fdbserver/ProxyCommitData.actor.g.h"
-#elif !defined(FDBSERVER_PROXYCOMMITDATA_ACTOR_H)
-#define FDBSERVER_PROXYCOMMITDATA_ACTOR_H
+#if defined(NO_INTELLISENSE) && !defined(FDBSERVER_COMMITPROXY_PROXYCOMMITDATA_ACTOR_G_H)
+#define FDBSERVER_COMMITPROXY_PROXYCOMMITDATA_ACTOR_G_H
+#include "fdbserver/commitproxy/ProxyCommitData.actor.g.h"
+#elif !defined(FDBSERVER_COMMITPROXY_PROXYCOMMITDATA_ACTOR_H)
+#define FDBSERVER_COMMITPROXY_PROXYCOMMITDATA_ACTOR_H
 
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/RangeLock.h"
@@ -32,8 +32,8 @@
 #include "fdbserver/Knobs.h"
 #include "fdbserver/LogSystem.h"
 #include "fdbserver/LogSystemDiskQueueAdapter.h"
-#include "fdbserver/MasterInterface.h"
-#include "fdbserver/ResolverInterface.h"
+#include "fdbserver/core/MasterInterface.h"
+#include "fdbserver/core/ResolverInterface.h"
 #include "flow/IRandom.h"
 
 #include "flow/actorcompiler.h" // This must be the last #include.
@@ -407,4 +407,4 @@ private:
 };
 
 #include "flow/unactorcompiler.h"
-#endif // FDBSERVER_PROXYCOMMITDATA_H
+#endif // FDBSERVER_COMMITPROXY_PROXYCOMMITDATA_ACTOR_H
diff --git a/fdbserver/include/fdbserver/ApplyMetadataMutation.h b/fdbserver/include/fdbserver/ApplyMetadataMutation.h
index 0f31b84927..67ef837ba7 100644
--- a/fdbserver/include/fdbserver/ApplyMetadataMutation.h
+++ b/fdbserver/include/fdbserver/ApplyMetadataMutation.h
@@ -32,7 +32,7 @@
 #include "fdbserver/IKeyValueStore.h"
 #include "fdbserver/LogProtocolMessage.h"
 #include "fdbserver/LogSystem.h"
-#include "fdbserver/ProxyCommitData.actor.h"
+#include "fdbserver/commitproxy/ProxyCommitData.actor.h"
 #include "flow/FastRef.h"
 
 // Resolver's data for applyMetadataMutations() calls.