diff --git a/Core/Code/Testing/files.cmake b/Core/Code/Testing/files.cmake
index b5d08c751e..92c5b05b02 100644
--- a/Core/Code/Testing/files.cmake
+++ b/Core/Code/Testing/files.cmake
@@ -1,188 +1,187 @@
 # tests with no extra command line parameter
 set(MODULE_TESTS
   # IMPORTANT: If you plan to deactivate / comment out a test please write a bug number to the commented out line of code.
   #
   #     Example: #mitkMyTest #this test is commented out because of bug 12345
   #
   # It is important that the bug is open and that the test will be activated again before the bug is closed. This assures that
   # no test is forgotten after it was commented out. If there is no bug for your current problem, please add a new one and
   # mark it as critical.
 
   ################## DISABLED TESTS #################################################
   #mitkAbstractTransformGeometryTest.cpp #seems as tested class mitkExternAbstractTransformGeometry doesnt exist any more
   #mitkStateMachineContainerTest.cpp #rewrite test, indirect since no longer exported Bug 14529
   #mitkRegistrationBaseTest.cpp #tested class  mitkRegistrationBase doesn't exist any more
   #mitkSegmentationInterpolationTest.cpp #file doesn't exist!
   #mitkPipelineSmartPointerCorrectnessTest.cpp #file doesn't exist!
   #mitkITKThreadingTest.cpp #test outdated because itk::Semaphore was removed from ITK
   #mitkAbstractTransformPlaneGeometryTest.cpp #mitkVtkAbstractTransformPlaneGeometry doesn't exist any more
   #mitkTestUtilSharedLibrary.cpp #Linker problem with this test...
   #mitkTextOverlay2DSymbolsRenderingTest.cpp #Implementation of the tested feature is not finished yet. Ask Christoph or see bug 15104 for details.
 
   ################# RUNNING TESTS ###################################################
   mitkAccessByItkTest.cpp
   mitkCoreObjectFactoryTest.cpp
   mitkMaterialTest.cpp
   mitkActionTest.cpp
   mitkDispatcherTest.cpp
   mitkEnumerationPropertyTest.cpp
   mitkEventTest.cpp
   mitkFocusManagerTest.cpp
   mitkGenericPropertyTest.cpp
   mitkGeometry2DTest.cpp
   mitkGeometry3DTest.cpp
   mitkGeometry3DEqualTest.cpp
   mitkGeometryDataToSurfaceFilterTest.cpp
   mitkGlobalInteractionTest.cpp
   mitkImageEqualTest.cpp
   mitkImageDataItemTest.cpp
   mitkImageGeneratorTest.cpp
   mitkIOUtilTest.cpp
   mitkBaseDataTest.cpp
   mitkImportItkImageTest.cpp
   mitkGrabItkImageMemoryTest.cpp
   mitkInstantiateAccessFunctionTest.cpp
   mitkInteractorTest.cpp
   mitkLevelWindowTest.cpp
   mitkMessageTest.cpp
   mitkPixelTypeTest.cpp
   mitkPlaneGeometryTest.cpp
   mitkPointSetEqualTest.cpp
   mitkPointSetFileIOTest.cpp
   mitkPointSetTest.cpp
   mitkPointSetWriterTest.cpp
   mitkPointSetReaderTest.cpp
   mitkPointSetInteractorTest.cpp
   mitkPropertyTest.cpp
   mitkPropertyListTest.cpp
   mitkSlicedGeometry3DTest.cpp
   mitkSliceNavigationControllerTest.cpp
   mitkStateMachineTest.cpp
   mitkStateTest.cpp
   mitkSurfaceTest.cpp
   mitkSurfaceEqualTest.cpp
   mitkSurfaceToSurfaceFilterTest.cpp
   mitkTimeGeometryTest.cpp
   mitkTransitionTest.cpp
   mitkUndoControllerTest.cpp
   mitkVtkWidgetRenderingTest.cpp
   mitkVerboseLimitedLinearUndoTest.cpp
   mitkWeakPointerTest.cpp
   mitkTransferFunctionTest.cpp
   mitkStepperTest.cpp
-  itkTotalVariationDenoisingImageFilterTest.cpp
   mitkRenderingManagerTest.cpp
   vtkMitkThickSlicesFilterTest.cpp
   mitkNodePredicateSourceTest.cpp
   mitkVectorTest.cpp
   mitkClippedSurfaceBoundsCalculatorTest.cpp
   mitkExceptionTest.cpp
   mitkExtractSliceFilterTest.cpp
   mitkLogTest.cpp
   mitkImageDimensionConverterTest.cpp
   mitkLoggingAdapterTest.cpp
   mitkUIDGeneratorTest.cpp
   mitkShaderRepositoryTest.cpp
   mitkPlanePositionManagerTest.cpp
   mitkAffineTransformBaseTest.cpp
   mitkPropertyAliasesTest.cpp
   mitkPropertyDescriptionsTest.cpp
   mitkPropertyExtensionsTest.cpp
   mitkPropertyFiltersTest.cpp
   mitkTinyXMLTest.cpp
   mitkRawImageFileReaderTest.cpp
   mitkInteractionEventTest.cpp
   mitkLookupTableTest.cpp
   mitkSTLFileReaderTest.cpp
 )
 
 # test with image filename as an extra command line parameter
 set(MODULE_IMAGE_TESTS
   mitkImageTimeSelectorTest.cpp #only runs on images
   mitkImageAccessorTest.cpp #only runs on images
   mitkDataNodeFactoryTest.cpp #runs on all types of data
 )
 
 set(MODULE_SURFACE_TESTS
   mitkSurfaceVtkWriterTest.cpp #only runs on surfaces
   mitkDataNodeFactoryTest.cpp #runs on all types of data
 )
 
 # list of images for which the tests are run
 set(MODULE_TESTIMAGES
   US4DCyl.nrrd
   Pic3D.nrrd
   Pic2DplusT.nrrd
   BallBinary30x30x30.nrrd
   Png2D-bw.png
 )
 set(MODULE_TESTSURFACES
   binary.stl
   ball.stl
 )
 
 set(MODULE_CUSTOM_TESTS
     mitkDataStorageTest.cpp
     mitkDataNodeTest.cpp
     mitkDicomSeriesReaderTest.cpp
     mitkDICOMLocaleTest.cpp
     mitkEventMapperTest.cpp
     mitkEventConfigTest.cpp
     mitkNodeDependentPointSetInteractorTest.cpp
     mitkStateMachineFactoryTest.cpp
     mitkPointSetLocaleTest.cpp
     mitkImageTest.cpp
     mitkImageWriterTest.cpp
     mitkImageVtkMapper2DTest.cpp
     mitkImageVtkMapper2DLevelWindowTest.cpp
     mitkImageVtkMapper2DOpacityTest.cpp
     mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp
     mitkImageVtkMapper2DColorTest.cpp
     mitkImageVtkMapper2DSwivelTest.cpp
     mitkImageVtkMapper2DTransferFunctionTest.cpp
     mitkImageVtkMapper2DLookupTableTest.cpp
     mitkSurfaceVtkMapper3DTest
     mitkSurfaceVtkMapper3DTexturedSphereTest.cpp
     mitkSurfaceGLMapper2DColorTest.cpp
     mitkSurfaceGLMapper2DOpacityTest.cpp
     mitkVolumeCalculatorTest.cpp
     mitkLevelWindowManagerTest.cpp
     mitkPointSetVtkMapper2DTest.cpp
     mitkPointSetVtkMapper2DImageTest.cpp
     mitkPointSetVtkMapper2DGlyphTypeTest.cpp
     mitkPointSetVtkMapper2DTransformedPointsTest.cpp
     mitkLabelOverlay3DRendering2DTest.cpp
     mitkLabelOverlay3DRendering3DTest.cpp
     mitkTextOverlay2DRenderingTest.cpp
     mitkTextOverlay2DLayouterRenderingTest.cpp
     mitkTextOverlay3DRendering2DTest.cpp
     mitkTextOverlay3DRendering3DTest.cpp
     mitkTextOverlay3DColorRenderingTest.cpp
     mitkVTKRenderWindowSizeTest.cpp
     mitkMultiComponentImageDataComparisonFilterTest.cpp
     mitkImageToItkTest.cpp
     mitkImageSliceSelectorTest.cpp
 )
 
 set(MODULE_RESOURCE_FILES
   Interactions/AddAndRemovePoints.xml
   Interactions/globalConfig.xml
   Interactions/StatemachineTest.xml
   Interactions/StatemachineConfigTest.xml
 )
 
 # Create an artificial module initializing class for
 # the usServiceListenerTest.cpp
 usFunctionGenerateExecutableInit(testdriver_init_file
                                  IDENTIFIER ${MODULE_NAME}TestDriver
                                 )
 
 # Embed the resources
 set(testdriver_resources )
 usFunctionEmbedResources(testdriver_resources
                          EXECUTABLE_NAME ${MODULE_NAME}TestDriver
                          ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Resources
                          FILES ${MODULE_RESOURCE_FILES}
                         )
 
 set(TEST_CPP_FILES ${testdriver_init_file} ${testdriver_resources})
diff --git a/Core/Code/files.cmake b/Core/Code/files.cmake
index e1741ada2a..8af31e6f4e 100644
--- a/Core/Code/files.cmake
+++ b/Core/Code/files.cmake
@@ -1,414 +1,406 @@
 set(H_FILES
   Algorithms/itkImportMitkImageContainer.h
   Algorithms/itkImportMitkImageContainer.txx
-  Algorithms/itkLocalVariationImageFilter.h
-  Algorithms/itkLocalVariationImageFilter.txx
   Algorithms/itkMITKScalarImageToHistogramGenerator.h
   Algorithms/itkMITKScalarImageToHistogramGenerator.txx
-  Algorithms/itkTotalVariationDenoisingImageFilter.h
-  Algorithms/itkTotalVariationDenoisingImageFilter.txx
-  Algorithms/itkTotalVariationSingleIterationImageFilter.h
-  Algorithms/itkTotalVariationSingleIterationImageFilter.txx
-  Algorithms/mitkBilateralFilter.h
-  Algorithms/mitkBilateralFilter.cpp
   Algorithms/mitkInstantiateAccessFunctions.h
   Algorithms/mitkPixelTypeList.h
   Algorithms/mitkPPArithmeticDec.h
   Algorithms/mitkPPArgCount.h
   Algorithms/mitkPPCat.h
   Algorithms/mitkPPConfig.h
   Algorithms/mitkPPControlExprIIf.h
   Algorithms/mitkPPControlIf.h
   Algorithms/mitkPPControlIIf.h
   Algorithms/mitkPPDebugError.h
   Algorithms/mitkPPDetailAutoRec.h
   Algorithms/mitkPPDetailDMCAutoRec.h
   Algorithms/mitkPPExpand.h
   Algorithms/mitkPPFacilitiesEmpty.h
   Algorithms/mitkPPFacilitiesExpand.h
   Algorithms/mitkPPLogicalBool.h
   Algorithms/mitkPPRepetitionDetailDMCFor.h
   Algorithms/mitkPPRepetitionDetailEDGFor.h
   Algorithms/mitkPPRepetitionDetailFor.h
   Algorithms/mitkPPRepetitionDetailMSVCFor.h
   Algorithms/mitkPPRepetitionFor.h
   Algorithms/mitkPPSeqElem.h
   Algorithms/mitkPPSeqForEach.h
   Algorithms/mitkPPSeqForEachProduct.h
   Algorithms/mitkPPSeq.h
   Algorithms/mitkPPSeqEnum.h
   Algorithms/mitkPPSeqSize.h
   Algorithms/mitkPPSeqToTuple.h
   Algorithms/mitkPPStringize.h
   Algorithms/mitkPPTupleEat.h
   Algorithms/mitkPPTupleElem.h
   Algorithms/mitkPPTupleRem.h
   Algorithms/mitkClippedSurfaceBoundsCalculator.h
   Algorithms/mitkExtractSliceFilter.h
   Algorithms/mitkConvert2Dto3DImageFilter.h
   Algorithms/mitkPlaneClipping.h
 
   Common/mitkCommon.h
   Common/mitkExceptionMacro.h
 
   DataManagement/mitkProportionalTimeGeometry.h
   DataManagement/mitkTimeGeometry.h
   DataManagement/mitkImageAccessByItk.h
   DataManagement/mitkImageCast.h
   DataManagement/mitkImagePixelAccessor.h
   DataManagement/mitkImagePixelReadAccessor.h
   DataManagement/mitkImagePixelWriteAccessor.h
   DataManagement/mitkImageReadAccessor.h
   DataManagement/mitkImageWriteAccessor.h
   DataManagement/mitkITKImageImport.h
   DataManagement/mitkITKImageImport.txx
   DataManagement/mitkImageToItk.h
   DataManagement/mitkImageToItk.txx
   DataManagement/mitkTimeSlicedGeometry.h # Deprecated, empty for compatibilty reasons.
   DataManagement/mitkPropertyListReplacedObserver.cpp
 
   Interactions/mitkEventMapperAddOn.h
 
   Interfaces/mitkIDataNodeReader.h
 
   Rendering/mitkLocalStorageHandler.h
   Rendering/Colortables/HotIron.h
   Rendering/Colortables/Jet.h
   Rendering/Colortables/PET20.h
   Rendering/Colortables/PETColor.h
 
 
   IO/mitkPixelTypeTraits.h
 )
 
 set(CPP_FILES
   Algorithms/mitkBaseDataSource.cpp
   Algorithms/mitkCompareImageDataFilter.cpp
   Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
   Algorithms/mitkDataNodeSource.cpp
   Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp
   Algorithms/mitkHistogramGenerator.cpp
   Algorithms/mitkImageChannelSelector.cpp
   Algorithms/mitkImageSliceSelector.cpp
   Algorithms/mitkImageSource.cpp
   Algorithms/mitkImageTimeSelector.cpp
   Algorithms/mitkImageToImageFilter.cpp
   Algorithms/mitkImageToSurfaceFilter.cpp
   Algorithms/mitkPointSetSource.cpp
   Algorithms/mitkPointSetToPointSetFilter.cpp
   Algorithms/mitkRGBToRGBACastImageFilter.cpp
   Algorithms/mitkSubImageSelector.cpp
   Algorithms/mitkSurfaceSource.cpp
   Algorithms/mitkSurfaceToImageFilter.cpp
   Algorithms/mitkSurfaceToSurfaceFilter.cpp
   Algorithms/mitkUIDGenerator.cpp
   Algorithms/mitkVolumeCalculator.cpp
   Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
   Algorithms/mitkExtractSliceFilter.cpp
   Algorithms/mitkConvert2Dto3DImageFilter.cpp
 
   Controllers/mitkBaseController.cpp
   Controllers/mitkCallbackFromGUIThread.cpp
   Controllers/mitkCameraController.cpp
   Controllers/mitkCameraRotationController.cpp
   Controllers/mitkCoreActivator.cpp
   Controllers/mitkFocusManager.cpp
   Controllers/mitkLimitedLinearUndo.cpp
   Controllers/mitkOperationEvent.cpp
   Controllers/mitkPlanePositionManager.cpp
   Controllers/mitkProgressBar.cpp
   Controllers/mitkRenderingManager.cpp
   Controllers/mitkSliceNavigationController.cpp
   Controllers/mitkSlicesCoordinator.cpp
   Controllers/mitkSlicesRotator.cpp
   Controllers/mitkSlicesSwiveller.cpp
   Controllers/mitkStatusBar.cpp
   Controllers/mitkStepper.cpp
   Controllers/mitkTestManager.cpp
   Controllers/mitkUndoController.cpp
   Controllers/mitkVerboseLimitedLinearUndo.cpp
   Controllers/mitkVtkInteractorCameraController.cpp
   Controllers/mitkVtkLayerController.cpp
   DataManagement/mitkProportionalTimeGeometry.cpp
   DataManagement/mitkTimeGeometry.cpp
   DataManagement/mitkAbstractTransformGeometry.cpp
   DataManagement/mitkAnnotationProperty.cpp
   DataManagement/mitkApplicationCursor.cpp
   DataManagement/mitkBaseData.cpp
   DataManagement/mitkBaseProperty.cpp
   DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkChannelDescriptor.cpp
   DataManagement/mitkColorProperty.cpp
   DataManagement/mitkDataStorage.cpp
 # DataManagement/mitkDataTree.cpp
   DataManagement/mitkDataNode.cpp
   DataManagement/mitkDataNodeFactory.cpp
 # DataManagement/mitkDataTreeStorage.cpp
   DataManagement/mitkDisplayGeometry.cpp
   DataManagement/mitkEnumerationProperty.cpp
   DataManagement/mitkGeometry2D.cpp
   DataManagement/mitkGeometry2DData.cpp
   DataManagement/mitkGeometry3D.cpp
   DataManagement/mitkGeometryData.cpp
   DataManagement/mitkGroupTagProperty.cpp
   DataManagement/mitkImage.cpp
   DataManagement/mitkImageAccessorBase.cpp
   DataManagement/mitkImageCaster.cpp
   DataManagement/mitkImageCastPart1.cpp
   DataManagement/mitkImageCastPart2.cpp
   DataManagement/mitkImageCastPart3.cpp
   DataManagement/mitkImageCastPart4.cpp
   DataManagement/mitkImageDataItem.cpp
   DataManagement/mitkImageDescriptor.cpp
   DataManagement/mitkImageVtkAccessor.cpp
   DataManagement/mitkImageStatisticsHolder.cpp
   DataManagement/mitkLandmarkBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjector.cpp
   DataManagement/mitkLevelWindow.cpp
   DataManagement/mitkLevelWindowManager.cpp
   DataManagement/mitkLevelWindowPreset.cpp
   DataManagement/mitkLevelWindowProperty.cpp
   DataManagement/mitkLookupTable.cpp
   DataManagement/mitkLookupTables.cpp # specializations of GenericLookupTable
   DataManagement/mitkMemoryUtilities.cpp
   DataManagement/mitkModalityProperty.cpp
   DataManagement/mitkModeOperation.cpp
   DataManagement/mitkNodePredicateAnd.cpp
   DataManagement/mitkNodePredicateBase.cpp
   DataManagement/mitkNodePredicateCompositeBase.cpp
   DataManagement/mitkNodePredicateData.cpp
   DataManagement/mitkNodePredicateDataType.cpp
   DataManagement/mitkNodePredicateDimension.cpp
   DataManagement/mitkNodePredicateFirstLevel.cpp
   DataManagement/mitkNodePredicateNot.cpp
   DataManagement/mitkNodePredicateOr.cpp
   DataManagement/mitkNodePredicateProperty.cpp
   DataManagement/mitkNodePredicateSource.cpp
   DataManagement/mitkPlaneOrientationProperty.cpp
   DataManagement/mitkPlaneGeometry.cpp
   DataManagement/mitkPlaneOperation.cpp
   DataManagement/mitkPointOperation.cpp
   DataManagement/mitkPointSet.cpp
   DataManagement/mitkProperties.cpp
   DataManagement/mitkPropertyList.cpp
   DataManagement/mitkPropertyObserver.cpp
   DataManagement/mitkRestorePlanePositionOperation.cpp
   DataManagement/mitkApplyTransformMatrixOperation.cpp
   DataManagement/mitkRotationOperation.cpp
   DataManagement/mitkSlicedData.cpp
   DataManagement/mitkSlicedGeometry3D.cpp
   DataManagement/mitkSmartPointerProperty.cpp
   DataManagement/mitkStandaloneDataStorage.cpp
   DataManagement/mitkStateTransitionOperation.cpp
   DataManagement/mitkStringProperty.cpp
   DataManagement/mitkSurface.cpp
   DataManagement/mitkSurfaceOperation.cpp
   DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
   DataManagement/mitkTransferFunction.cpp
   DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkTransferFunctionInitializer.cpp
   DataManagement/mitkVector.cpp
 
   DataManagement/mitkVtkInterpolationProperty.cpp
   DataManagement/mitkVtkRepresentationProperty.cpp
   DataManagement/mitkVtkResliceInterpolationProperty.cpp
   DataManagement/mitkVtkScalarModeProperty.cpp
   DataManagement/mitkVtkVolumeRenderingProperty.cpp
   DataManagement/mitkWeakPointerProperty.cpp
   DataManagement/mitkRenderingModeProperty.cpp
   DataManagement/mitkShaderProperty.cpp
   DataManagement/mitkResliceMethodProperty.cpp
   DataManagement/mitkMaterial.cpp
   DataManagement/mitkPointSetShapeProperty.cpp
   DataManagement/mitkFloatPropertyExtension.cpp
   DataManagement/mitkIntPropertyExtension.cpp
   DataManagement/mitkPropertyExtension.cpp
   DataManagement/mitkPropertyFilter.cpp
   DataManagement/mitkPropertyAliases.cpp
   DataManagement/mitkPropertyDescriptions.cpp
   DataManagement/mitkPropertyExtensions.cpp
   DataManagement/mitkPropertyFilters.cpp
 
   Interactions/mitkAction.cpp
   Interactions/mitkAffineInteractor.cpp
   Interactions/mitkBindDispatcherInteractor.cpp
   Interactions/mitkCoordinateSupplier.cpp
   Interactions/mitkDataInteractor.cpp
   Interactions/mitkDispatcher.cpp
   Interactions/mitkDisplayCoordinateOperation.cpp
   Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkDisplayPositionEvent.cpp
 # Interactions/mitkDisplayVectorInteractorLevelWindow.cpp # legacy, prob even now unneeded
 # Interactions/mitkDisplayVectorInteractorScroll.cpp
   Interactions/mitkEvent.cpp
   Interactions/mitkEventConfig.cpp
   Interactions/mitkEventDescription.cpp
   Interactions/mitkEventFactory.cpp
   Interactions/mitkInteractionEventHandler.cpp
   Interactions/mitkEventMapper.cpp
   Interactions/mitkEventStateMachine.cpp
   Interactions/mitkGlobalInteraction.cpp
   Interactions/mitkInteractor.cpp
   Interactions/mitkInternalEvent.cpp
   Interactions/mitkInteractionEvent.cpp
   Interactions/mitkInteractionEventConst.cpp
   Interactions/mitkInteractionPositionEvent.cpp
   Interactions/mitkInteractionKeyEvent.cpp
   Interactions/mitkMousePressEvent.cpp
   Interactions/mitkMouseMoveEvent.cpp
   Interactions/mitkMouseReleaseEvent.cpp
   Interactions/mitkMouseWheelEvent.cpp
   Interactions/mitkMouseDoubleClickEvent.cpp
   Interactions/mitkMouseModeSwitcher.cpp
   Interactions/mitkMouseMovePointSetInteractor.cpp
   Interactions/mitkMoveBaseDataInteractor.cpp
   Interactions/mitkNodeDepententPointSetInteractor.cpp
   Interactions/mitkPointSetDataInteractor.cpp
   Interactions/mitkPointSetInteractor.cpp
   Interactions/mitkPositionEvent.cpp
   Interactions/mitkPositionTracker.cpp
   Interactions/mitkStateMachineAction.cpp
   Interactions/mitkStateMachineCondition.cpp
   Interactions/mitkStateMachineState.cpp
   Interactions/mitkStateMachineTransition.cpp
   Interactions/mitkState.cpp
   Interactions/mitkStateMachineContainer.cpp
   Interactions/mitkStateEvent.cpp
   Interactions/mitkStateMachine.cpp
   Interactions/mitkStateMachineFactory.cpp
   Interactions/mitkTransition.cpp
   Interactions/mitkWheelEvent.cpp
   Interactions/mitkKeyEvent.cpp
   Interactions/mitkVtkEventAdapter.cpp
   Interactions/mitkVtkInteractorStyle.cxx
   Interactions/mitkCrosshairPositionEvent.cpp
 
   Interfaces/mitkInteractionEventObserver.cpp
   Interfaces/mitkIShaderRepository.cpp
   Interfaces/mitkIPropertyAliases.cpp
   Interfaces/mitkIPropertyDescriptions.cpp
   Interfaces/mitkIPropertyExtensions.cpp
   Interfaces/mitkIPropertyFilters.cpp
   Interfaces/mitkIPersistenceService.cpp
 
   IO/mitkBaseDataIOFactory.cpp
   IO/mitkCoreDataNodeReader.cpp
   IO/mitkDicomSeriesReader.cpp
   IO/mitkDicomSR_LoadDICOMScalar.cpp
   IO/mitkDicomSR_LoadDICOMScalar4D.cpp
   IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
   IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
   IO/mitkDicomSR_ImageBlockDescriptor.cpp
   IO/mitkDicomSR_GantryTiltInformation.cpp
   IO/mitkDicomSR_SliceGroupingResult.cpp
 
   IO/mitkFileReader.cpp
   IO/mitkFileSeriesReader.cpp
   IO/mitkFileWriter.cpp
 # IO/mitkIpPicGet.c
   IO/mitkImageGenerator.cpp
   IO/mitkImageWriter.cpp
   IO/mitkImageWriterFactory.cpp
   IO/mitkItkImageFileIOFactory.cpp
   IO/mitkItkImageFileReader.cpp
   IO/mitkItkLoggingAdapter.cpp
   IO/mitkItkPictureWrite.cpp
   IO/mitkIOUtil.cpp
   IO/mitkLookupTableProperty.cpp
   IO/mitkOperation.cpp
 # IO/mitkPicFileIOFactory.cpp
 # IO/mitkPicFileReader.cpp
 # IO/mitkPicFileWriter.cpp
 # IO/mitkPicHelper.cpp
 # IO/mitkPicVolumeTimeSeriesIOFactory.cpp
 # IO/mitkPicVolumeTimeSeriesReader.cpp
   IO/mitkPixelType.cpp
   IO/mitkPointSetIOFactory.cpp
   IO/mitkPointSetReader.cpp
   IO/mitkPointSetWriter.cpp
   IO/mitkPointSetWriterFactory.cpp
   IO/mitkRawImageFileReader.cpp
   IO/mitkStandardFileLocations.cpp
   IO/mitkSTLFileIOFactory.cpp
   IO/mitkSTLFileReader.cpp
   IO/mitkSurfaceVtkWriter.cpp
   IO/mitkSurfaceVtkWriterFactory.cpp
   IO/mitkVtkLoggingAdapter.cpp
   IO/mitkVtiFileIOFactory.cpp
   IO/mitkVtiFileReader.cpp
   IO/mitkVtkImageIOFactory.cpp
   IO/mitkVtkImageReader.cpp
   IO/mitkVtkSurfaceIOFactory.cpp
   IO/mitkVtkSurfaceReader.cpp
   IO/vtkPointSetXMLParser.cpp
   IO/mitkLog.cpp
 
   Rendering/mitkBaseRenderer.cpp
   Rendering/mitkVtkMapper.cpp
   Rendering/mitkRenderWindowFrame.cpp
   Rendering/mitkGeometry2DDataMapper2D.cpp
   Rendering/mitkGeometry2DDataVtkMapper3D.cpp
   Rendering/mitkGLMapper.cpp
   Rendering/mitkGradientBackground.cpp
   Rendering/mitkManufacturerLogo.cpp
   Rendering/mitkMapper.cpp
   Rendering/mitkPointSetGLMapper2D.cpp
   Rendering/mitkPointSetVtkMapper2D.cpp
   Rendering/mitkPointSetVtkMapper3D.cpp
   Rendering/mitkPolyDataGLMapper2D.cpp
   Rendering/mitkSurfaceGLMapper2D.cpp
   Rendering/mitkSurfaceVtkMapper3D.cpp
   Rendering/mitkVolumeDataVtkMapper3D.cpp
   Rendering/mitkVtkPropRenderer.cpp
   Rendering/mitkVtkWidgetRendering.cpp
   Rendering/vtkMitkRectangleProp.cpp
   Rendering/vtkMitkRenderProp.cpp
   Rendering/mitkVtkEventProvider.cpp
   Rendering/mitkRenderWindow.cpp
   Rendering/mitkRenderWindowBase.cpp
   Rendering/mitkShaderRepository.cpp
   Rendering/mitkImageVtkMapper2D.cpp
   Rendering/vtkMitkThickSlicesFilter.cpp
   Rendering/vtkMitkLevelWindowFilter.cpp
   Rendering/vtkNeverTranslucentTexture.cpp
 
   Rendering/mitkOverlay.cpp
   Rendering/mitkVtkOverlay.cpp
   Rendering/mitkVtkOverlay2D.cpp
   Rendering/mitkVtkOverlay3D.cpp
   Rendering/mitkOverlayManager.cpp
   Rendering/mitkAbstractOverlayLayouter.cpp
 
   Rendering/mitkTextOverlay2D.cpp
   Rendering/mitkTextOverlay3D.cpp
   Rendering/mitkLabelOverlay3D.cpp
   Rendering/mitkOverlay2DLayouter.cpp
   Rendering/mitkScaleLegendOverlay
 
   Common/mitkException.cpp
   Common/mitkCommon.h
   Common/mitkCoreObjectFactoryBase.cpp
   Common/mitkCoreObjectFactory.cpp
   Common/mitkCoreServices.cpp
 )
 
 set(RESOURCE_FILES
 Interactions/globalConfig.xml
 Interactions/DisplayInteraction.xml
 Interactions/DisplayConfig.xml
 Interactions/DisplayConfigPACS.xml
 Interactions/DisplayConfigPACSPan.xml
 Interactions/DisplayConfigPACSScroll.xml
 Interactions/DisplayConfigPACSZoom.xml
 Interactions/DisplayConfigPACSLevelWindow.xml
 Interactions/DisplayConfigMITK.xml
 Interactions/PointSet.xml
 Interactions/Legacy/StateMachine.xml
 Interactions/Legacy/DisplayConfigMITKTools.xml
 Interactions/PointSetConfig.xml
 
 Shaders/mitkShaderLighting.xml
 
 mitkLevelWindowPresets.xml
 )
diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt
index e8f84835d8..e7aeb61fa3 100644
--- a/Modules/CMakeLists.txt
+++ b/Modules/CMakeLists.txt
@@ -1,77 +1,78 @@
 set(LIBPOSTFIX "Ext")
 
 # Modules must be listed according to their dependencies
 set(module_dirs
     MitkDataTypesExt
     MitkAlgorithmsExt
     MitkMapperExt
     MitkIOExt
     Qt4Qt5TestModule
     SceneSerializationBase
     PlanarFigure
+    ImageDenoising
     ImageExtraction
     ImageStatistics
     LegacyAdaptors
     IpPicSupport
     MitkExt
     SceneSerialization
     GraphAlgorithms
     ContourModel
     SurfaceInterpolation
     Segmentation
     PlanarFigureSegmentation
     OpenViewCore
     QmlMitk
     Qmitk
     QmitkExt
     SegmentationUI
     DiffusionImaging
     GPGPU
     IGTBase
     IGT
     CameraCalibration
     IGTUI
     RigidRegistration
     RigidRegistrationUI
     DeformableRegistration
     DeformableRegistrationUI
     OpenCL
     OpenCVVideoSupport
     Overlays
     InputDevices
     ToFHardware
     ToFProcessing
     ToFUI
     US
     ClippingTools
     USUI
     DicomUI
     Simulation
     Remeshing
     Python
     Persistence
 )
 
 if(MITK_ENABLE_PIC_READER)
   list(APPEND module_dirs IpPicSupportIO)
 endif()
 
 set(MITK_DEFAULT_SUBPROJECTS MITK-Modules)
 
 foreach(module_dir ${module_dirs})
   add_subdirectory(${module_dir})
 endforeach()
 
 if(MITK_PRIVATE_MODULES)
   file(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*)
   foreach(subdir ${all_subdirs})
     string(FIND ${subdir} "." _result)
     if(_result EQUAL -1)
       if(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt)
         message(STATUS "Found private module ${subdir}")
         add_subdirectory(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir})
     endif()
     endif()
   endforeach()
 endif(MITK_PRIVATE_MODULES)
 
diff --git a/Modules/ImageDenoising/CMakeLists.txt b/Modules/ImageDenoising/CMakeLists.txt
new file mode 100644
index 0000000000..ba0504ad9b
--- /dev/null
+++ b/Modules/ImageDenoising/CMakeLists.txt
@@ -0,0 +1,7 @@
+MITK_CREATE_MODULE( ImageDenoising
+  #WARNINGS_AS_ERRORS
+)
+
+if(BUILD_TESTING)
+  #add_subdirectory(Testing)
+endif(BUILD_TESTING)
diff --git a/Modules/ImageDenoising/Testing/CMakeLists.txt b/Modules/ImageDenoising/Testing/CMakeLists.txt
new file mode 100644
index 0000000000..153cd81e2e
--- /dev/null
+++ b/Modules/ImageDenoising/Testing/CMakeLists.txt
@@ -0,0 +1 @@
+MITK_CREATE_MODULE_TESTS()
diff --git a/Modules/ImageDenoising/Testing/files.cmake b/Modules/ImageDenoising/Testing/files.cmake
new file mode 100644
index 0000000000..1106df0d62
--- /dev/null
+++ b/Modules/ImageDenoising/Testing/files.cmake
@@ -0,0 +1,3 @@
+set(MODULE_TESTS
+  itkTotalVariationDenoisingImageFilterTest.cpp
+)
diff --git a/Core/Code/Testing/itkTotalVariationDenoisingImageFilterTest.cpp b/Modules/ImageDenoising/Testing/itkTotalVariationDenoisingImageFilterTest.cpp
similarity index 99%
rename from Core/Code/Testing/itkTotalVariationDenoisingImageFilterTest.cpp
rename to Modules/ImageDenoising/Testing/itkTotalVariationDenoisingImageFilterTest.cpp
index 3746c92fad..cc7913262b 100644
--- a/Core/Code/Testing/itkTotalVariationDenoisingImageFilterTest.cpp
+++ b/Modules/ImageDenoising/Testing/itkTotalVariationDenoisingImageFilterTest.cpp
@@ -1,291 +1,290 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "itkTotalVariationDenoisingImageFilter.h"
 #include "itkTotalVariationSingleIterationImageFilter.h"
 #include "itkLocalVariationImageFilter.h"
 #include "itkImageRegionIterator.h"
 
 // image typedefs
 typedef itk::Image<float, 3>
 ImageType;
 typedef itk::ImageRegionIterator<ImageType>
 IteratorType;
 
 // vector image typedefs
 typedef itk::Vector<float,2>
 VectorPixelType;
 typedef itk::Image<VectorPixelType, 3>
 VectorImageType;
 typedef itk::ImageRegionIterator<VectorImageType>
 VectorIteratorType;
 
 /**
 * 3x3x3 test image
 */
 ImageType::Pointer GenerateTestImage()
 {
   // init
   ImageType::Pointer image = ImageType::New();;
 
   // spacing
   ImageType::SpacingType spacing;
   spacing[0] = 1;
   spacing[1] = 1;
   spacing[2] = 1;
   image->SetSpacing(spacing);
 
   // extent
   ImageType::RegionType largestPossibleRegion;
   ImageType::SizeType size = {{3,3,1}};
   largestPossibleRegion.SetSize( size );
   ImageType::IndexType index = {{0,0,0}};
   largestPossibleRegion.SetIndex( index );
   image->SetLargestPossibleRegion( largestPossibleRegion );
   image->SetBufferedRegion( largestPossibleRegion );
 
   // allocate memory
   image->Allocate();
 
   int i=0;
   IteratorType it(image, largestPossibleRegion);
   it.GoToBegin();
   while(!it.IsAtEnd())
   {
     it.Set((float)i++);
     ++it;
   }
 
   return image;
 }
 
 VectorImageType::Pointer GenerateVectorTestImage()
 {
   // init
   VectorImageType::Pointer image = VectorImageType::New();;
 
   // spacing
   VectorImageType::SpacingType spacing;
   spacing[0] = 1;
   spacing[1] = 1;
   spacing[2] = 1;
   image->SetSpacing(spacing);
 
   // extent
   VectorImageType::RegionType largestPossibleRegion;
   VectorImageType::SizeType size = {{3,3,1}};
   largestPossibleRegion.SetSize( size );
   VectorImageType::IndexType index = {{0,0,0}};
   largestPossibleRegion.SetIndex( index );
   image->SetLargestPossibleRegion( largestPossibleRegion );
   image->SetBufferedRegion( largestPossibleRegion );
 
   // allocate memory
   image->Allocate();
 
   int i=0;
   VectorIteratorType it(image, largestPossibleRegion);
   it.GoToBegin();
   while(!it.IsAtEnd())
   {
     VectorPixelType vec;
     vec[0] = (float)i;
     vec[1] = (float)i++;
     it.Set(vec);
     ++it;
   }
 
   return image;
 }
 
 void PrintImage(ImageType::Pointer image)
 {
   IteratorType it(image, image->GetLargestPossibleRegion());
   for(it.GoToBegin(); !it.IsAtEnd(); ++it)
   {
     std::cout << it.Get() << " ";
   }
   std::cout << std::endl;
 }
 
 void PrintVectorImage(VectorImageType::Pointer image)
 {
   VectorIteratorType it(image, image->GetLargestPossibleRegion());
   for(it.GoToBegin(); !it.IsAtEnd(); ++it)
   {
     std::cout << it.Get() << " ";
   }
   std::cout << std::endl;
 }
 
 /**
 * todo
 */
 int itkTotalVariationDenoisingImageFilterTest(int /*argc*/, char* /*argv*/[])
 {
 
   ImageType::Pointer image = GenerateTestImage();
   PrintImage(image);
 
   double precision = 0.01;
   ImageType::IndexType index = {{1,1,0}};
   VectorImageType::IndexType vecIndex = {{1,1,0}};
 
   try
   {
     typedef itk::LocalVariationImageFilter<ImageType,ImageType>
       LocalFilterType;
     LocalFilterType::Pointer filter = LocalFilterType::New();
     filter->SetInput(image);
     filter->SetNumberOfThreads(1);
     filter->Update();
     ImageType::Pointer outImage = filter->GetOutput();
 
     PrintImage(outImage);
     if(fabs(outImage->GetPixel(index) - 4.472) > precision)
     {
       return EXIT_FAILURE;
     }
 
   }
   catch (...)
   {
     return EXIT_FAILURE;
   }
 
   try
   {
     typedef itk::TotalVariationSingleIterationImageFilter<ImageType,ImageType>
       SingleFilterType;
     SingleFilterType::Pointer sFilter = SingleFilterType::New();
     sFilter->SetInput( image );
     sFilter->SetOriginalImage(GenerateTestImage());
     sFilter->SetLambda(0.5);
     sFilter->SetNumberOfThreads(1);
     sFilter->Update();
     ImageType::Pointer outImageS = sFilter->GetOutput();
 
     PrintImage(outImageS);
     if(fabs(outImageS->GetPixel(index) - 4.0) > precision)
     {
       return EXIT_FAILURE;
     }
 
   }
   catch (...)
   {
     return EXIT_FAILURE;
   }
 
   try
   {
     typedef itk::TotalVariationDenoisingImageFilter<ImageType,ImageType>
       TVFilterType;
     TVFilterType::Pointer tvFilter = TVFilterType::New();
     tvFilter->SetInput(image);
     tvFilter->SetNumberIterations(30);
     tvFilter->SetNumberOfThreads(1);
     tvFilter->SetLambda(0.1);
     tvFilter->Update();
     ImageType::Pointer outImageTV = tvFilter->GetOutput();
 
     PrintImage(outImageTV);
     if(fabs(outImageTV->GetPixel(index) - 4.0) > precision)
     {
       return EXIT_FAILURE;
     }
 
   }
   catch (...)
   {
     return EXIT_FAILURE;
   }
 
   VectorImageType::Pointer vecImage = GenerateVectorTestImage();
   PrintVectorImage(vecImage);
 
   try
   {
     typedef itk::LocalVariationImageFilter<VectorImageType,ImageType>
       LocalVecFilterType;
     LocalVecFilterType::Pointer vecFilter = LocalVecFilterType::New();
     vecFilter->SetInput(vecImage);
     vecFilter->SetNumberOfThreads(1);
     vecFilter->Update();
     ImageType::Pointer outVecImage = vecFilter->GetOutput();
 
     PrintImage(outVecImage);
     if(fabs(outVecImage->GetPixel(index) - 6.324) > precision)
     {
       return EXIT_FAILURE;
     }
 
   }
   catch (...)
   {
     return EXIT_FAILURE;
   }
 
   try
   {
     typedef itk::TotalVariationSingleIterationImageFilter
       <VectorImageType,VectorImageType>
       SingleVecFilterType;
     SingleVecFilterType::Pointer sVecFilter = SingleVecFilterType::New();
     sVecFilter->SetInput( vecImage );
     sVecFilter->SetOriginalImage(vecImage);
     sVecFilter->SetLambda(0.5);
     sVecFilter->SetNumberOfThreads(1);
     sVecFilter->UpdateLargestPossibleRegion();
     VectorImageType::Pointer outVecImageS = sVecFilter->GetOutput();
 
     PrintVectorImage(outVecImageS);
     if(fabs(outVecImageS->GetPixel(vecIndex)[1] - 4.0) > precision)
     {
       return EXIT_FAILURE;
     }
   }
   catch (...)
   {
     return EXIT_FAILURE;
   }
 
   try
   {
     typedef itk::TotalVariationDenoisingImageFilter
       <VectorImageType,VectorImageType> TVVectorFilterType;
     TVVectorFilterType::Pointer tvVecFilter = TVVectorFilterType::New();
     tvVecFilter->SetInput(vecImage);
     tvVecFilter->SetNumberIterations(30);
     tvVecFilter->SetNumberOfThreads(1);
     tvVecFilter->SetLambda(0.1);
     tvVecFilter->Update();
     VectorImageType::Pointer outVecImageTV = tvVecFilter->GetOutput();
 
     PrintVectorImage(outVecImageTV);
     if(fabs(outVecImageTV->GetPixel(vecIndex)[1] - 4.0) > precision)
     {
       return EXIT_FAILURE;
     }
   }
   catch (...)
   {
     return EXIT_FAILURE;
   }
 
   return EXIT_SUCCESS;
 }
-
diff --git a/Modules/ImageDenoising/files.cmake b/Modules/ImageDenoising/files.cmake
new file mode 100644
index 0000000000..d8b1e050ab
--- /dev/null
+++ b/Modules/ImageDenoising/files.cmake
@@ -0,0 +1,12 @@
+set(CPP_FILES
+  mitkBilateralFilter.cpp
+)
+set(H_FILES
+  itkLocalVariationImageFilter.h
+  itkLocalVariationImageFilter.txx
+  itkTotalVariationDenoisingImageFilter.h
+  itkTotalVariationDenoisingImageFilter.txx
+  itkTotalVariationSingleIterationImageFilter.h
+  itkTotalVariationSingleIterationImageFilter.txx
+  mitkBilateralFilter.h
+)
diff --git a/Core/Code/Algorithms/itkLocalVariationImageFilter.h b/Modules/ImageDenoising/itkLocalVariationImageFilter.h
similarity index 100%
rename from Core/Code/Algorithms/itkLocalVariationImageFilter.h
rename to Modules/ImageDenoising/itkLocalVariationImageFilter.h
diff --git a/Core/Code/Algorithms/itkLocalVariationImageFilter.txx b/Modules/ImageDenoising/itkLocalVariationImageFilter.txx
similarity index 100%
rename from Core/Code/Algorithms/itkLocalVariationImageFilter.txx
rename to Modules/ImageDenoising/itkLocalVariationImageFilter.txx
diff --git a/Core/Code/Algorithms/itkTotalVariationDenoisingImageFilter.h b/Modules/ImageDenoising/itkTotalVariationDenoisingImageFilter.h
similarity index 100%
rename from Core/Code/Algorithms/itkTotalVariationDenoisingImageFilter.h
rename to Modules/ImageDenoising/itkTotalVariationDenoisingImageFilter.h
diff --git a/Core/Code/Algorithms/itkTotalVariationDenoisingImageFilter.txx b/Modules/ImageDenoising/itkTotalVariationDenoisingImageFilter.txx
similarity index 100%
rename from Core/Code/Algorithms/itkTotalVariationDenoisingImageFilter.txx
rename to Modules/ImageDenoising/itkTotalVariationDenoisingImageFilter.txx
diff --git a/Core/Code/Algorithms/itkTotalVariationSingleIterationImageFilter.h b/Modules/ImageDenoising/itkTotalVariationSingleIterationImageFilter.h
similarity index 100%
rename from Core/Code/Algorithms/itkTotalVariationSingleIterationImageFilter.h
rename to Modules/ImageDenoising/itkTotalVariationSingleIterationImageFilter.h
diff --git a/Core/Code/Algorithms/itkTotalVariationSingleIterationImageFilter.txx b/Modules/ImageDenoising/itkTotalVariationSingleIterationImageFilter.txx
similarity index 100%
rename from Core/Code/Algorithms/itkTotalVariationSingleIterationImageFilter.txx
rename to Modules/ImageDenoising/itkTotalVariationSingleIterationImageFilter.txx
diff --git a/Core/Code/Algorithms/mitkBilateralFilter.cpp b/Modules/ImageDenoising/mitkBilateralFilter.cpp
similarity index 100%
rename from Core/Code/Algorithms/mitkBilateralFilter.cpp
rename to Modules/ImageDenoising/mitkBilateralFilter.cpp
diff --git a/Core/Code/Algorithms/mitkBilateralFilter.h b/Modules/ImageDenoising/mitkBilateralFilter.h
similarity index 100%
rename from Core/Code/Algorithms/mitkBilateralFilter.h
rename to Modules/ImageDenoising/mitkBilateralFilter.h