diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a435bf8ca5..73bea2e230 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,6 @@ if(UNIX)
 endif()
 add_subdirectory(core)
 add_subdirectory(aio)
-add_subdirectory(dist)
 add_subdirectory(zookeeper)
 add_subdirectory(perf_counter)
 add_subdirectory(failure_detector)
@@ -15,3 +14,4 @@ add_subdirectory(client)
 add_subdirectory(common)
 add_subdirectory(replica)
 add_subdirectory(meta)
+add_subdirectory(tools)
diff --git a/src/dist/CMakeLists.txt b/src/dist/CMakeLists.txt
deleted file mode 100644
index 29749fd198..0000000000
--- a/src/dist/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(replication)
diff --git a/src/dist/replication/CMakeLists.txt b/src/dist/replication/CMakeLists.txt
deleted file mode 100644
index 936a952f6a..0000000000
--- a/src/dist/replication/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(tool_lib)
diff --git a/src/dist/replication/tool_lib/CMakeLists.txt b/src/tools/CMakeLists.txt
similarity index 100%
rename from src/dist/replication/tool_lib/CMakeLists.txt
rename to src/tools/CMakeLists.txt
diff --git a/src/dist/replication/tool_lib/mutation_log_tool.cpp b/src/tools/mutation_log_tool.cpp
similarity index 100%
rename from src/dist/replication/tool_lib/mutation_log_tool.cpp
rename to src/tools/mutation_log_tool.cpp