diff --git a/Modules/ImageExtraction/files.cmake b/Modules/ImageExtraction/files.cmake
index ebb2d57d62..9c8c9d2c06 100644
--- a/Modules/ImageExtraction/files.cmake
+++ b/Modules/ImageExtraction/files.cmake
@@ -1,12 +1,13 @@
 set(CPP_FILES
+  mitkAutoCropImageFilter.cpp
   mitkExtractDirectedPlaneImageFilter.cpp
   mitkExtractDirectedPlaneImageFilterNew.cpp
   mitkExtractImageFilter.cpp
   #mitkExtractSliceFilter.cpp
 )
 
 
 
 
 
 
diff --git a/Modules/MitkExt/Algorithms/mitkAutoCropImageFilter.cpp b/Modules/ImageExtraction/mitkAutoCropImageFilter.cpp
similarity index 100%
rename from Modules/MitkExt/Algorithms/mitkAutoCropImageFilter.cpp
rename to Modules/ImageExtraction/mitkAutoCropImageFilter.cpp
diff --git a/Modules/MitkExt/Algorithms/mitkAutoCropImageFilter.h b/Modules/ImageExtraction/mitkAutoCropImageFilter.h
similarity index 96%
rename from Modules/MitkExt/Algorithms/mitkAutoCropImageFilter.h
rename to Modules/ImageExtraction/mitkAutoCropImageFilter.h
index 3cc44d5182..9025aebb19 100644
--- a/Modules/MitkExt/Algorithms/mitkAutoCropImageFilter.h
+++ b/Modules/ImageExtraction/mitkAutoCropImageFilter.h
@@ -1,130 +1,130 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef __mitkAutoCropImageFilter_h_
 #define __mitkAutoCropImageFilter_h_
 
 #include "mitkCommon.h"
-#include "MitkExtExports.h"
+#include "ImageExtractionExports.h"
 #include "mitkSubImageSelector.h"
 #include "mitkImageTimeSelector.h"
 
 #include <itkImageRegion.h>
 #include <itkImage.h>
 
 namespace mitk {
 
 /**
  *
  * @brief Shrink the image borders to a minimum considering a background color.
  *
  * This filter determines the smallest bounding box of all pixels different
  * from the background, and returns an output image which has been cropped to this size.
  * The box calculated this way is not the smallest possible box, but the box with the
  * smallest sides perpendicular to the world coordinate system.
  *
  * The filter works on 3D and 4D image data. For the 4D case, the smallest box is
  * calculated with side lengths as the maximum of single side lengths from all time steps.
  *
  * 2D images are not supported, and will never be.
  *
  * It is also possible to set the region to be cropped manually using the
  * SetCroppingRegion() method.
  *
  * A margin can be set to enlarge the cropped region with a constant factor in all
  * directions around the smallest possible.
  *
  *
  * @ingroup Process
  *
  * @author Thomas Boettger; revised by Tobias Schwarz and Daniel Stein; Division of Medical
  * and Biological Informatics
  *
  */
 
-class MitkExt_EXPORT AutoCropImageFilter : public SubImageSelector
+class ImageExtraction_EXPORT AutoCropImageFilter : public SubImageSelector
 {
 public:
 
   typedef itk::ImageRegion<3> RegionType;
 
   mitkClassMacro(AutoCropImageFilter, SubImageSelector);
 
   itkNewMacro(Self);
 
   itkGetConstMacro(BackgroundValue,float);
   itkSetMacro(BackgroundValue,float);
 
   itkGetConstMacro(MarginFactor,float);
   itkSetMacro(MarginFactor,float);
 
   itkGetMacro(CroppingRegion, RegionType);
 
   // Use this method to manually set a region
   void SetCroppingRegion(RegionType overrideRegion);
 
   virtual const PixelType GetOutputPixelType();
 
 protected:
 
   // default constructor
   AutoCropImageFilter();
 
   // default destructor
   virtual ~AutoCropImageFilter();
 
   // This method calculates the actual smallest box
   void ComputeNewImageBounds();
 
   // Crops the image using the itk::RegionOfInterestImageFilter and creates the new output image
   template < typename TPixel, unsigned int VImageDimension>
   void ITKCrop3DImage( itk::Image< TPixel, VImageDimension >* inputItkImage, unsigned int timestep );
 
   // Here, the output image is initialized by the input and the newly calculated region
   virtual void GenerateOutputInformation();
 
   // Purposely not implemented
   virtual void GenerateInputRequestedRegion();
 
   // Crops the image on all time steps
   virtual void GenerateData();
 
   float m_BackgroundValue;
 
   RegionType m_CroppingRegion;
 
   float m_MarginFactor;
 
   typedef itk::Image<float,3>    ImageType;
   typedef ImageType::Pointer      ImagePointer;
 
   RegionType::SizeType m_RegionSize;
   RegionType::IndexType m_RegionIndex;
 
   mitk::ImageTimeSelector::Pointer m_TimeSelector;
 
   mitk::SlicedData::RegionType m_InputRequestedRegion;
   itk::TimeStamp m_TimeOfHeaderInitialization;
 
   bool m_OverrideCroppingRegion;
 
 };
 
 } // namespace mitk
 
 #endif
 
 
diff --git a/Modules/MitkExt/files.cmake b/Modules/MitkExt/files.cmake
index 98831db789..7b196d09b5 100644
--- a/Modules/MitkExt/files.cmake
+++ b/Modules/MitkExt/files.cmake
@@ -1,153 +1,152 @@
 set(CPP_FILES
   Algorithms/mitkMaskAndCutRoiImageFilter.cpp
   Algorithms/mitkBoundingObjectToSegmentationFilter.cpp
   Algorithms/vtkPointSetSlicer.cxx
   Algorithms/mitkCoreExtObjectFactory.cpp
   Algorithms/mitkAngleCorrectByPointFilter.cpp
-  Algorithms/mitkAutoCropImageFilter.cpp
   Algorithms/mitkBoundingObjectCutter.cpp
   Algorithms/mitkCylindricToCartesianFilter.cpp
   Algorithms/mitkDopplerToStrainRateFilter.cpp
   Algorithms/mitkGeometryClipImageFilter.cpp
   Algorithms/mitkGeometryDataSource.cpp
   Algorithms/mitkHeightFieldSurfaceClipImageFilter.cpp
   Algorithms/mitkImageToLookupTableFilter.cpp
   Algorithms/mitkImageToSurfaceFilter.cpp
   Algorithms/mitkInterpolateLinesFilter.cpp
   Algorithms/mitkLabeledImageToSurfaceFilter.cpp
   Algorithms/mitkLabeledImageVolumeCalculator.cpp
   Algorithms/mitkLookupTableSource.cpp
   Algorithms/mitkMaskImageFilter.cpp
   Algorithms/mitkMeshSource.cpp
   Algorithms/mitkNonBlockingAlgorithm.cpp
   Algorithms/mitkPadImageFilter.cpp
   Algorithms/mitkPlaneCutFilter.cpp
   Algorithms/mitkPlaneFit.cpp
   Algorithms/mitkPlanesPerpendicularToLinesFilter.cpp
   Algorithms/mitkPointLocator.cpp
   Algorithms/mitkPointSetToCurvedGeometryFilter.cpp
   Algorithms/mitkPointSetToGeometryDataFilter.cpp
   Algorithms/mitkPointSetIndexToWorldTransformFilter.cpp
   Algorithms/mitkSurfaceIndexToWorldTransformFilter.cpp
   Algorithms/mitkPolygonToRingFilter.cpp
   Algorithms/mitkProbeFilter.cpp
   Algorithms/mitkSimpleHistogram.cpp
   Algorithms/mitkSimpleUnstructuredGridHistogram.cpp
   Algorithms/mitkSurfaceToImageFilter.cpp
   Algorithms/mitkUnstructuredGridHistogram.cpp
   Algorithms/mitkUnstructuredGridSource.cpp
   Algorithms/mitkVolumeVisualizationImagePreprocessor.cpp
   Controllers/mitkIPythonService.cpp
   Controllers/mitkMovieGenerator.cpp
   Controllers/mitkMultiStepper.cpp
   Controllers/mitkToolManager.cpp
   DataManagement/mitkAffineTransformationOperation.cpp
   DataManagement/mitkApplyDiffImageOperation.cpp
   DataManagement/mitkBoundingObject.cpp
   DataManagement/mitkBoundingObjectGroup.cpp
   DataManagement/mitkCellOperation.cpp
   DataManagement/mitkColorConversions.cpp
   DataManagement/mitkColorSequence.cpp
   DataManagement/mitkColorSequenceCycleH.cpp
   DataManagement/mitkColorSequenceHalfTones.cpp
   DataManagement/mitkColorSequenceRainbow.cpp
   DataManagement/mitkCompressedImageContainer.cpp
   DataManagement/mitkCone.cpp
   DataManagement/mitkCuboid.cpp
   DataManagement/mitkCylinder.cpp
   DataManagement/mitkDataStorageSelection.cpp
   DataManagement/mitkDelegateManager.cpp
   DataManagement/mitkDrawOperation.cpp
   DataManagement/mitkEllipsoid.cpp
   DataManagement/mitkExternAbstractTransformGeometry.cpp
   DataManagement/mitkFrameOfReferenceUIDManager.cpp
   DataManagement/mitkGridRepresentationProperty.cpp
   DataManagement/mitkGridVolumeMapperProperty.cpp
   DataManagement/mitkItkBaseDataAdapter.cpp
   DataManagement/mitkLabeledImageLookupTable.cpp
   DataManagement/mitkLineOperation.cpp
   DataManagement/mitkMesh.cpp
   DataManagement/mitkObjectSet.cpp
   DataManagement/mitkOrganTypeProperty.cpp
   DataManagement/mitkPlaneLandmarkProjector.cpp
   DataManagement/mitkPlane.cpp
   DataManagement/mitkPropertyManager.cpp
   DataManagement/mitkPropertyObserver.cpp
   DataManagement/mitkSeedsImage.cpp
   DataManagement/mitkSeedsImageLookupTableSource.cpp
   DataManagement/mitkSphereLandmarkProjector.cpp
 # DataManagement/mitkUSLookupTableSource.cpp
   DataManagement/mitkUnstructuredGrid.cpp
   DataManagement/mitkVideoSource.cpp
   DataManagement/vtkObjectSet.cpp
   IO/mitkObjFileIOFactory.cpp
   IO/mitkObjFileReader.cpp
   IO/mitkPACSPlugin.cpp
   IO/mitkParRecFileIOFactory.cpp
   IO/mitkParRecFileReader.cpp
   IO/mitkPropertyListExportToXmlFile.cpp
   IO/mitkPropertyListImportFromXmlFile.cpp
   IO/mitkStlVolumeTimeSeriesIOFactory.cpp
   IO/mitkStlVolumeTimeSeriesReader.cpp
   IO/mitkUnstructuredGridVtkWriter.cpp
   IO/mitkUnstructuredGridVtkWriterFactory.cpp
   IO/mitkVtkUnstructuredGridIOFactory.cpp
   IO/mitkVtkUnstructuredGridReader.cpp
   IO/mitkVtkVolumeTimeSeriesIOFactory.cpp
   IO/mitkVtkVolumeTimeSeriesReader.cpp
   Interactions/mitkConferenceEventMapper.cpp
   Interactions/mitkConnectPointsInteractor.cpp
   #Interactions/mitkCoordinateSupplier.cpp
   #Interactions/mitkDisplayCoordinateOperation.cpp
   #Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkAffineInteractor3D.cpp
   Interactions/mitkDisplayPointSetInteractor.cpp
   #Interactions/mitkDisplayVectorInteractor.cpp
   Interactions/mitkInteractionDebug.cpp
   Interactions/mitkInteractionDebugger.cpp
   Interactions/mitkPointInteractor.cpp
   Interactions/mitkPointSelectorInteractor.cpp
   #Interactions/mitkPositionTracker.cpp
   Interactions/mitkSeedsInteractor.cpp
   Interactions/mitkSocketClient.cpp
   Interactions/mitkSurfaceDeformationInteractor3D.cpp
   Interactions/mitkSurfaceInteractor.cpp
   Interactions/mitkTool.cpp
 #  Interactions/mitkCreateSurfaceTool.cpp
   Interactions/mitkMorphologicTool.cpp
   Interactions/mitkErodeTool.cpp
   Interactions/mitkDilateTool.cpp
   Interactions/mitkOpeningTool.cpp
   Interactions/mitkClosingTool.cpp
   Interactions/mitkPixelManipulationTool.cpp
   Rendering/mitkEnhancedPointSetVtkMapper3D.cpp
   Rendering/mitkImageBackground2D.cpp
   Rendering/mitkLineMapper2D.cpp
 # Rendering/mitkLineVtkMapper3D.cpp
   Rendering/mitkMeshMapper2D.cpp
   Rendering/mitkMeshVtkMapper3D.cpp
   Rendering/mitkNativeRenderWindowInteractor.cpp
 
   Rendering/mitkSplineMapper2D.cpp
   Rendering/mitkSplineVtkMapper3D.cpp
   Rendering/mitkUnstructuredGridMapper2D.cpp
   Rendering/mitkUnstructuredGridVtkMapper3D.cpp
   Rendering/mitkVectorImageMapper2D.cpp
   Rendering/vtkUnstructuredGridMapper.cpp
   Rendering/vtkMaskedGlyph2D.cpp
   Rendering/vtkMaskedGlyph3D.cpp
   Rendering/vtkMitkVolumeTextureMapper3D.cpp
   Rendering/vtkMitkOpenGLVolumeTextureMapper3D.cpp
   Rendering/mitkGPUVolumeMapper3D.cpp
   Rendering/vtkMitkGPUVolumeRayCastMapper.cpp
 )
 
 if(WIN32 AND NOT MINGW)
   set(CPP_FILES
     Controllers/mitkMovieGeneratorWin32.cpp
     ${CPP_FILES}
   )
 endif(WIN32 AND NOT MINGW)