diff --git a/Modules/MriSimulation/itkDftImageFilter.cpp b/Modules/MriSimulation/Algorithms/itkDftImageFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkDftImageFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkDftImageFilter.cpp
diff --git a/Modules/MriSimulation/itkDftImageFilter.h b/Modules/MriSimulation/Algorithms/itkDftImageFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkDftImageFilter.h
rename to Modules/MriSimulation/Algorithms/itkDftImageFilter.h
diff --git a/Modules/MriSimulation/itkFibersFromPlanarFiguresFilter.cpp b/Modules/MriSimulation/Algorithms/itkFibersFromPlanarFiguresFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkFibersFromPlanarFiguresFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkFibersFromPlanarFiguresFilter.cpp
diff --git a/Modules/MriSimulation/itkFibersFromPlanarFiguresFilter.h b/Modules/MriSimulation/Algorithms/itkFibersFromPlanarFiguresFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkFibersFromPlanarFiguresFilter.h
rename to Modules/MriSimulation/Algorithms/itkFibersFromPlanarFiguresFilter.h
diff --git a/Modules/MriSimulation/itkFieldmapGeneratorFilter.cpp b/Modules/MriSimulation/Algorithms/itkFieldmapGeneratorFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkFieldmapGeneratorFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkFieldmapGeneratorFilter.cpp
diff --git a/Modules/MriSimulation/itkFieldmapGeneratorFilter.h b/Modules/MriSimulation/Algorithms/itkFieldmapGeneratorFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkFieldmapGeneratorFilter.h
rename to Modules/MriSimulation/Algorithms/itkFieldmapGeneratorFilter.h
diff --git a/Modules/MriSimulation/itkFitFibersToImageFilter.cpp b/Modules/MriSimulation/Algorithms/itkFitFibersToImageFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkFitFibersToImageFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkFitFibersToImageFilter.cpp
diff --git a/Modules/MriSimulation/itkFitFibersToImageFilter.h b/Modules/MriSimulation/Algorithms/itkFitFibersToImageFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkFitFibersToImageFilter.h
rename to Modules/MriSimulation/Algorithms/itkFitFibersToImageFilter.h
diff --git a/Modules/MriSimulation/itkKspaceImageFilter.cpp b/Modules/MriSimulation/Algorithms/itkKspaceImageFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkKspaceImageFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkKspaceImageFilter.cpp
diff --git a/Modules/MriSimulation/itkKspaceImageFilter.h b/Modules/MriSimulation/Algorithms/itkKspaceImageFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkKspaceImageFilter.h
rename to Modules/MriSimulation/Algorithms/itkKspaceImageFilter.h
diff --git a/Modules/MriSimulation/itkRandomPhantomFilter.cpp b/Modules/MriSimulation/Algorithms/itkRandomPhantomFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkRandomPhantomFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkRandomPhantomFilter.cpp
diff --git a/Modules/MriSimulation/itkRandomPhantomFilter.h b/Modules/MriSimulation/Algorithms/itkRandomPhantomFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkRandomPhantomFilter.h
rename to Modules/MriSimulation/Algorithms/itkRandomPhantomFilter.h
diff --git a/Modules/MriSimulation/itkTractsToDWIImageFilter.cpp b/Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.cpp
similarity index 100%
rename from Modules/MriSimulation/itkTractsToDWIImageFilter.cpp
rename to Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.cpp
diff --git a/Modules/MriSimulation/itkTractsToDWIImageFilter.h b/Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.h
similarity index 100%
rename from Modules/MriSimulation/itkTractsToDWIImageFilter.h
rename to Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.h
diff --git a/Modules/MriSimulation/files.cmake b/Modules/MriSimulation/files.cmake
index 7c9fc50..1af1c9e 100644
--- a/Modules/MriSimulation/files.cmake
+++ b/Modules/MriSimulation/files.cmake
@@ -1,32 +1,32 @@
 set(CPP_FILES
 
   mitkFiberfoxParameters.cpp
 )
 
 set(H_FILES
   mitkFiberfoxParameters.h
 
-  itkFitFibersToImageFilter.h
-  itkFibersFromPlanarFiguresFilter.h
-  itkTractsToDWIImageFilter.h
-  itkKspaceImageFilter.h
-  itkDftImageFilter.h
-  itkFieldmapGeneratorFilter.h
-  itkRandomPhantomFilter.h
+  Algorithms/itkFitFibersToImageFilter.h
+  Algorithms/itkFibersFromPlanarFiguresFilter.h
+  Algorithms/itkTractsToDWIImageFilter.h
+  Algorithms/itkKspaceImageFilter.h
+  Algorithms/itkDftImageFilter.h
+  Algorithms/itkFieldmapGeneratorFilter.h
+  Algorithms/itkRandomPhantomFilter.h
 
   SignalModels/mitkDiffusionSignalModel.h
   SignalModels/mitkTensorModel.h
   SignalModels/mitkBallModel.h
   SignalModels/mitkDotModel.h
   SignalModels/mitkAstroStickModel.h
   SignalModels/mitkStickModel.h
   SignalModels/mitkRawShModel.h
   SignalModels/mitkDiffusionNoiseModel.h
   SignalModels/mitkRicianNoiseModel.h
   SignalModels/mitkChiSquareNoiseModel.h
 
   Sequences/mitkAcquisitionType.h
   Sequences/mitkSingleShotEpi.h
   Sequences/mitkConventionalSpinEcho.h
   Sequences/mitkFastSpinEcho.h
 )