diff --git a/Modules/Core/files.cmake b/Modules/Core/files.cmake
index ff235cd48b..a287d77721 100644
--- a/Modules/Core/files.cmake
+++ b/Modules/Core/files.cmake
@@ -1,315 +1,312 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkCoreActivator.cpp
   mitkCoreObjectFactoryBase.cpp
   mitkCoreObjectFactory.cpp
   mitkCoreServices.cpp
   mitkException.cpp
 
   Algorithms/mitkBaseDataSource.cpp
   Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
   Algorithms/mitkCompareImageDataFilter.cpp
   Algorithms/mitkCompositePixelValueToString.cpp
   Algorithms/mitkConvert2Dto3DImageFilter.cpp
   Algorithms/mitkDataNodeSource.cpp
   Algorithms/mitkExtractSliceFilter.cpp
   Algorithms/mitkHistogramGenerator.cpp
   Algorithms/mitkImageChannelSelector.cpp
   Algorithms/mitkImageSliceSelector.cpp
   Algorithms/mitkImageSource.cpp
   Algorithms/mitkImageTimeSelector.cpp
   Algorithms/mitkImageToImageFilter.cpp
   Algorithms/mitkImageToSurfaceFilter.cpp
   Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
   Algorithms/mitkPlaneGeometryDataToSurfaceFilter.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
 
   Controllers/mitkBaseController.cpp
   Controllers/mitkCallbackFromGUIThread.cpp
   Controllers/mitkCameraController.cpp
   Controllers/mitkCameraRotationController.cpp
   Controllers/mitkLimitedLinearUndo.cpp
   Controllers/mitkOperationEvent.cpp
   Controllers/mitkPlanePositionManager.cpp
   Controllers/mitkProgressBar.cpp
   Controllers/mitkRenderingManager.cpp
   Controllers/mitkSliceNavigationController.cpp
   Controllers/mitkSlicesCoordinator.cpp
   Controllers/mitkStatusBar.cpp
   Controllers/mitkStepper.cpp
   Controllers/mitkTestManager.cpp
   Controllers/mitkUndoController.cpp
   Controllers/mitkVerboseLimitedLinearUndo.cpp
   Controllers/mitkVtkLayerController.cpp
   DataManagement/mitkAnatomicalStructureColorPresets.cpp
   DataManagement/mitkArbitraryTimeGeometry.cpp
   DataManagement/mitkAbstractTransformGeometry.cpp
   DataManagement/mitkAnnotationProperty.cpp
   DataManagement/mitkApplicationCursor.cpp
   DataManagement/mitkApplyTransformMatrixOperation.cpp
   DataManagement/mitkBaseData.cpp
   DataManagement/mitkBaseGeometry.cpp
   DataManagement/mitkBaseProperty.cpp
   DataManagement/mitkChannelDescriptor.cpp
   DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkColorProperty.cpp
   DataManagement/mitkDataNode.cpp
   DataManagement/mitkDataStorage.cpp
   DataManagement/mitkEnumerationProperty.cpp
   DataManagement/mitkFloatPropertyExtension.cpp
   DataManagement/mitkGeometry3D.cpp
   DataManagement/mitkGeometryData.cpp
   DataManagement/mitkGeometryTransformHolder.cpp
   DataManagement/mitkGroupTagProperty.cpp
   DataManagement/mitkImageAccessorBase.cpp
   DataManagement/mitkImageCaster.cpp
   DataManagement/mitkImageCastPart1.cpp
   DataManagement/mitkImageCastPart2.cpp
   DataManagement/mitkImageCastPart3.cpp
   DataManagement/mitkImageCastPart4.cpp
   DataManagement/mitkImage.cpp
   DataManagement/mitkImageDataItem.cpp
   DataManagement/mitkImageDescriptor.cpp
   DataManagement/mitkImageReadAccessor.cpp
   DataManagement/mitkImageStatisticsHolder.cpp
   DataManagement/mitkImageVtkAccessor.cpp
   DataManagement/mitkImageVtkReadAccessor.cpp
   DataManagement/mitkImageVtkWriteAccessor.cpp
   DataManagement/mitkImageWriteAccessor.cpp
   DataManagement/mitkIntPropertyExtension.cpp
   DataManagement/mitkIPersistenceService.cpp
   DataManagement/mitkIPropertyAliases.cpp
   DataManagement/mitkIPropertyDescriptions.cpp
   DataManagement/mitkIPropertyExtensions.cpp
   DataManagement/mitkIPropertyFilters.cpp
   DataManagement/mitkIPropertyPersistence.cpp
   DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjector.cpp
   DataManagement/mitkLevelWindow.cpp
   DataManagement/mitkLevelWindowManager.cpp
   DataManagement/mitkLevelWindowPreset.cpp
   DataManagement/mitkLevelWindowProperty.cpp
   DataManagement/mitkLine.cpp
   DataManagement/mitkLookupTable.cpp
   DataManagement/mitkLookupTableProperty.cpp
   DataManagement/mitkLookupTables.cpp # specializations of GenericLookupTable
   DataManagement/mitkMaterial.cpp
   DataManagement/mitkMemoryUtilities.cpp
   DataManagement/mitkModalityProperty.cpp
   DataManagement/mitkModifiedLock.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/mitkNumericConstants.cpp
   DataManagement/mitkPlaneGeometry.cpp
   DataManagement/mitkPlaneGeometryData.cpp
   DataManagement/mitkPlaneOperation.cpp
   DataManagement/mitkPlaneOrientationProperty.cpp
   DataManagement/mitkPointOperation.cpp
   DataManagement/mitkPointSet.cpp
   DataManagement/mitkPointSetShapeProperty.cpp
   DataManagement/mitkProperties.cpp
   DataManagement/mitkPropertyAliases.cpp
   DataManagement/mitkPropertyDescriptions.cpp
   DataManagement/mitkPropertyExtension.cpp
   DataManagement/mitkPropertyExtensions.cpp
   DataManagement/mitkPropertyFilter.cpp
   DataManagement/mitkPropertyFilters.cpp
   DataManagement/mitkPropertyList.cpp
   DataManagement/mitkPropertyListReplacedObserver.cpp
   DataManagement/mitkPropertyNameHelper.cpp
   DataManagement/mitkPropertyObserver.cpp
   DataManagement/mitkPropertyPersistence.cpp
   DataManagement/mitkPropertyPersistenceInfo.cpp
   DataManagement/mitkProportionalTimeGeometry.cpp
   DataManagement/mitkRenderingModeProperty.cpp
   DataManagement/mitkResliceMethodProperty.cpp
   DataManagement/mitkRestorePlanePositionOperation.cpp
   DataManagement/mitkRotationOperation.cpp
   DataManagement/mitkScaleOperation.cpp
   DataManagement/mitkShaderProperty.cpp
   DataManagement/mitkSlicedData.cpp
   DataManagement/mitkSlicedGeometry3D.cpp
   DataManagement/mitkSmartPointerProperty.cpp
   DataManagement/mitkStandaloneDataStorage.cpp
   DataManagement/mitkStringProperty.cpp
   DataManagement/mitkSurface.cpp
   DataManagement/mitkSurfaceOperation.cpp
   DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
   DataManagement/mitkTimeGeometry.cpp
   DataManagement/mitkTransferFunction.cpp
   DataManagement/mitkTransferFunctionInitializer.cpp
   DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkTemporoSpatialStringProperty.cpp
   DataManagement/mitkVector.cpp
   DataManagement/mitkVectorProperty.cpp
   DataManagement/mitkVtkInterpolationProperty.cpp
   DataManagement/mitkVtkRepresentationProperty.cpp
   DataManagement/mitkVtkResliceInterpolationProperty.cpp
   DataManagement/mitkVtkScalarModeProperty.cpp
   DataManagement/mitkVtkVolumeRenderingProperty.cpp
   DataManagement/mitkWeakPointerProperty.cpp
 
   Interactions/mitkAction.cpp
   Interactions/mitkBindDispatcherInteractor.cpp
   Interactions/mitkCrosshairPositionEvent.cpp
   Interactions/mitkDataInteractor.cpp
   Interactions/mitkDispatcher.cpp
   Interactions/mitkDisplayCoordinateOperation.cpp
   Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkEventConfig.cpp
   Interactions/mitkEventFactory.cpp
   Interactions/mitkEventRecorder.cpp
   Interactions/mitkEventStateMachine.cpp
   Interactions/mitkInteractionEventConst.cpp
   Interactions/mitkInteractionEvent.cpp
   Interactions/mitkInteractionEventHandler.cpp
   Interactions/mitkInteractionEventObserver.cpp
   Interactions/mitkInteractionKeyEvent.cpp
   Interactions/mitkInteractionPositionEvent.cpp
   Interactions/mitkInternalEvent.cpp
   Interactions/mitkMouseDoubleClickEvent.cpp
   Interactions/mitkMouseModeSwitcher.cpp
   Interactions/mitkMouseMoveEvent.cpp
   Interactions/mitkMousePressEvent.cpp
   Interactions/mitkMouseReleaseEvent.cpp
   Interactions/mitkMouseWheelEvent.cpp
   Interactions/mitkPointSetDataInteractor.cpp
   Interactions/mitkSinglePointDataInteractor.cpp
   Interactions/mitkStateMachineAction.cpp
   Interactions/mitkStateMachineCondition.cpp
   Interactions/mitkStateMachineContainer.cpp
   Interactions/mitkStateMachineState.cpp
   Interactions/mitkStateMachineTransition.cpp
   Interactions/mitkVtkEventAdapter.cpp
   Interactions/mitkVtkInteractorStyle.cxx
   Interactions/mitkXML2EventParser.cpp
 
   IO/mitkAbstractFileIO.cpp
   IO/mitkAbstractFileReader.cpp
   IO/mitkAbstractFileWriter.cpp
   IO/mitkCustomMimeType.cpp
   IO/mitkDicomSeriesReader.cpp
   IO/mitkDicomSeriesReaderService.cpp
   IO/mitkDicomSR_GantryTiltInformation.cpp
   IO/mitkDicomSR_ImageBlockDescriptor.cpp
   IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
   IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
   IO/mitkDicomSR_LoadDICOMScalar4D.cpp
   IO/mitkDicomSR_LoadDICOMScalar.cpp
   IO/mitkDicomSR_SliceGroupingResult.cpp
   IO/mitkFileReader.cpp
   IO/mitkFileReaderRegistry.cpp
   IO/mitkFileReaderSelector.cpp
   IO/mitkFileReaderWriterBase.cpp
   IO/mitkFileWriter.cpp
   IO/mitkFileWriterRegistry.cpp
   IO/mitkFileWriterSelector.cpp
   IO/mitkGeometry3DToXML.cpp
   IO/mitkIFileIO.cpp
   IO/mitkIFileReader.cpp
   IO/mitkIFileWriter.cpp
   IO/mitkGeometryDataReaderService.cpp
   IO/mitkGeometryDataWriterService.cpp
   IO/mitkImageGenerator.cpp
   IO/mitkImageVtkLegacyIO.cpp
   IO/mitkImageVtkXmlIO.cpp
   IO/mitkIMimeTypeProvider.cpp
   IO/mitkIOConstants.cpp
   IO/mitkIOMimeTypes.cpp
   IO/mitkIOUtil.cpp
   IO/mitkItkImageIO.cpp
   IO/mitkItkLoggingAdapter.cpp
   IO/mitkLegacyFileReaderService.cpp
   IO/mitkLegacyFileWriterService.cpp
   IO/mitkLocaleSwitch.cpp
   IO/mitkLog.cpp
   IO/mitkMimeType.cpp
   IO/mitkMimeTypeProvider.cpp
   IO/mitkOperation.cpp
   IO/mitkPixelType.cpp
   IO/mitkPointSetReaderService.cpp
   IO/mitkPointSetWriterService.cpp
   IO/mitkProportionalTimeGeometryToXML.cpp
   IO/mitkRawImageFileReader.cpp
   IO/mitkStandardFileLocations.cpp
   IO/mitkSurfaceStlIO.cpp
   IO/mitkSurfaceVtkIO.cpp
   IO/mitkSurfaceVtkLegacyIO.cpp
   IO/mitkSurfaceVtkXmlIO.cpp
   IO/mitkVtkLoggingAdapter.cpp
 
   Rendering/mitkAbstractOverlayLayouter.cpp
   Rendering/mitkOverlay2DLayouter.cpp
   Rendering/mitkBaseRenderer.cpp
   #Rendering/mitkGLMapper.cpp Moved to deprecated LegacyGL Module
   Rendering/mitkGradientBackground.cpp
   Rendering/mitkImageVtkMapper2D.cpp
   Rendering/mitkIShaderRepository.cpp
   Rendering/mitkMapper.cpp
   Rendering/mitkOverlay.cpp
   Rendering/mitkOverlayManager.cpp
   Rendering/mitkPlaneGeometryDataMapper2D.cpp
   Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
   Rendering/mitkPointSetVtkMapper2D.cpp
   Rendering/mitkPointSetVtkMapper3D.cpp
   Rendering/mitkRenderWindowBase.cpp
   Rendering/mitkRenderWindow.cpp
   Rendering/mitkRenderWindowFrame.cpp
   #Rendering/mitkSurfaceGLMapper2D.cpp Moved to deprecated LegacyGL Module
   Rendering/mitkSurfaceVtkMapper2D.cpp
   Rendering/mitkSurfaceVtkMapper3D.cpp
   Rendering/mitkVtkEventProvider.cpp
   Rendering/mitkVtkMapper.cpp
-  Rendering/mitkVtkOverlay2D.cpp
-  Rendering/mitkVtkOverlay3D.cpp
-  Rendering/mitkVtkOverlay.cpp
   Rendering/mitkVtkPropRenderer.cpp
   Rendering/mitkVtkWidgetRendering.cpp
   Rendering/vtkMitkLevelWindowFilter.cpp
   Rendering/vtkMitkRectangleProp.cpp
   Rendering/vtkMitkRenderProp.cpp
   Rendering/vtkMitkThickSlicesFilter.cpp
   Rendering/vtkNeverTranslucentTexture.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/DisplayConfigMITKNoCrosshair.xml
 Interactions/DisplayConfigMITKRotation.xml
 Interactions/DisplayConfigMITKRotationUnCoupled.xml
 Interactions/DisplayConfigMITKSwivel.xml
 Interactions/DisplayConfigMITKLimited.xml
 Interactions/PointSet.xml
 Interactions/Legacy/StateMachine.xml
 Interactions/Legacy/DisplayConfigMITKTools.xml
 Interactions/PointSetConfig.xml
 
 mitkLevelWindowPresets.xml
 mitkAnatomicalStructureColorPresets.xml
 )
diff --git a/Modules/Overlays/CMakeLists.txt b/Modules/Overlays/CMakeLists.txt
index 9e84619f32..8d9aa53868 100644
--- a/Modules/Overlays/CMakeLists.txt
+++ b/Modules/Overlays/CMakeLists.txt
@@ -1,8 +1,6 @@
-MITK_CREATE_MODULE(DEPENDS MitkCore
-                   WARNINGS_AS_ERRORS
+MITK_CREATE_MODULE(
+  DEPENDS MitkCore
+  WARNINGS_AS_ERRORS
 )
 
-# build tests?
-if(BUILD_TESTING)
-  add_subdirectory(Testing)
-ENDIF()
+add_subdirectory(test)
diff --git a/Modules/Overlays/Documentation/doxygen/OverlaysModule.dox b/Modules/Overlays/doc/doxygen/OverlaysModule.dox
similarity index 100%
rename from Modules/Overlays/Documentation/doxygen/OverlaysModule.dox
rename to Modules/Overlays/doc/doxygen/OverlaysModule.dox
diff --git a/Modules/Overlays/files.cmake b/Modules/Overlays/files.cmake
index 3666a1eab6..baea1fef1f 100644
--- a/Modules/Overlays/files.cmake
+++ b/Modules/Overlays/files.cmake
@@ -1,13 +1,17 @@
-set(H_FILES
-)
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
-  mitkTextOverlay2D.cpp
-  mitkTextOverlay3D.cpp
-  mitkLabelOverlay3D.cpp
+  mitkAnnotationPlacer.cpp
   mitkColorBarOverlay.cpp
-  mitkScaleLegendOverlay.cpp
+  mitkLabelOverlay3D.cpp
   mitkLogoOverlay.cpp
+  mitkOverlayLayouter2D.cpp
+  mitkScaleLegendOverlay.cpp
+  mitkTextOverlay2D.cpp
+  mitkTextOverlay3D.cpp
   mitkVtkLogoRepresentation.cxx
+  mitkVtkOverlay.cpp
+  mitkVtkOverlay2D.cpp
+  mitkVtkOverlay3D.cpp
 )
 
diff --git a/Modules/Overlays/include/mitkAnnotationPlacer.h b/Modules/Overlays/include/mitkAnnotationPlacer.h
new file mode 100644
index 0000000000..5211bbe102
--- /dev/null
+++ b/Modules/Overlays/include/mitkAnnotationPlacer.h
@@ -0,0 +1,61 @@
+/*===================================================================
+
+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 ANNOTATIONPLACER_H
+#define ANNOTATIONPLACER_H
+
+#include "MitkCoreExports.h"
+#include <itkLightObject.h>
+#include <vtkSmartPointer.h>
+#include "mitkOverlay.h"
+#include "mitkAbstractAnnotationRenderer.h"
+#include "mitkLocalStorageHandler.h"
+#include "itkEventObject.h"
+
+namespace mitk {
+
+class BaseRenderer;
+
+/** \brief The AnnotationPlacer updates and manages Overlays and the respective Layouters. */
+/** An Instance of the AnnotationPlacer can be registered to several BaseRenderer instances in order to
+ * call the update method of each Overlay during the rendering phase of the renderer.
+ * See \ref OverlaysPage for more info.
+*/
+class MITKCORE_EXPORT AnnotationPlacer : public mitk::AbstractAnnotationRenderer {
+
+public:
+  mitkClassMacro(AnnotationPlacer, mitk::AbstractAnnotationRenderer);
+  itkFactorylessNewMacro(Self)
+  itkCloneMacro(Self)
+
+protected:
+
+
+private:
+
+  /** \brief copy constructor */
+  AnnotationPlacer( const AnnotationPlacer &);
+
+  /** \brief assignment operator */
+  AnnotationPlacer &operator=(const AnnotationPlacer &);
+
+};
+
+} // namespace mitk
+
+#endif // ANNOTATIONPLACER_H
+
+
diff --git a/Modules/Overlays/mitkColorBarOverlay.h b/Modules/Overlays/include/mitkColorBarOverlay.h
similarity index 100%
rename from Modules/Overlays/mitkColorBarOverlay.h
rename to Modules/Overlays/include/mitkColorBarOverlay.h
diff --git a/Modules/Overlays/mitkLabelOverlay3D.h b/Modules/Overlays/include/mitkLabelOverlay3D.h
similarity index 100%
rename from Modules/Overlays/mitkLabelOverlay3D.h
rename to Modules/Overlays/include/mitkLabelOverlay3D.h
diff --git a/Modules/Overlays/mitkLogoOverlay.h b/Modules/Overlays/include/mitkLogoOverlay.h
similarity index 100%
rename from Modules/Overlays/mitkLogoOverlay.h
rename to Modules/Overlays/include/mitkLogoOverlay.h
diff --git a/Modules/Overlays/include/mitkOverlayLayouter2D.h b/Modules/Overlays/include/mitkOverlayLayouter2D.h
new file mode 100644
index 0000000000..3c1b068c0c
--- /dev/null
+++ b/Modules/Overlays/include/mitkOverlayLayouter2D.h
@@ -0,0 +1,61 @@
+/*===================================================================
+
+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 OVERLAYLAYOUTER2D_H
+#define OVERLAYLAYOUTER2D_H
+
+#include "MitkCoreExports.h"
+#include <itkLightObject.h>
+#include <vtkSmartPointer.h>
+#include "mitkOverlay.h"
+#include "mitkAbstractAnnotationRenderer.h"
+#include "mitkLocalStorageHandler.h"
+#include "itkEventObject.h"
+
+namespace mitk {
+
+class BaseRenderer;
+
+/** \brief The OverlayLayouter2D updates and manages Overlays and the respective Layouters. */
+/** An Instance of the OverlayLayouter2D can be registered to several BaseRenderer instances in order to
+ * call the update method of each Overlay during the rendering phase of the renderer.
+ * See \ref OverlaysPage for more info.
+*/
+class MITKCORE_EXPORT OverlayLayouter2D : public mitk::AbstractAnnotationRenderer {
+
+public:
+  mitkClassMacro(OverlayLayouter2D, mitk::AbstractAnnotationRenderer);
+  itkFactorylessNewMacro(Self)
+  itkCloneMacro(Self)
+
+protected:
+
+
+private:
+
+  /** \brief copy constructor */
+  OverlayLayouter2D( const OverlayLayouter2D &);
+
+  /** \brief assignment operator */
+  OverlayLayouter2D &operator=(const OverlayLayouter2D &);
+
+};
+
+} // namespace mitk
+
+#endif // OVERLAYLAYOUTER2D_H
+
+
diff --git a/Modules/Overlays/mitkScaleLegendOverlay.h b/Modules/Overlays/include/mitkScaleLegendOverlay.h
similarity index 100%
rename from Modules/Overlays/mitkScaleLegendOverlay.h
rename to Modules/Overlays/include/mitkScaleLegendOverlay.h
diff --git a/Modules/Overlays/mitkTextOverlay2D.h b/Modules/Overlays/include/mitkTextOverlay2D.h
similarity index 100%
rename from Modules/Overlays/mitkTextOverlay2D.h
rename to Modules/Overlays/include/mitkTextOverlay2D.h
diff --git a/Modules/Overlays/mitkTextOverlay3D.h b/Modules/Overlays/include/mitkTextOverlay3D.h
similarity index 100%
rename from Modules/Overlays/mitkTextOverlay3D.h
rename to Modules/Overlays/include/mitkTextOverlay3D.h
diff --git a/Modules/Overlays/mitkVtkLogoRepresentation.h b/Modules/Overlays/include/mitkVtkLogoRepresentation.h
similarity index 100%
rename from Modules/Overlays/mitkVtkLogoRepresentation.h
rename to Modules/Overlays/include/mitkVtkLogoRepresentation.h
diff --git a/Modules/Core/include/mitkVtkOverlay.h b/Modules/Overlays/include/mitkVtkOverlay.h
similarity index 100%
rename from Modules/Core/include/mitkVtkOverlay.h
rename to Modules/Overlays/include/mitkVtkOverlay.h
diff --git a/Modules/Core/include/mitkVtkOverlay2D.h b/Modules/Overlays/include/mitkVtkOverlay2D.h
similarity index 100%
rename from Modules/Core/include/mitkVtkOverlay2D.h
rename to Modules/Overlays/include/mitkVtkOverlay2D.h
diff --git a/Modules/Core/include/mitkVtkOverlay3D.h b/Modules/Overlays/include/mitkVtkOverlay3D.h
similarity index 100%
rename from Modules/Core/include/mitkVtkOverlay3D.h
rename to Modules/Overlays/include/mitkVtkOverlay3D.h
diff --git a/Modules/Overlays/src/mitkAnnotationPlacer.cpp b/Modules/Overlays/src/mitkAnnotationPlacer.cpp
new file mode 100644
index 0000000000..509c18a516
--- /dev/null
+++ b/Modules/Overlays/src/mitkAnnotationPlacer.cpp
@@ -0,0 +1,37 @@
+/*===================================================================
+
+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 "mitkAnnotationPlacer.h"
+#include "mitkBaseRenderer.h"
+
+#include <mitkVtkLayerController.h>
+#include "mitkOverlay2DLayouter.h"
+
+namespace mitk
+{
+
+AnnotationPlacer::AnnotationPlacer()
+{
+}
+
+
+AnnotationPlacer::~AnnotationPlacer()
+{
+
+}
+
+
+}
diff --git a/Modules/Overlays/mitkColorBarOverlay.cpp b/Modules/Overlays/src/mitkColorBarOverlay.cpp
similarity index 100%
rename from Modules/Overlays/mitkColorBarOverlay.cpp
rename to Modules/Overlays/src/mitkColorBarOverlay.cpp
diff --git a/Modules/Overlays/mitkLabelOverlay3D.cpp b/Modules/Overlays/src/mitkLabelOverlay3D.cpp
similarity index 100%
rename from Modules/Overlays/mitkLabelOverlay3D.cpp
rename to Modules/Overlays/src/mitkLabelOverlay3D.cpp
diff --git a/Modules/Overlays/mitkLogoOverlay.cpp b/Modules/Overlays/src/mitkLogoOverlay.cpp
similarity index 100%
rename from Modules/Overlays/mitkLogoOverlay.cpp
rename to Modules/Overlays/src/mitkLogoOverlay.cpp
diff --git a/Modules/Overlays/src/mitkOverlayLayouter2D.cpp b/Modules/Overlays/src/mitkOverlayLayouter2D.cpp
new file mode 100644
index 0000000000..5f9ee6744f
--- /dev/null
+++ b/Modules/Overlays/src/mitkOverlayLayouter2D.cpp
@@ -0,0 +1,37 @@
+/*===================================================================
+
+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 "mitkOverlayLayouter2D.h"
+#include "mitkBaseRenderer.h"
+
+#include <mitkVtkLayerController.h>
+#include "mitkOverlay2DLayouter.h"
+
+namespace mitk
+{
+
+OverlayLayouter2D::OverlayLayouter2D()
+{
+}
+
+
+OverlayLayouter2D::~OverlayLayouter2D()
+{
+
+}
+
+
+}
diff --git a/Modules/Overlays/mitkScaleLegendOverlay.cpp b/Modules/Overlays/src/mitkScaleLegendOverlay.cpp
similarity index 100%
rename from Modules/Overlays/mitkScaleLegendOverlay.cpp
rename to Modules/Overlays/src/mitkScaleLegendOverlay.cpp
diff --git a/Modules/Overlays/mitkTextOverlay2D.cpp b/Modules/Overlays/src/mitkTextOverlay2D.cpp
similarity index 100%
rename from Modules/Overlays/mitkTextOverlay2D.cpp
rename to Modules/Overlays/src/mitkTextOverlay2D.cpp
diff --git a/Modules/Overlays/mitkTextOverlay3D.cpp b/Modules/Overlays/src/mitkTextOverlay3D.cpp
similarity index 100%
rename from Modules/Overlays/mitkTextOverlay3D.cpp
rename to Modules/Overlays/src/mitkTextOverlay3D.cpp
diff --git a/Modules/Overlays/mitkVtkLogoRepresentation.cxx b/Modules/Overlays/src/mitkVtkLogoRepresentation.cxx
similarity index 100%
rename from Modules/Overlays/mitkVtkLogoRepresentation.cxx
rename to Modules/Overlays/src/mitkVtkLogoRepresentation.cxx
diff --git a/Modules/Core/src/Rendering/mitkVtkOverlay.cpp b/Modules/Overlays/src/mitkVtkOverlay.cpp
similarity index 100%
rename from Modules/Core/src/Rendering/mitkVtkOverlay.cpp
rename to Modules/Overlays/src/mitkVtkOverlay.cpp
diff --git a/Modules/Core/src/Rendering/mitkVtkOverlay2D.cpp b/Modules/Overlays/src/mitkVtkOverlay2D.cpp
similarity index 100%
rename from Modules/Core/src/Rendering/mitkVtkOverlay2D.cpp
rename to Modules/Overlays/src/mitkVtkOverlay2D.cpp
diff --git a/Modules/Core/src/Rendering/mitkVtkOverlay3D.cpp b/Modules/Overlays/src/mitkVtkOverlay3D.cpp
similarity index 100%
rename from Modules/Core/src/Rendering/mitkVtkOverlay3D.cpp
rename to Modules/Overlays/src/mitkVtkOverlay3D.cpp
diff --git a/Modules/Overlays/Testing/CMakeLists.txt b/Modules/Overlays/test/CMakeLists.txt
similarity index 100%
rename from Modules/Overlays/Testing/CMakeLists.txt
rename to Modules/Overlays/test/CMakeLists.txt
diff --git a/Modules/Overlays/Testing/files.cmake b/Modules/Overlays/test/files.cmake
similarity index 100%
rename from Modules/Overlays/Testing/files.cmake
rename to Modules/Overlays/test/files.cmake
diff --git a/Modules/Overlays/Testing/mitkLabelOverlay3DRendering2DTest.cpp b/Modules/Overlays/test/mitkLabelOverlay3DRendering2DTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkLabelOverlay3DRendering2DTest.cpp
rename to Modules/Overlays/test/mitkLabelOverlay3DRendering2DTest.cpp
diff --git a/Modules/Overlays/Testing/mitkLabelOverlay3DRendering3DTest.cpp b/Modules/Overlays/test/mitkLabelOverlay3DRendering3DTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkLabelOverlay3DRendering3DTest.cpp
rename to Modules/Overlays/test/mitkLabelOverlay3DRendering3DTest.cpp
diff --git a/Modules/Overlays/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp b/Modules/Overlays/test/mitkTextOverlay2DLayouterRenderingTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkTextOverlay2DLayouterRenderingTest.cpp
rename to Modules/Overlays/test/mitkTextOverlay2DLayouterRenderingTest.cpp
diff --git a/Modules/Overlays/Testing/mitkTextOverlay2DRenderingTest.cpp b/Modules/Overlays/test/mitkTextOverlay2DRenderingTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkTextOverlay2DRenderingTest.cpp
rename to Modules/Overlays/test/mitkTextOverlay2DRenderingTest.cpp
diff --git a/Modules/Overlays/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp b/Modules/Overlays/test/mitkTextOverlay2DSymbolsRenderingTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkTextOverlay2DSymbolsRenderingTest.cpp
rename to Modules/Overlays/test/mitkTextOverlay2DSymbolsRenderingTest.cpp
diff --git a/Modules/Overlays/Testing/mitkTextOverlay3DColorRenderingTest.cpp b/Modules/Overlays/test/mitkTextOverlay3DColorRenderingTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkTextOverlay3DColorRenderingTest.cpp
rename to Modules/Overlays/test/mitkTextOverlay3DColorRenderingTest.cpp
diff --git a/Modules/Overlays/Testing/mitkTextOverlay3DRendering2DTest.cpp b/Modules/Overlays/test/mitkTextOverlay3DRendering2DTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkTextOverlay3DRendering2DTest.cpp
rename to Modules/Overlays/test/mitkTextOverlay3DRendering2DTest.cpp
diff --git a/Modules/Overlays/Testing/mitkTextOverlay3DRendering3DTest.cpp b/Modules/Overlays/test/mitkTextOverlay3DRendering3DTest.cpp
similarity index 100%
rename from Modules/Overlays/Testing/mitkTextOverlay3DRendering3DTest.cpp
rename to Modules/Overlays/test/mitkTextOverlay3DRendering3DTest.cpp