6 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 634d5245ac6..7ed2d8828bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -479,7 +479,12 @@ librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 \
 	-export-symbols-regex '^rbd_.*' $(PTHREAD_LIBS) $(EXTRALIBS) 
 lib_LTLIBRARIES += librbd.la
 
-rados_SOURCES = rados.cc rados_import.cc rados_export.cc rados_sync.cc common/obj_bencher.cc
+rados_SOURCES = \
+	tools/rados/rados.cc \
+	tools/rados/rados_import.cc \
+	tools/rados/rados_export.cc \
+	tools/rados/rados_sync.cc \
+	common/obj_bencher.cc
 rados_LDADD = libcls_lock_client.a librados.la $(LIBGLOBAL_LDA)
 bin_PROGRAMS += rados
 
@@ -1784,7 +1789,7 @@ python_PYTHON = pybind/rados.py \
 # headers... and everything else we want to include in a 'make dist' 
 # that autotools doesn't magically identify.
 noinst_HEADERS = \
-	rados_sync.h \
+	tools/rados/rados_sync.h \
 	arch/probe.h \
 	arch/intel.h \
 	arch/neon.h \
diff --git a/src/rados.cc b/src/tools/rados/rados.cc
index 0b7cc2b9cb7..0b7cc2b9cb7 100644
--- a/src/rados.cc
+++ b/src/tools/rados/rados.cc
diff --git a/src/rados_export.cc b/src/tools/rados/rados_export.cc
index bf6654114c5..bf6654114c5 100644
--- a/src/rados_export.cc
+++ b/src/tools/rados/rados_export.cc
diff --git a/src/rados_import.cc b/src/tools/rados/rados_import.cc
index a6a398d767b..a6a398d767b 100644
--- a/src/rados_import.cc
+++ b/src/tools/rados/rados_import.cc
diff --git a/src/rados_sync.cc b/src/tools/rados/rados_sync.cc
index 03293d3402a..03293d3402a 100644
--- a/src/rados_sync.cc
+++ b/src/tools/rados/rados_sync.cc
diff --git a/src/rados_sync.h b/src/tools/rados/rados_sync.h
index 0f7226e0239..0f7226e0239 100644
--- a/src/rados_sync.h
+++ b/src/tools/rados/rados_sync.h