diff --git a/Modules/MatchPointRegistration/CMakeLists.txt b/Modules/MatchPointRegistration/CMakeLists.txt
index 97bb55792b..fc7b8603c5 100644
--- a/Modules/MatchPointRegistration/CMakeLists.txt
+++ b/Modules/MatchPointRegistration/CMakeLists.txt
@@ -1,25 +1,27 @@
 MITK_CREATE_MODULE(
-  INCLUDE_DIRS PUBLIC Rendering Helper algorithms
+  INCLUDE_DIRS
+    PUBLIC algorithms
+    PRIVATE src/Helper src/Rendering
   DEPENDS MitkCore MitkSceneSerializationBase
   PACKAGE_DEPENDS
    PUBLIC MatchPoint
 )
 
 if(TARGET ${MODULE_TARGET})
   set(ALG_PROFILE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/algorithms)
 
   include(${MatchPoint_SOURCE_DIR}/CMake/mapFunctionCreateAlgorithmProfile.cmake)
   file(GLOB ALG_PROFILE_FILES LIST_DIRECTORIES false RELATIVE ${ALG_PROFILE_DIR} "${ALG_PROFILE_DIR}/*.profile")
 
   foreach(profile_file ${ALG_PROFILE_FILES})
     get_filename_component(profile_name ${profile_file} NAME_WE)
     MESSAGE(STATUS "... generate MDRA profile ${profile_name} (from ${profile_file})...")
     CREATE_ALGORITHM_PROFILE(${profile_name} ${ALG_PROFILE_DIR}/${profile_file})
   endforeach(profile_file)
 
   ADD_SUBDIRECTORY(autoload/IO)
   ADD_SUBDIRECTORY(deployment)
   if(BUILD_TESTING)
     ADD_SUBDIRECTORY(Testing)
   endif(BUILD_TESTING)
 endif()
diff --git a/Modules/MatchPointRegistration/files.cmake b/Modules/MatchPointRegistration/files.cmake
index 1b9c8ff7e1..3f7a9b59a4 100644
--- a/Modules/MatchPointRegistration/files.cmake
+++ b/Modules/MatchPointRegistration/files.cmake
@@ -1,65 +1,31 @@
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
+file(GLOB_RECURSE TPP_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*.tpp")
+
 set(CPP_FILES
   mitkMAPRegistrationWrapper.cpp
   mitkMAPRegistrationWrapperObjectFactory.cpp
   mitkRegEvaluationObjectFactory.cpp
   mitkRegEvaluationObject.cpp
   Helper/mitkUIDHelper.cpp
   Helper/mitkMAPAlgorithmHelper.cpp
   Helper/mitkMaskedAlgorithmHelper.cpp
   Helper/mitkRegistrationHelper.cpp
   Helper/mitkImageMappingHelper.cpp
   Helper/mitkPointSetMappingHelper.cpp
   Helper/mitkResultNodeGenerationHelper.cpp
   Helper/mitkTimeFramesRegistrationHelper.cpp
   Rendering/mitkRegistrationWrapperMapper2D.cpp
   Rendering/mitkRegistrationWrapperMapper3D.cpp
   Rendering/mitkRegistrationWrapperMapperBase.cpp
   Rendering/mitkRegEvaluationMapper2D.cpp
   Rendering/mitkRegVisStyleProperty.cpp
   Rendering/mitkRegVisDirectionProperty.cpp
   Rendering/mitkRegVisColorStyleProperty.cpp
   Rendering/mitkRegVisPropertyTags.cpp
   Rendering/mitkRegVisHelper.cpp
   Rendering/mitkRegEvalStyleProperty.cpp
   Rendering/mitkRegEvalWipeStyleProperty.cpp
 )
 
-set(H_FILES
-  mitkMatchPointPropertyTags.h
-  mitkMAPRegistrationWrapper.h
-  mitkMAPRegistrationWrapperObjectFactory.h
-  mitkRegEvaluationObjectFactory.h
-  mitkRegEvaluationObject.h
-  algorithms/mitkMultiModalAffineDefaultRegistrationAlgorithm.h
-  algorithms/mitkMultiModalRigidDefaultRegistrationAlgorithm.h
-  algorithms/mitkMultiModalTransDefaultRegistrationAlgorithm.h
-  algorithms/mitkFastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm.h
-  algorithms/mitkLevelSetMotionMultiResDefaultRegistrationAlgorithm.h
-  algorithms/mitkRigidClosedFormPointsDefaultRegistrationAlgorithm.h
-  algorithms/mitkRigidICPDefaultRegistrationAlgorithm.h
-  Helper/mitkUIDHelper.h
-  Helper/mitkMAPAlgorithmHelper.h
-  Helper/mitkMaskedAlgorithmHelper.h
-  Helper/mitkRegistrationHelper.h
-  Helper/mitkImageMappingHelper.h
-  Helper/mitkPointSetMappingHelper.h
-  Helper/mitkResultNodeGenerationHelper.h
-  Helper/mitkTimeFramesRegistrationHelper.h
-  Rendering/mitkRegistrationWrapperMapper2D.h
-  Rendering/mitkRegistrationWrapperMapper3D.h
-  Rendering/mitkRegistrationWrapperMapperBase.h
-  Rendering/mitkRegVisStyleProperty.h
-  Rendering/mitkRegVisDirectionProperty.h
-  Rendering/mitkRegVisColorStyleProperty.h
-  Rendering/mitkRegVisPropertyTags.h
-  Rendering/mitkRegVisHelper.h
-  Rendering/mitkRegEvaluationMapper2D.h
-  Rendering/mitkRegEvalStyleProperty.h
-  Rendering/mitkRegEvalWipeStyleProperty.h
-)
-
-set(TPP_FILES
-)
-
 set(MOC_H_FILES
 )
diff --git a/Modules/MatchPointRegistration/Helper/QmitkAlgorithmListModel.h b/Modules/MatchPointRegistration/include/QmitkAlgorithmListModel.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/QmitkAlgorithmListModel.h
rename to Modules/MatchPointRegistration/include/QmitkAlgorithmListModel.h
diff --git a/Modules/MatchPointRegistration/Helper/QmitkMapPropertyDelegate.h b/Modules/MatchPointRegistration/include/QmitkMapPropertyDelegate.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/QmitkMapPropertyDelegate.h
rename to Modules/MatchPointRegistration/include/QmitkMapPropertyDelegate.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkImageMappingHelper.h b/Modules/MatchPointRegistration/include/mitkImageMappingHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkImageMappingHelper.h
rename to Modules/MatchPointRegistration/include/mitkImageMappingHelper.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkMAPAlgorithmHelper.h b/Modules/MatchPointRegistration/include/mitkMAPAlgorithmHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkMAPAlgorithmHelper.h
rename to Modules/MatchPointRegistration/include/mitkMAPAlgorithmHelper.h
diff --git a/Modules/MatchPointRegistration/mitkMAPRegistrationWrapper.h b/Modules/MatchPointRegistration/include/mitkMAPRegistrationWrapper.h
similarity index 100%
rename from Modules/MatchPointRegistration/mitkMAPRegistrationWrapper.h
rename to Modules/MatchPointRegistration/include/mitkMAPRegistrationWrapper.h
diff --git a/Modules/MatchPointRegistration/mitkMAPRegistrationWrapperObjectFactory.h b/Modules/MatchPointRegistration/include/mitkMAPRegistrationWrapperObjectFactory.h
similarity index 100%
rename from Modules/MatchPointRegistration/mitkMAPRegistrationWrapperObjectFactory.h
rename to Modules/MatchPointRegistration/include/mitkMAPRegistrationWrapperObjectFactory.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkMaskedAlgorithmHelper.h b/Modules/MatchPointRegistration/include/mitkMaskedAlgorithmHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkMaskedAlgorithmHelper.h
rename to Modules/MatchPointRegistration/include/mitkMaskedAlgorithmHelper.h
diff --git a/Modules/MatchPointRegistration/mitkMatchPointPropertyTags.h b/Modules/MatchPointRegistration/include/mitkMatchPointPropertyTags.h
similarity index 100%
rename from Modules/MatchPointRegistration/mitkMatchPointPropertyTags.h
rename to Modules/MatchPointRegistration/include/mitkMatchPointPropertyTags.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkPointSetMappingHelper.h b/Modules/MatchPointRegistration/include/mitkPointSetMappingHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkPointSetMappingHelper.h
rename to Modules/MatchPointRegistration/include/mitkPointSetMappingHelper.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkQMAPAlgorithmModel.h b/Modules/MatchPointRegistration/include/mitkQMAPAlgorithmModel.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkQMAPAlgorithmModel.h
rename to Modules/MatchPointRegistration/include/mitkQMAPAlgorithmModel.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegEvalStyleProperty.h b/Modules/MatchPointRegistration/include/mitkRegEvalStyleProperty.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegEvalStyleProperty.h
rename to Modules/MatchPointRegistration/include/mitkRegEvalStyleProperty.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegEvalWipeStyleProperty.h b/Modules/MatchPointRegistration/include/mitkRegEvalWipeStyleProperty.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegEvalWipeStyleProperty.h
rename to Modules/MatchPointRegistration/include/mitkRegEvalWipeStyleProperty.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegEvaluationMapper2D.h b/Modules/MatchPointRegistration/include/mitkRegEvaluationMapper2D.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegEvaluationMapper2D.h
rename to Modules/MatchPointRegistration/include/mitkRegEvaluationMapper2D.h
diff --git a/Modules/MatchPointRegistration/mitkRegEvaluationObject.h b/Modules/MatchPointRegistration/include/mitkRegEvaluationObject.h
similarity index 100%
rename from Modules/MatchPointRegistration/mitkRegEvaluationObject.h
rename to Modules/MatchPointRegistration/include/mitkRegEvaluationObject.h
diff --git a/Modules/MatchPointRegistration/mitkRegEvaluationObjectFactory.h b/Modules/MatchPointRegistration/include/mitkRegEvaluationObjectFactory.h
similarity index 100%
rename from Modules/MatchPointRegistration/mitkRegEvaluationObjectFactory.h
rename to Modules/MatchPointRegistration/include/mitkRegEvaluationObjectFactory.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisColorStyleProperty.h b/Modules/MatchPointRegistration/include/mitkRegVisColorStyleProperty.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisColorStyleProperty.h
rename to Modules/MatchPointRegistration/include/mitkRegVisColorStyleProperty.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisDirectionProperty.h b/Modules/MatchPointRegistration/include/mitkRegVisDirectionProperty.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisDirectionProperty.h
rename to Modules/MatchPointRegistration/include/mitkRegVisDirectionProperty.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisHelper.h b/Modules/MatchPointRegistration/include/mitkRegVisHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisHelper.h
rename to Modules/MatchPointRegistration/include/mitkRegVisHelper.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisPropertyTags.h b/Modules/MatchPointRegistration/include/mitkRegVisPropertyTags.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisPropertyTags.h
rename to Modules/MatchPointRegistration/include/mitkRegVisPropertyTags.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisStyleProperty.h b/Modules/MatchPointRegistration/include/mitkRegVisStyleProperty.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisStyleProperty.h
rename to Modules/MatchPointRegistration/include/mitkRegVisStyleProperty.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkRegistrationHelper.h b/Modules/MatchPointRegistration/include/mitkRegistrationHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkRegistrationHelper.h
rename to Modules/MatchPointRegistration/include/mitkRegistrationHelper.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper2D.h b/Modules/MatchPointRegistration/include/mitkRegistrationWrapperMapper2D.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper2D.h
rename to Modules/MatchPointRegistration/include/mitkRegistrationWrapperMapper2D.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper3D.h b/Modules/MatchPointRegistration/include/mitkRegistrationWrapperMapper3D.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper3D.h
rename to Modules/MatchPointRegistration/include/mitkRegistrationWrapperMapper3D.h
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapperBase.h b/Modules/MatchPointRegistration/include/mitkRegistrationWrapperMapperBase.h
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapperBase.h
rename to Modules/MatchPointRegistration/include/mitkRegistrationWrapperMapperBase.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkResultNodeGenerationHelper.h b/Modules/MatchPointRegistration/include/mitkResultNodeGenerationHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkResultNodeGenerationHelper.h
rename to Modules/MatchPointRegistration/include/mitkResultNodeGenerationHelper.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkTimeFramesRegistrationHelper.h b/Modules/MatchPointRegistration/include/mitkTimeFramesRegistrationHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkTimeFramesRegistrationHelper.h
rename to Modules/MatchPointRegistration/include/mitkTimeFramesRegistrationHelper.h
diff --git a/Modules/MatchPointRegistration/Helper/mitkUIDHelper.h b/Modules/MatchPointRegistration/include/mitkUIDHelper.h
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkUIDHelper.h
rename to Modules/MatchPointRegistration/include/mitkUIDHelper.h
diff --git a/Modules/MatchPointRegistration/Helper/QmitkAlgorithmListModel.cpp b/Modules/MatchPointRegistration/src/Helper/QmitkAlgorithmListModel.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/QmitkAlgorithmListModel.cpp
rename to Modules/MatchPointRegistration/src/Helper/QmitkAlgorithmListModel.cpp
diff --git a/Modules/MatchPointRegistration/Helper/QmitkMapPropertyDelegate.cpp b/Modules/MatchPointRegistration/src/Helper/QmitkMapPropertyDelegate.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/QmitkMapPropertyDelegate.cpp
rename to Modules/MatchPointRegistration/src/Helper/QmitkMapPropertyDelegate.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkImageMappingHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkImageMappingHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkImageMappingHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkImageMappingHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkMAPAlgorithmHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkMAPAlgorithmHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkMAPAlgorithmHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkMAPAlgorithmHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkMaskedAlgorithmHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkMaskedAlgorithmHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkMaskedAlgorithmHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkMaskedAlgorithmHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkPointSetMappingHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkPointSetMappingHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkPointSetMappingHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkPointSetMappingHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkQMAPAlgorithmModel.cpp b/Modules/MatchPointRegistration/src/Helper/mitkQMAPAlgorithmModel.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkQMAPAlgorithmModel.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkQMAPAlgorithmModel.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkRegistrationHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkRegistrationHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkRegistrationHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkRegistrationHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkResultNodeGenerationHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkResultNodeGenerationHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkResultNodeGenerationHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkResultNodeGenerationHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkTimeFramesRegistrationHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkTimeFramesRegistrationHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkTimeFramesRegistrationHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkTimeFramesRegistrationHelper.cpp
diff --git a/Modules/MatchPointRegistration/Helper/mitkUIDHelper.cpp b/Modules/MatchPointRegistration/src/Helper/mitkUIDHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Helper/mitkUIDHelper.cpp
rename to Modules/MatchPointRegistration/src/Helper/mitkUIDHelper.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegEvalStyleProperty.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegEvalStyleProperty.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegEvalStyleProperty.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegEvalStyleProperty.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegEvalWipeStyleProperty.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegEvalWipeStyleProperty.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegEvalWipeStyleProperty.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegEvalWipeStyleProperty.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegEvaluationMapper2D.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegEvaluationMapper2D.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegEvaluationMapper2D.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegEvaluationMapper2D.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisColorStyleProperty.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegVisColorStyleProperty.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisColorStyleProperty.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegVisColorStyleProperty.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisDirectionProperty.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegVisDirectionProperty.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisDirectionProperty.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegVisDirectionProperty.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisHelper.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegVisHelper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisHelper.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegVisHelper.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisPropertyTags.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegVisPropertyTags.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisPropertyTags.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegVisPropertyTags.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegVisStyleProperty.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegVisStyleProperty.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegVisStyleProperty.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegVisStyleProperty.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper2D.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegistrationWrapperMapper2D.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper2D.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegistrationWrapperMapper2D.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper3D.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegistrationWrapperMapper3D.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapper3D.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegistrationWrapperMapper3D.cpp
diff --git a/Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapperBase.cpp b/Modules/MatchPointRegistration/src/Rendering/mitkRegistrationWrapperMapperBase.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/Rendering/mitkRegistrationWrapperMapperBase.cpp
rename to Modules/MatchPointRegistration/src/Rendering/mitkRegistrationWrapperMapperBase.cpp
diff --git a/Modules/MatchPointRegistration/mitkMAPRegistrationWrapper.cpp b/Modules/MatchPointRegistration/src/mitkMAPRegistrationWrapper.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/mitkMAPRegistrationWrapper.cpp
rename to Modules/MatchPointRegistration/src/mitkMAPRegistrationWrapper.cpp
diff --git a/Modules/MatchPointRegistration/mitkMAPRegistrationWrapperObjectFactory.cpp b/Modules/MatchPointRegistration/src/mitkMAPRegistrationWrapperObjectFactory.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/mitkMAPRegistrationWrapperObjectFactory.cpp
rename to Modules/MatchPointRegistration/src/mitkMAPRegistrationWrapperObjectFactory.cpp
diff --git a/Modules/MatchPointRegistration/mitkRegEvaluationObject.cpp b/Modules/MatchPointRegistration/src/mitkRegEvaluationObject.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/mitkRegEvaluationObject.cpp
rename to Modules/MatchPointRegistration/src/mitkRegEvaluationObject.cpp
diff --git a/Modules/MatchPointRegistration/mitkRegEvaluationObjectFactory.cpp b/Modules/MatchPointRegistration/src/mitkRegEvaluationObjectFactory.cpp
similarity index 100%
rename from Modules/MatchPointRegistration/mitkRegEvaluationObjectFactory.cpp
rename to Modules/MatchPointRegistration/src/mitkRegEvaluationObjectFactory.cpp