diff --git a/algo/kf/CMakeLists.txt b/algo/kf/CMakeLists.txt
index adc699bb9489a8009a46a43d05f011fec8b2d135..ad6d4787c23e301370f65bac17e7904ad27d4a22 100644
--- a/algo/kf/CMakeLists.txt
+++ b/algo/kf/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(core)
-add_subdirectory(tools)
diff --git a/reco/CMakeLists.txt b/reco/CMakeLists.txt
index 20e15f4e337aa862b8e85f07068f85ebed7b9aa0..d9d1512d4c66837d14c8d5344ca4d0ad106f3a74 100644
--- a/reco/CMakeLists.txt
+++ b/reco/CMakeLists.txt
@@ -11,7 +11,7 @@ add_subdirectory(calibration)
 add_subdirectory(detectors)
 add_subdirectory(eventbuilder)
 add_subdirectory(global)
-add_subdirectory(kf)
+add_subdirectory(kfnew)  # FIXME: replace with kf after removing KF
 add_subdirectory(KF)
 add_subdirectory(L1)
 add_subdirectory(littrack)
diff --git a/reco/kf/CMakeLists.txt b/reco/kfnew/CMakeLists.txt
similarity index 99%
rename from reco/kf/CMakeLists.txt
rename to reco/kfnew/CMakeLists.txt
index ff911e51c2e38dad008f201720ebde1e36e9ff53..2b02e92bc89ed9400d3d03274768aec3163fa6be 100644
--- a/reco/kf/CMakeLists.txt
+++ b/reco/kfnew/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(tools)
+
 set(INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
diff --git a/reco/kf/CbmKfOriginalField.h b/reco/kfnew/CbmKfOriginalField.h
similarity index 100%
rename from reco/kf/CbmKfOriginalField.h
rename to reco/kfnew/CbmKfOriginalField.h
diff --git a/reco/kf/CbmKfTarget.cxx b/reco/kfnew/CbmKfTarget.cxx
similarity index 100%
rename from reco/kf/CbmKfTarget.cxx
rename to reco/kfnew/CbmKfTarget.cxx
diff --git a/reco/kf/CbmKfTarget.h b/reco/kfnew/CbmKfTarget.h
similarity index 100%
rename from reco/kf/CbmKfTarget.h
rename to reco/kfnew/CbmKfTarget.h
diff --git a/reco/kf/CbmKfTrackingSetupInitializer.cxx b/reco/kfnew/CbmKfTrackingSetupInitializer.cxx
similarity index 100%
rename from reco/kf/CbmKfTrackingSetupInitializer.cxx
rename to reco/kfnew/CbmKfTrackingSetupInitializer.cxx
diff --git a/reco/kf/CbmKfTrackingSetupInitializer.h b/reco/kfnew/CbmKfTrackingSetupInitializer.h
similarity index 100%
rename from reco/kf/CbmKfTrackingSetupInitializer.h
rename to reco/kfnew/CbmKfTrackingSetupInitializer.h
diff --git a/reco/kf/README.md b/reco/kfnew/README.md
similarity index 100%
rename from reco/kf/README.md
rename to reco/kfnew/README.md
diff --git a/algo/kf/tools/CMakeLists.txt b/reco/kfnew/tools/CMakeLists.txt
similarity index 100%
rename from algo/kf/tools/CMakeLists.txt
rename to reco/kfnew/tools/CMakeLists.txt
diff --git a/algo/kf/tools/KfMaterialMapCreator.cxx b/reco/kfnew/tools/KfMaterialMapCreator.cxx
similarity index 100%
rename from algo/kf/tools/KfMaterialMapCreator.cxx
rename to reco/kfnew/tools/KfMaterialMapCreator.cxx
diff --git a/algo/kf/tools/KfMaterialMapCreator.h b/reco/kfnew/tools/KfMaterialMapCreator.h
similarity index 100%
rename from algo/kf/tools/KfMaterialMapCreator.h
rename to reco/kfnew/tools/KfMaterialMapCreator.h
diff --git a/algo/kf/tools/README.md b/reco/kfnew/tools/README.md
similarity index 100%
rename from algo/kf/tools/README.md
rename to reco/kfnew/tools/README.md