diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
index 11a935cb5e77749d538e20354aea6c325484af7d..3ce6540c7301bfc59af6ade09e7cc41de7802f23 100644
--- a/Simulation/CMakeLists.txt
+++ b/Simulation/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(DetSimAna)
 add_subdirectory(DetSimCore)
 add_subdirectory(DetSimDedx)
 add_subdirectory(DetSimFastModel)
-add_subdirectory(DetSimFastEcal)
 add_subdirectory(DetSimGeom)
 add_subdirectory(DetSimInterface)
 add_subdirectory(DetSimSD)
diff --git a/Simulation/DetSimFastEcal/CMakeLists.txt b/Simulation/DetSimFastEcal/CMakeLists.txt
deleted file mode 100644
index 5b16718ec0642d517058e91803fde28357151992..0000000000000000000000000000000000000000
--- a/Simulation/DetSimFastEcal/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-find_package(Geant4 REQUIRED ui_all vis_all)
-include(${Geant4_USE_FILE})
-
-
-gaudi_add_module(DetSimFastEcal
-                 SOURCES src/EcalFastSimG4Tool.cpp
-                         src/EcalFastSimG4Model.cpp
-                 LINK DetSimInterface
-                      ${DD4hep_COMPONENT_LIBRARIES}
-                      Gaudi::GaudiKernel
-)
-
diff --git a/Simulation/DetSimFastModel/CMakeLists.txt b/Simulation/DetSimFastModel/CMakeLists.txt
index 50ceb1e33fdd4634f93dffb710a1d020dc58aea4..30dced2b32f4c9c07a05dc02e9ba9b6c6355d3a4 100644
--- a/Simulation/DetSimFastModel/CMakeLists.txt
+++ b/Simulation/DetSimFastModel/CMakeLists.txt
@@ -6,6 +6,8 @@ include(${Geant4_USE_FILE})
 gaudi_add_module(DetSimFastModel
                  SOURCES src/DummyFastSimG4Tool.cpp
                          src/DummyFastSimG4Model.cpp
+                         src/EcalFastSimG4Model.cpp
+                         src/EcalFastSimG4Tool.cpp
                  LINK DetSimInterface
                       ${DD4hep_COMPONENT_LIBRARIES}
                       Gaudi::GaudiKernel
diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Model.cpp b/Simulation/DetSimFastModel/src/EcalFastSimG4Model.cpp
similarity index 100%
rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Model.cpp
rename to Simulation/DetSimFastModel/src/EcalFastSimG4Model.cpp
diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Model.h b/Simulation/DetSimFastModel/src/EcalFastSimG4Model.h
similarity index 100%
rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Model.h
rename to Simulation/DetSimFastModel/src/EcalFastSimG4Model.h
diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.cpp b/Simulation/DetSimFastModel/src/EcalFastSimG4Tool.cpp
similarity index 100%
rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.cpp
rename to Simulation/DetSimFastModel/src/EcalFastSimG4Tool.cpp
diff --git a/Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.h b/Simulation/DetSimFastModel/src/EcalFastSimG4Tool.h
similarity index 100%
rename from Simulation/DetSimFastEcal/src/EcalFastSimG4Tool.h
rename to Simulation/DetSimFastModel/src/EcalFastSimG4Tool.h