diff --git a/Modules/DataTypesExt/CMakeLists.txt b/Modules/DataTypesExt/CMakeLists.txt
index b6899b7089..495f1e3ce3 100644
--- a/Modules/DataTypesExt/CMakeLists.txt
+++ b/Modules/DataTypesExt/CMakeLists.txt
@@ -1,7 +1,6 @@
 MITK_CREATE_MODULE(DEPENDS MitkCore
                    WARNINGS_AS_ERRORS
                   )
 
-if(BUILD_TESTING)
-  add_subdirectory(Testing)
-endif()
+add_subdirectory(test)
+
diff --git a/Modules/DataTypesExt/Documentation/Doxygen/Modules.dox b/Modules/DataTypesExt/doc/Doxygen/Modules.dox
similarity index 100%
rename from Modules/DataTypesExt/Documentation/Doxygen/Modules.dox
rename to Modules/DataTypesExt/doc/Doxygen/Modules.dox
diff --git a/Modules/DataTypesExt/files.cmake b/Modules/DataTypesExt/files.cmake
index 8333dbac6f..c852d41adc 100644
--- a/Modules/DataTypesExt/files.cmake
+++ b/Modules/DataTypesExt/files.cmake
@@ -1,43 +1,45 @@
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
+
 set(CPP_FILES
   mitkAffineDataInteractor3D.cpp
   mitkApplyDiffImageOperation.cpp
   mitkBoundingObject.cpp
   mitkBoundingObjectGroup.cpp
   mitkCellOperation.cpp
   mitkClippingPlaneInteractor3D.cpp
   mitkColorSequence.cpp
   mitkColorSequenceCycleH.cpp
   mitkColorSequenceRainbow.cpp
   mitkCompressedImageContainer.cpp
   mitkCone.cpp
   mitkCuboid.cpp
   mitkCylinder.cpp
   mitkDataStorageSelection.cpp
   mitkEllipsoid.cpp
   mitkGridRepresentationProperty.cpp
   mitkGridVolumeMapperProperty.cpp
   mitkLabeledImageLookupTable.cpp
   mitkLabeledImageVolumeCalculator.cpp
   mitkLineOperation.cpp
   mitkLookupTableSource.cpp
   mitkMesh.cpp
   mitkMultiStepper.cpp
   mitkOrganTypeProperty.cpp
   mitkPlane.cpp
   mitkSurfaceDeformationDataInteractor3D.cpp
   mitkUnstructuredGrid.cpp
   mitkUnstructuredGridSource.cpp
   mitkVideoSource.cpp
 
-  Internal/mitkColorConversions.cpp
+  mitkColorConversions.cpp
 )
 
 set(RESOURCE_FILES
   Interactions/AffineInteraction3D.xml
   Interactions/AffineConfig.xml
 
   Interactions/ClippingPlaneInteraction3D.xml
   Interactions/ClippingPlaneTranslationConfig.xml
   Interactions/ClippingPlaneRotationConfig.xml
   Interactions/ClippingPlaneDeformationConfig.xml
 )
diff --git a/Modules/DataTypesExt/mitkAffineDataInteractor3D.h b/Modules/DataTypesExt/include/mitkAffineDataInteractor3D.h
similarity index 100%
rename from Modules/DataTypesExt/mitkAffineDataInteractor3D.h
rename to Modules/DataTypesExt/include/mitkAffineDataInteractor3D.h
diff --git a/Modules/DataTypesExt/mitkApplyDiffImageOperation.h b/Modules/DataTypesExt/include/mitkApplyDiffImageOperation.h
similarity index 100%
rename from Modules/DataTypesExt/mitkApplyDiffImageOperation.h
rename to Modules/DataTypesExt/include/mitkApplyDiffImageOperation.h
diff --git a/Modules/DataTypesExt/mitkBoundingObject.h b/Modules/DataTypesExt/include/mitkBoundingObject.h
similarity index 100%
rename from Modules/DataTypesExt/mitkBoundingObject.h
rename to Modules/DataTypesExt/include/mitkBoundingObject.h
diff --git a/Modules/DataTypesExt/mitkBoundingObjectGroup.h b/Modules/DataTypesExt/include/mitkBoundingObjectGroup.h
similarity index 100%
rename from Modules/DataTypesExt/mitkBoundingObjectGroup.h
rename to Modules/DataTypesExt/include/mitkBoundingObjectGroup.h
diff --git a/Modules/DataTypesExt/mitkCellOperation.h b/Modules/DataTypesExt/include/mitkCellOperation.h
similarity index 100%
rename from Modules/DataTypesExt/mitkCellOperation.h
rename to Modules/DataTypesExt/include/mitkCellOperation.h
diff --git a/Modules/DataTypesExt/mitkClippingPlaneInteractor3D.h b/Modules/DataTypesExt/include/mitkClippingPlaneInteractor3D.h
similarity index 100%
rename from Modules/DataTypesExt/mitkClippingPlaneInteractor3D.h
rename to Modules/DataTypesExt/include/mitkClippingPlaneInteractor3D.h
diff --git a/Modules/DataTypesExt/mitkColorSequence.h b/Modules/DataTypesExt/include/mitkColorSequence.h
similarity index 100%
rename from Modules/DataTypesExt/mitkColorSequence.h
rename to Modules/DataTypesExt/include/mitkColorSequence.h
diff --git a/Modules/DataTypesExt/mitkColorSequenceCycleH.h b/Modules/DataTypesExt/include/mitkColorSequenceCycleH.h
similarity index 100%
rename from Modules/DataTypesExt/mitkColorSequenceCycleH.h
rename to Modules/DataTypesExt/include/mitkColorSequenceCycleH.h
diff --git a/Modules/DataTypesExt/mitkColorSequenceRainbow.h b/Modules/DataTypesExt/include/mitkColorSequenceRainbow.h
similarity index 100%
rename from Modules/DataTypesExt/mitkColorSequenceRainbow.h
rename to Modules/DataTypesExt/include/mitkColorSequenceRainbow.h
diff --git a/Modules/DataTypesExt/mitkCompressedImageContainer.h b/Modules/DataTypesExt/include/mitkCompressedImageContainer.h
similarity index 100%
rename from Modules/DataTypesExt/mitkCompressedImageContainer.h
rename to Modules/DataTypesExt/include/mitkCompressedImageContainer.h
diff --git a/Modules/DataTypesExt/mitkCone.h b/Modules/DataTypesExt/include/mitkCone.h
similarity index 100%
rename from Modules/DataTypesExt/mitkCone.h
rename to Modules/DataTypesExt/include/mitkCone.h
diff --git a/Modules/DataTypesExt/mitkCuboid.h b/Modules/DataTypesExt/include/mitkCuboid.h
similarity index 100%
rename from Modules/DataTypesExt/mitkCuboid.h
rename to Modules/DataTypesExt/include/mitkCuboid.h
diff --git a/Modules/DataTypesExt/mitkCylinder.h b/Modules/DataTypesExt/include/mitkCylinder.h
similarity index 100%
rename from Modules/DataTypesExt/mitkCylinder.h
rename to Modules/DataTypesExt/include/mitkCylinder.h
diff --git a/Modules/DataTypesExt/mitkDataStorageSelection.h b/Modules/DataTypesExt/include/mitkDataStorageSelection.h
similarity index 100%
rename from Modules/DataTypesExt/mitkDataStorageSelection.h
rename to Modules/DataTypesExt/include/mitkDataStorageSelection.h
diff --git a/Modules/DataTypesExt/mitkEllipsoid.h b/Modules/DataTypesExt/include/mitkEllipsoid.h
similarity index 100%
rename from Modules/DataTypesExt/mitkEllipsoid.h
rename to Modules/DataTypesExt/include/mitkEllipsoid.h
diff --git a/Modules/DataTypesExt/mitkGridRepresentationProperty.h b/Modules/DataTypesExt/include/mitkGridRepresentationProperty.h
similarity index 100%
rename from Modules/DataTypesExt/mitkGridRepresentationProperty.h
rename to Modules/DataTypesExt/include/mitkGridRepresentationProperty.h
diff --git a/Modules/DataTypesExt/mitkGridVolumeMapperProperty.h b/Modules/DataTypesExt/include/mitkGridVolumeMapperProperty.h
similarity index 100%
rename from Modules/DataTypesExt/mitkGridVolumeMapperProperty.h
rename to Modules/DataTypesExt/include/mitkGridVolumeMapperProperty.h
diff --git a/Modules/DataTypesExt/mitkLabeledImageLookupTable.h b/Modules/DataTypesExt/include/mitkLabeledImageLookupTable.h
similarity index 100%
rename from Modules/DataTypesExt/mitkLabeledImageLookupTable.h
rename to Modules/DataTypesExt/include/mitkLabeledImageLookupTable.h
diff --git a/Modules/DataTypesExt/mitkLineOperation.h b/Modules/DataTypesExt/include/mitkLineOperation.h
similarity index 100%
rename from Modules/DataTypesExt/mitkLineOperation.h
rename to Modules/DataTypesExt/include/mitkLineOperation.h
diff --git a/Modules/DataTypesExt/mitkMesh.h b/Modules/DataTypesExt/include/mitkMesh.h
similarity index 100%
rename from Modules/DataTypesExt/mitkMesh.h
rename to Modules/DataTypesExt/include/mitkMesh.h
diff --git a/Modules/DataTypesExt/mitkMeshUtil.h b/Modules/DataTypesExt/include/mitkMeshUtil.h
similarity index 100%
rename from Modules/DataTypesExt/mitkMeshUtil.h
rename to Modules/DataTypesExt/include/mitkMeshUtil.h
diff --git a/Modules/DataTypesExt/mitkMultiStepper.h b/Modules/DataTypesExt/include/mitkMultiStepper.h
similarity index 100%
rename from Modules/DataTypesExt/mitkMultiStepper.h
rename to Modules/DataTypesExt/include/mitkMultiStepper.h
diff --git a/Modules/DataTypesExt/mitkOrganTypeProperty.h b/Modules/DataTypesExt/include/mitkOrganTypeProperty.h
similarity index 100%
rename from Modules/DataTypesExt/mitkOrganTypeProperty.h
rename to Modules/DataTypesExt/include/mitkOrganTypeProperty.h
diff --git a/Modules/DataTypesExt/mitkPlane.h b/Modules/DataTypesExt/include/mitkPlane.h
similarity index 100%
rename from Modules/DataTypesExt/mitkPlane.h
rename to Modules/DataTypesExt/include/mitkPlane.h
diff --git a/Modules/DataTypesExt/mitkUnstructuredGrid.h b/Modules/DataTypesExt/include/mitkUnstructuredGrid.h
similarity index 100%
rename from Modules/DataTypesExt/mitkUnstructuredGrid.h
rename to Modules/DataTypesExt/include/mitkUnstructuredGrid.h
diff --git a/Modules/DataTypesExt/mitkUnstructuredGridSource.h b/Modules/DataTypesExt/include/mitkUnstructuredGridSource.h
similarity index 100%
rename from Modules/DataTypesExt/mitkUnstructuredGridSource.h
rename to Modules/DataTypesExt/include/mitkUnstructuredGridSource.h
diff --git a/Modules/DataTypesExt/mitkVideoSource.h b/Modules/DataTypesExt/include/mitkVideoSource.h
similarity index 100%
rename from Modules/DataTypesExt/mitkVideoSource.h
rename to Modules/DataTypesExt/include/mitkVideoSource.h
diff --git a/Modules/DataTypesExt/Resources/Interactions/AffineConfig.xml b/Modules/DataTypesExt/resource/Interactions/AffineConfig.xml
similarity index 100%
rename from Modules/DataTypesExt/Resources/Interactions/AffineConfig.xml
rename to Modules/DataTypesExt/resource/Interactions/AffineConfig.xml
diff --git a/Modules/DataTypesExt/Resources/Interactions/AffineInteraction3D.xml b/Modules/DataTypesExt/resource/Interactions/AffineInteraction3D.xml
similarity index 100%
rename from Modules/DataTypesExt/Resources/Interactions/AffineInteraction3D.xml
rename to Modules/DataTypesExt/resource/Interactions/AffineInteraction3D.xml
diff --git a/Modules/DataTypesExt/Resources/Interactions/ClippingPlaneDeformationConfig.xml b/Modules/DataTypesExt/resource/Interactions/ClippingPlaneDeformationConfig.xml
similarity index 100%
rename from Modules/DataTypesExt/Resources/Interactions/ClippingPlaneDeformationConfig.xml
rename to Modules/DataTypesExt/resource/Interactions/ClippingPlaneDeformationConfig.xml
diff --git a/Modules/DataTypesExt/Resources/Interactions/ClippingPlaneInteraction3D.xml b/Modules/DataTypesExt/resource/Interactions/ClippingPlaneInteraction3D.xml
similarity index 100%
rename from Modules/DataTypesExt/Resources/Interactions/ClippingPlaneInteraction3D.xml
rename to Modules/DataTypesExt/resource/Interactions/ClippingPlaneInteraction3D.xml
diff --git a/Modules/DataTypesExt/Resources/Interactions/ClippingPlaneRotationConfig.xml b/Modules/DataTypesExt/resource/Interactions/ClippingPlaneRotationConfig.xml
similarity index 100%
rename from Modules/DataTypesExt/Resources/Interactions/ClippingPlaneRotationConfig.xml
rename to Modules/DataTypesExt/resource/Interactions/ClippingPlaneRotationConfig.xml
diff --git a/Modules/DataTypesExt/Resources/Interactions/ClippingPlaneTranslationConfig.xml b/Modules/DataTypesExt/resource/Interactions/ClippingPlaneTranslationConfig.xml
similarity index 100%
rename from Modules/DataTypesExt/Resources/Interactions/ClippingPlaneTranslationConfig.xml
rename to Modules/DataTypesExt/resource/Interactions/ClippingPlaneTranslationConfig.xml
diff --git a/Modules/DataTypesExt/mitkAffineDataInteractor3D.cpp b/Modules/DataTypesExt/src/mitkAffineDataInteractor3D.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkAffineDataInteractor3D.cpp
rename to Modules/DataTypesExt/src/mitkAffineDataInteractor3D.cpp
diff --git a/Modules/DataTypesExt/mitkApplyDiffImageOperation.cpp b/Modules/DataTypesExt/src/mitkApplyDiffImageOperation.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkApplyDiffImageOperation.cpp
rename to Modules/DataTypesExt/src/mitkApplyDiffImageOperation.cpp
diff --git a/Modules/DataTypesExt/mitkBoundingObject.cpp b/Modules/DataTypesExt/src/mitkBoundingObject.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkBoundingObject.cpp
rename to Modules/DataTypesExt/src/mitkBoundingObject.cpp
diff --git a/Modules/DataTypesExt/mitkBoundingObjectGroup.cpp b/Modules/DataTypesExt/src/mitkBoundingObjectGroup.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkBoundingObjectGroup.cpp
rename to Modules/DataTypesExt/src/mitkBoundingObjectGroup.cpp
diff --git a/Modules/DataTypesExt/mitkCellOperation.cpp b/Modules/DataTypesExt/src/mitkCellOperation.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkCellOperation.cpp
rename to Modules/DataTypesExt/src/mitkCellOperation.cpp
diff --git a/Modules/DataTypesExt/mitkClippingPlaneInteractor3D.cpp b/Modules/DataTypesExt/src/mitkClippingPlaneInteractor3D.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkClippingPlaneInteractor3D.cpp
rename to Modules/DataTypesExt/src/mitkClippingPlaneInteractor3D.cpp
diff --git a/Modules/DataTypesExt/Internal/mitkColorConversions.cpp b/Modules/DataTypesExt/src/mitkColorConversions.cpp
similarity index 100%
rename from Modules/DataTypesExt/Internal/mitkColorConversions.cpp
rename to Modules/DataTypesExt/src/mitkColorConversions.cpp
diff --git a/Modules/DataTypesExt/Internal/mitkColorConversions.h b/Modules/DataTypesExt/src/mitkColorConversions.h
similarity index 100%
rename from Modules/DataTypesExt/Internal/mitkColorConversions.h
rename to Modules/DataTypesExt/src/mitkColorConversions.h
diff --git a/Modules/DataTypesExt/mitkColorSequence.cpp b/Modules/DataTypesExt/src/mitkColorSequence.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkColorSequence.cpp
rename to Modules/DataTypesExt/src/mitkColorSequence.cpp
diff --git a/Modules/DataTypesExt/mitkColorSequenceCycleH.cpp b/Modules/DataTypesExt/src/mitkColorSequenceCycleH.cpp
similarity index 98%
rename from Modules/DataTypesExt/mitkColorSequenceCycleH.cpp
rename to Modules/DataTypesExt/src/mitkColorSequenceCycleH.cpp
index a5bed685ad..dd3322e4f6 100644
--- a/Modules/DataTypesExt/mitkColorSequenceCycleH.cpp
+++ b/Modules/DataTypesExt/src/mitkColorSequenceCycleH.cpp
@@ -1,123 +1,123 @@
 /*===================================================================
 
 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 <mitkColorSequenceCycleH.h>
-#include <Internal/mitkColorConversions.h>
+#include <mitkColorConversions.h>
 
 namespace mitk
 {
 
 ColorSequenceCycleH::ColorSequenceCycleH()
 {
   color_h = -60.0; // after the first increase this will yield red
   color_s = 1.0;  // full saturation
   color_v = 1.0; // full value
   color_cycle = 0;
 }
 
 ColorSequenceCycleH::~ColorSequenceCycleH()
 {
   // nothing to do
 }
 
 Color ColorSequenceCycleH::GetNextColor()
 {
   color_h += 60.0;
   if ( color_h < 0.0 ) color_h = 0.0;
 
   if (color_h >= 360.0)
   {
     if ( color_cycle == 0 )
     {
       color_h = 30.0;
       color_s = 1.0;
       color_v = 1.0;
       color_cycle = 1;
     }
     else if (color_cycle == 1)
     {
       color_h = 0.0;
       color_s = 0.5;
       color_v = 1.0;
       color_cycle = 2;
     }
     else if (color_cycle == 2)
     {
       color_h = 30.0;
       color_s = 0.5;
       color_v = 1.0;
       color_cycle = 3;
     }
     else if (color_cycle == 3)
     {
       color_h = 0.0;
       color_s = 1.0;
       color_v = 0.5;
       color_cycle = 4;
     }
     else if (color_cycle == 4)
     {
       color_h = 30.0;
       color_s = 1.0;
       color_v = 0.5;
       color_cycle = 5;
     }
     else if (color_cycle == 5)
     {
       color_h = 0.0;
       color_s = 1.0;
       color_v = 1.0;
       color_cycle = 0;
     }
   }
 
   // convert to rgb
   float r, g, b;
   ColorConversions::Hsv2Rgb(color_h, color_s, color_v, r, g, b);
 
   Color returnColor;
   returnColor.Set(r, g, b);
 
   return returnColor;
 }
 
 void ColorSequenceCycleH::GoToBegin()
 {
   color_h = -60.0; // after the first increase this will yield red
   color_s = 1.0;  // full saturation
   color_v = 1.0; // full value
   color_cycle = 0;
 }
 
 void ColorSequenceCycleH::ChangeHueValueByCycleSteps( int steps )
 {
   color_h += (float)(steps*60.0);
 }
 
 void ColorSequenceCycleH::ChangeHueValueByAbsoluteNumber( float number )
 {
   color_h += number;
 }
 
 void ColorSequenceCycleH::SetColorCycle( unsigned short cycle )
 {
 if ( cycle > 5 ) cycle = 5;
 color_cycle = cycle;
 color_h = 360.0;
 this->GetNextColor();
 
 }
 
 }  // mitk
diff --git a/Modules/DataTypesExt/mitkColorSequenceRainbow.cpp b/Modules/DataTypesExt/src/mitkColorSequenceRainbow.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkColorSequenceRainbow.cpp
rename to Modules/DataTypesExt/src/mitkColorSequenceRainbow.cpp
diff --git a/Modules/DataTypesExt/mitkCompressedImageContainer.cpp b/Modules/DataTypesExt/src/mitkCompressedImageContainer.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkCompressedImageContainer.cpp
rename to Modules/DataTypesExt/src/mitkCompressedImageContainer.cpp
diff --git a/Modules/DataTypesExt/mitkCone.cpp b/Modules/DataTypesExt/src/mitkCone.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkCone.cpp
rename to Modules/DataTypesExt/src/mitkCone.cpp
diff --git a/Modules/DataTypesExt/mitkCuboid.cpp b/Modules/DataTypesExt/src/mitkCuboid.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkCuboid.cpp
rename to Modules/DataTypesExt/src/mitkCuboid.cpp
diff --git a/Modules/DataTypesExt/mitkCylinder.cpp b/Modules/DataTypesExt/src/mitkCylinder.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkCylinder.cpp
rename to Modules/DataTypesExt/src/mitkCylinder.cpp
diff --git a/Modules/DataTypesExt/mitkDataStorageSelection.cpp b/Modules/DataTypesExt/src/mitkDataStorageSelection.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkDataStorageSelection.cpp
rename to Modules/DataTypesExt/src/mitkDataStorageSelection.cpp
diff --git a/Modules/DataTypesExt/mitkEllipsoid.cpp b/Modules/DataTypesExt/src/mitkEllipsoid.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkEllipsoid.cpp
rename to Modules/DataTypesExt/src/mitkEllipsoid.cpp
diff --git a/Modules/DataTypesExt/mitkGridRepresentationProperty.cpp b/Modules/DataTypesExt/src/mitkGridRepresentationProperty.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkGridRepresentationProperty.cpp
rename to Modules/DataTypesExt/src/mitkGridRepresentationProperty.cpp
diff --git a/Modules/DataTypesExt/mitkGridVolumeMapperProperty.cpp b/Modules/DataTypesExt/src/mitkGridVolumeMapperProperty.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkGridVolumeMapperProperty.cpp
rename to Modules/DataTypesExt/src/mitkGridVolumeMapperProperty.cpp
diff --git a/Modules/DataTypesExt/mitkLabeledImageLookupTable.cpp b/Modules/DataTypesExt/src/mitkLabeledImageLookupTable.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkLabeledImageLookupTable.cpp
rename to Modules/DataTypesExt/src/mitkLabeledImageLookupTable.cpp
diff --git a/Modules/DataTypesExt/mitkLabeledImageVolumeCalculator.cpp b/Modules/DataTypesExt/src/mitkLabeledImageVolumeCalculator.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkLabeledImageVolumeCalculator.cpp
rename to Modules/DataTypesExt/src/mitkLabeledImageVolumeCalculator.cpp
diff --git a/Modules/DataTypesExt/mitkLabeledImageVolumeCalculator.h b/Modules/DataTypesExt/src/mitkLabeledImageVolumeCalculator.h
similarity index 100%
rename from Modules/DataTypesExt/mitkLabeledImageVolumeCalculator.h
rename to Modules/DataTypesExt/src/mitkLabeledImageVolumeCalculator.h
diff --git a/Modules/DataTypesExt/mitkLineOperation.cpp b/Modules/DataTypesExt/src/mitkLineOperation.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkLineOperation.cpp
rename to Modules/DataTypesExt/src/mitkLineOperation.cpp
diff --git a/Modules/DataTypesExt/mitkLookupTableSource.cpp b/Modules/DataTypesExt/src/mitkLookupTableSource.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkLookupTableSource.cpp
rename to Modules/DataTypesExt/src/mitkLookupTableSource.cpp
diff --git a/Modules/DataTypesExt/mitkLookupTableSource.h b/Modules/DataTypesExt/src/mitkLookupTableSource.h
similarity index 100%
rename from Modules/DataTypesExt/mitkLookupTableSource.h
rename to Modules/DataTypesExt/src/mitkLookupTableSource.h
diff --git a/Modules/DataTypesExt/mitkMesh.cpp b/Modules/DataTypesExt/src/mitkMesh.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkMesh.cpp
rename to Modules/DataTypesExt/src/mitkMesh.cpp
diff --git a/Modules/DataTypesExt/mitkMultiStepper.cpp b/Modules/DataTypesExt/src/mitkMultiStepper.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkMultiStepper.cpp
rename to Modules/DataTypesExt/src/mitkMultiStepper.cpp
diff --git a/Modules/DataTypesExt/mitkOrganTypeProperty.cpp b/Modules/DataTypesExt/src/mitkOrganTypeProperty.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkOrganTypeProperty.cpp
rename to Modules/DataTypesExt/src/mitkOrganTypeProperty.cpp
diff --git a/Modules/DataTypesExt/mitkPlane.cpp b/Modules/DataTypesExt/src/mitkPlane.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkPlane.cpp
rename to Modules/DataTypesExt/src/mitkPlane.cpp
diff --git a/Modules/DataTypesExt/mitkSurfaceDeformationDataInteractor3D.cpp b/Modules/DataTypesExt/src/mitkSurfaceDeformationDataInteractor3D.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkSurfaceDeformationDataInteractor3D.cpp
rename to Modules/DataTypesExt/src/mitkSurfaceDeformationDataInteractor3D.cpp
diff --git a/Modules/DataTypesExt/mitkSurfaceDeformationDataInteractor3D.h b/Modules/DataTypesExt/src/mitkSurfaceDeformationDataInteractor3D.h
similarity index 100%
rename from Modules/DataTypesExt/mitkSurfaceDeformationDataInteractor3D.h
rename to Modules/DataTypesExt/src/mitkSurfaceDeformationDataInteractor3D.h
diff --git a/Modules/DataTypesExt/mitkUnstructuredGrid.cpp b/Modules/DataTypesExt/src/mitkUnstructuredGrid.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkUnstructuredGrid.cpp
rename to Modules/DataTypesExt/src/mitkUnstructuredGrid.cpp
diff --git a/Modules/DataTypesExt/mitkUnstructuredGridSource.cpp b/Modules/DataTypesExt/src/mitkUnstructuredGridSource.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkUnstructuredGridSource.cpp
rename to Modules/DataTypesExt/src/mitkUnstructuredGridSource.cpp
diff --git a/Modules/DataTypesExt/mitkVideoSource.cpp b/Modules/DataTypesExt/src/mitkVideoSource.cpp
similarity index 100%
rename from Modules/DataTypesExt/mitkVideoSource.cpp
rename to Modules/DataTypesExt/src/mitkVideoSource.cpp
diff --git a/Modules/DataTypesExt/Testing/CMakeLists.txt b/Modules/DataTypesExt/test/CMakeLists.txt
similarity index 100%
rename from Modules/DataTypesExt/Testing/CMakeLists.txt
rename to Modules/DataTypesExt/test/CMakeLists.txt
diff --git a/Modules/DataTypesExt/Testing/files.cmake b/Modules/DataTypesExt/test/files.cmake
similarity index 100%
rename from Modules/DataTypesExt/Testing/files.cmake
rename to Modules/DataTypesExt/test/files.cmake
diff --git a/Modules/DataTypesExt/Testing/mitkCompressedImageContainerTest.cpp b/Modules/DataTypesExt/test/mitkCompressedImageContainerTest.cpp
similarity index 100%
rename from Modules/DataTypesExt/Testing/mitkCompressedImageContainerTest.cpp
rename to Modules/DataTypesExt/test/mitkCompressedImageContainerTest.cpp
diff --git a/Modules/DataTypesExt/Testing/mitkMeshTest.cpp b/Modules/DataTypesExt/test/mitkMeshTest.cpp
similarity index 100%
rename from Modules/DataTypesExt/Testing/mitkMeshTest.cpp
rename to Modules/DataTypesExt/test/mitkMeshTest.cpp
diff --git a/Modules/DataTypesExt/Testing/mitkMultiStepperTest.cpp b/Modules/DataTypesExt/test/mitkMultiStepperTest.cpp
similarity index 100%
rename from Modules/DataTypesExt/Testing/mitkMultiStepperTest.cpp
rename to Modules/DataTypesExt/test/mitkMultiStepperTest.cpp
diff --git a/Modules/DataTypesExt/Testing/mitkOrganTypePropertyTest.cpp b/Modules/DataTypesExt/test/mitkOrganTypePropertyTest.cpp
similarity index 100%
rename from Modules/DataTypesExt/Testing/mitkOrganTypePropertyTest.cpp
rename to Modules/DataTypesExt/test/mitkOrganTypePropertyTest.cpp
diff --git a/Modules/DataTypesExt/Testing/mitkUnstructuredGridTest.cpp b/Modules/DataTypesExt/test/mitkUnstructuredGridTest.cpp
similarity index 100%
rename from Modules/DataTypesExt/Testing/mitkUnstructuredGridTest.cpp
rename to Modules/DataTypesExt/test/mitkUnstructuredGridTest.cpp